Merge pull request #1034 from Gepardgame/fix/issue1033

fix: Add Oidc user to team view
DependencyTrack · Oct 7, 2024 · c5d3ea3 · c5d3ea3
2 parents 730dc73 + 35749a7
commit c5d3ea3
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/src/views/administration/accessmanagement/Teams.vue b/src/views/administration/accessmanagement/Teams.vue
@@ -90,6 +90,9 @@ export default {
             if (row.ldapUsers) {
               count += row.ldapUsers.length;
             }
+            if (row.oidcUsers) {
+              count += row.oidcUsers.length;
+            }
             return count;
           },
         },
@@ -168,6 +171,13 @@ export default {
                         </span>
                       </div>
                     </b-form-group>
+                    <b-form-group v-if="oidcUsers && oidcUsers.length > 0"  :label="this.$t('admin.oidc_users')">
+                      <div class="list-group">
+                        <span v-for="oidcUser in oidcUsers">
+                          <actionable-list-group-item :value="oidcUser.username" :delete-icon="true" v-on:actionClicked="removeUser(oidcUser)"/>
+                        </span>
+                      </div>
+                    </b-form-group>
                     <div style="text-align:right">
                        <b-button variant="outline-danger" @click="deleteTeam">{{ $t('admin.delete_team') }}</b-button>
                     </div>
@@ -197,6 +207,7 @@ export default {
                 mappedOidcGroups: row.mappedOidcGroups,
                 managedUsers: row.managedUsers,
                 ldapUsers: row.ldapUsers,
+                oidcUsers: row.oidcUsers,
                 labelIcon: {
                   dataOn: '\u2713',
                   dataOff: '\u2715',
@@ -433,6 +444,15 @@ export default {
                       }
                       this.ldapUsers = k;
                     }
+                    if (this.oidcUsers) {
+                      let k = [];
+                      for (let i = 0; i < this.oidcUsers.length; i++) {
+                        if (this.oidcUsers[i].username !== user.username) {
+                          k.push(this.oidcUsers[i]);
+                        }
+                      }
+                      this.oidcUsers = k;
+                    }
                     this.$toastr.s(this.$t('message.updated'));
                   })
                   .catch((error) => {