Fix adding multiple users to buckets and objects

Giving permissions to one user will no longer remove other users without permissions from the permissions list. For objects and buckets When user is added to permissions, they automatically have read perms Modified files: BucketPermission.vue BucketPermissionAddUser.vue ObjectPermission.vue ObjectPermissionAddUser.vue permissionStore.ts
bcgov · Dec 8, 2023 · 9c14383 · 9c14383
1 parent 97cb7d2
commit 9c14383
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 54 deletions.
diff --git a/frontend/src/components/bucket/BucketPermission.vue b/frontend/src/components/bucket/BucketPermission.vue
@@ -84,7 +84,10 @@ onBeforeMount(async () => {
       </Button>
     </div>
     <div v-else>
-      <BucketPermissionAddUser @cancel-search-users="cancelSearchUsers" />
+      <BucketPermissionAddUser
+        :bucket-id="props.bucketId"
+        @cancel-search-users="cancelSearchUsers"
+      />
     </div>
 
     <DataTable

diff --git a/frontend/src/components/bucket/BucketPermissionAddUser.vue b/frontend/src/components/bucket/BucketPermissionAddUser.vue
@@ -1,30 +1,22 @@
 <script setup lang="ts">
-import { storeToRefs } from 'pinia';
-
 import SearchUsers from '@/components/form/SearchUsers.vue';
-import { useConfigStore, usePermissionStore } from '@/store';
+import { Permissions } from '@/utils/constants';
+import { usePermissionStore } from '@/store';
 
 import type { User } from '@/types';
 
+type Props = {
+  bucketId: string;
+};
+
+const props = withDefaults(defineProps<Props>(), {});
+
 // Store
-const { getConfig } = storeToRefs(useConfigStore());
 const permissionStore = usePermissionStore();
 
 // Actions
 const onAdd = (selectedUser: User) => {
-  const idp = getConfig.value.idpList.find((idp: any) => idp.idp === selectedUser?.idp);
-
-  permissionStore.addBucketUser({
-    userId: selectedUser.userId,
-    idpName: idp?.name,
-    elevatedRights: idp?.elevatedRights,
-    fullName: selectedUser.fullName,
-    create: false,
-    read: false,
-    update: false,
-    delete: false,
-    manage: false
-  });
+  permissionStore.addBucketPermission(props.bucketId, selectedUser.userId, Permissions.READ);
 };
 </script>
 

diff --git a/frontend/src/components/object/ObjectPermission.vue b/frontend/src/components/object/ObjectPermission.vue
@@ -114,7 +114,10 @@ onBeforeMount(() => {
       </Button>
     </div>
     <div v-else>
-      <ObjectPermissionAddUser @cancel-search-users="cancelSearchUsers" />
+      <ObjectPermissionAddUser
+        :object-id="props.objectId"
+        @cancel-search-users="cancelSearchUsers"
+      />
     </div>
 
     <DataTable

diff --git a/frontend/src/components/object/ObjectPermissionAddUser.vue b/frontend/src/components/object/ObjectPermissionAddUser.vue
@@ -1,30 +1,22 @@
 <script setup lang="ts">
-import { storeToRefs } from 'pinia';
-
 import SearchUsers from '@/components/form/SearchUsers.vue';
-import { useConfigStore, usePermissionStore } from '@/store';
+import { Permissions } from '@/utils/constants';
+import { usePermissionStore } from '@/store';
 
 import type { User } from '@/types';
 
+type Props = {
+  objectId: string;
+};
+
+const props = withDefaults(defineProps<Props>(), {});
+
 // Store
-const { getConfig } = storeToRefs(useConfigStore());
 const permissionStore = usePermissionStore();
 
 // Actions
 const onAdd = (selectedUser: User) => {
-  const idp = getConfig.value.idpList.find((idp: any) => idp.idp === selectedUser?.idp);
-
-  permissionStore.addObjectUser({
-    userId: selectedUser.userId,
-    idpName: idp?.name,
-    elevatedRights: idp?.elevatedRights,
-    fullName: selectedUser.fullName,
-    create: false,
-    read: false,
-    update: false,
-    delete: false,
-    manage: false
-  });
+  permissionStore.addObjectPermission(props.objectId, selectedUser.userId, Permissions.READ);
 };
 </script>
 

diff --git a/frontend/src/store/permissionStore.ts b/frontend/src/store/permissionStore.ts
@@ -66,14 +66,6 @@ export const usePermissionStore = defineStore('permission', () => {
     }
   }
 
-  function addBucketUser(user: UserPermissions) {
-    try {
-      getters.getMappedBucketToUserPermissions.value.push(user);
-    } catch (error: any) {
-      toast.error('Adding bucket user', error);
-    }
-  }
-
   async function addObjectPermission(objectId: string, userId: string, permCode: string) {
     try {
       appStore.beginIndeterminateLoading();
@@ -92,14 +84,6 @@ export const usePermissionStore = defineStore('permission', () => {
     }
   }
 
-  function addObjectUser(user: UserPermissions) {
-    try {
-      getters.getMappedObjectToUserPermissions.value.push(user);
-    } catch (error: any) {
-      toast.error('Adding object user', error);
-    }
-  }
-
   async function deleteBucketPermission(bucketId: string, userId: string, permCode: string) {
     try {
       appStore.beginIndeterminateLoading();
@@ -327,9 +311,7 @@ export const usePermissionStore = defineStore('permission', () => {
 
     // Actions
     addBucketPermission,
-    addBucketUser,
     addObjectPermission,
-    addObjectUser,
     deleteBucketPermission,
     deleteObjectPermission,
     fetchBucketPermissions,