Separate collaborators method in Project store

MerginMaps · Dec 20, 2024 · bbe7720 · bbe7720
1 parent 8389be3
commit bbe7720
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -106,7 +106,6 @@ const projectStore = useProjectStore()
 const userStore = useUserStore()
 const instanceStore = useInstanceStore()
 
-
 const itemsPerPage = ref(10)
 const columns = ref<DataViewWrapperColumnItem[]>([
   {
@@ -163,9 +162,9 @@ function removeMember(item: ProjectCollaborator) {
 }
 
 function roleUpdate(item: ProjectCollaborator, value: ProjectRoleName) {
-  projectStore.updateProjectAccess({
+  projectStore.updateProjectCollaborators({
     projectId: projectStore.project.id,
-    access: item,
+    collaborator: item,
     data: { role: value }
   })
 }

diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
@@ -783,6 +783,9 @@ export const useProjectStore = defineStore('projectModule', {
           Number(item.id)
         )
         this.access = this.access.filter((access) => access.id !== item.id)
+        this.collaborators = this.collaborators.filter(
+          (collaborators) => collaborators.id !== item.id
+        )
       } catch {
         notificationStore.error({
           text: `Failed to update project access for user ${item.username}`
@@ -831,6 +834,42 @@ export const useProjectStore = defineStore('projectModule', {
       }
     },
 
+    async updateProjectCollaborators(payload: {
+      projectId: string
+      collaborator: ProjectCollaborator
+      data: UpdateProjectCollaboratorPayload
+    }) {
+      this.accessLoading = true
+      try {
+        if (!payload.collaborator.project_role) {
+          await ProjectApi.addProjectCollaborator(payload.projectId, {
+            ...payload.data,
+            username: payload.collaborator.username
+          })
+        } else {
+          await ProjectApi.updateProjectCollaborator(
+            payload.projectId,
+            Number(payload.collaborator.id),
+            payload.data
+          )
+        }
+        this.collaborators = this.collaborators.map((collaborator) => {
+          if (collaborator.id === payload.collaborator.id) {
+            collaborator.role = payload.data.role
+            collaborator.project_role = payload.data.role
+          }
+          return collaborator
+        })
+      } catch (err) {
+        this.handleProjectAccessError(
+          err,
+          'Failed to update project collaborator'
+        )
+      } finally {
+        this.accessLoading = false
+      }
+    },
+
     handleProjectAccessError(err: unknown, defaultMessage: string) {
       const notificationStore = useNotificationStore()
       notificationStore.error({