Merge pull request #662 from rkg-mm/frontend-101-acl-show-only-not-se…

…lected-projects ACL: Add projects to team should only show not yet added projects #101
DependencyTrack · Jan 15, 2024 · 68486df · 68486df
2 parents 131460a + e42ed1b
commit 68486df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/views/administration/accessmanagement/PortfolioAccessControl.vue b/src/views/administration/accessmanagement/PortfolioAccessControl.vue
@@ -86,7 +86,7 @@ export default {
                   </b-col>
                   <b-col sm="6">
                   </b-col>
-                  <select-project-modal v-on:selection="updateProjectSelection" />
+                  <select-project-modal v-on:selection="updateProjectSelection" :teamUuid="team.uuid" />
                 </b-row>
               `,
             mixins: [permissionsMixin],

diff --git a/src/views/administration/accessmanagement/SelectProjectModal.vue b/src/views/administration/accessmanagement/SelectProjectModal.vue
@@ -27,6 +27,9 @@ export default {
   components: {
     cSwitch
   },
+  props: {
+    teamUuid: String
+  },
   data() {
     return {
       showInactiveProjects: false,
@@ -83,11 +86,11 @@ export default {
   },
   methods: {
     apiUrl: function () {
-      let url = `${this.$api.BASE_URL}/${this.$api.URL_PROJECT}`;
+      let url = `${this.$api.BASE_URL}/${this.$api.URL_PROJECT}?notAssignedToTeamWithUuid=${this.teamUuid}`;
       if (this.showInactiveProjects === undefined) {
-        url += "?excludeInactive=true";
+        url += "&excludeInactive=true";
       } else {
-        url += "?excludeInactive=" + !this.showInactiveProjects;
+        url += "&excludeInactive=" + !this.showInactiveProjects;
       }
       return url;
     },