Updated:

- remove project collaborator/update project collaboratr methods in store.ts - replace for access methods

Author: MarcelGeo

web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue

@@ -215,7 +215,8 @@ const changeStatusDialog = () => {
       await adminStore.updateUser({
         username: user.value.username,
         data: {
-          active: !user.value.active
+          active: !user.value.active,
+          is_admin: user.value.is_admin
         }
       })
     }

web-app/packages/lib/src/modules/project/components/AccessRequestTableTemplate.vue

@@ -187,7 +187,7 @@ export default defineComponent({
         await this.acceptProjectAccessRequest({
           data,
           itemId: request.id,
-          namespace: this.namespace
+          workspace: this.namespace
         })
         await this.updatePaginationOrFetch()
       } catch (err) {
@@ -200,7 +200,7 @@ export default defineComponent({
     async cancelRequest(request) {
       await this.cancelProjectAccessRequest({
         itemId: request.id,
-        namespace: this.namespace
+        workspace: this.namespace
       })
       await this.updatePaginationOrFetch()
     },

web-app/packages/lib/src/modules/project/components/ProjectAccessRequests.vue

@@ -158,7 +158,7 @@ export default defineComponent({
         await this.acceptProjectAccessRequest({
           data,
           itemId: request.id,
-          namespace: this.project.namespace
+          workspace: this.project.namespace
         })
         await this.updatePaginationOrFetch()
       } catch (err) {
@@ -173,7 +173,7 @@ export default defineComponent({
     async cancelRequest(request) {
       await this.cancelProjectAccessRequest({
         itemId: request.id,
-        namespace: this.project.namespace
+        workspace: this.project.namespace
       })
       await this.updatePaginationOrFetch()
     },

web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue

@@ -163,7 +163,7 @@ function removeMember(item: ProjectAccessDetail) {
 function roleUpdate(item: ProjectAccessDetail, value: ProjectRoleName) {
   projectStore.updateProjectAccess({
     projectId: projectStore.project.id,
-    userId: item.id,
+    access: item,
     data: { role: value }
   })
 }

web-app/packages/lib/src/modules/project/components/ProjectsTableDataLoader.vue

@@ -60,10 +60,6 @@ export default defineComponent({
       default: false
     },
     namespace: String,
-    asAdmin: {
-      type: Boolean,
-      default: false
-    },
     public: {
       type: Boolean,
       default: true
@@ -136,9 +132,6 @@ export default defineComponent({
       if (projectGridState.namespace) {
         params.only_namespace = projectGridState.namespace
       }
-      if (this.asAdmin) {
-        params.as_admin = true
-      }
       if (!this.public) {
         params.public = false
       }

web-app/packages/lib/src/modules/project/projectApi.ts

@@ -25,8 +25,10 @@ import {
   ProjectAccessDetail,
   ProjectAccess,
   ProjectVersionFileChange,
-  UpdateProjectPayload,
-  UpdatePublicFlagParams
+  UpdateProjectCollaboratorPayload,
+  UpdatePublicFlagParams,
+  ProjectCollaborator,
+  AddProjectCollaboratorPayload
 } from '@/modules/project/types'
 
 export const ProjectApi = {
@@ -174,17 +176,28 @@ export const ProjectApi = {
     )
   },
 
-  async updateProjectAccess(
+  async addProjectCollaborator(
+    id: string,
+    data: AddProjectCollaboratorPayload
+  ): Promise<AxiosResponse<ProjectCollaborator>> {
+    return ProjectModule.httpService.post(
+      `/v2/projects/${id}/collaborators`,
+      data,
+      {
+        validateStatus
+      }
+    )
+  },
+
+  async updateProjectCollaborator(
     id: string,
     userId: number,
-    data: UpdateProjectPayload,
-    withRetry?: boolean
-  ): Promise<AxiosResponse<ProjectAccess>> {
+    data: UpdateProjectCollaboratorPayload
+  ): Promise<AxiosResponse<ProjectCollaborator>> {
     return ProjectModule.httpService.patch(
       `/v2/projects/${id}/collaborators/${userId}`,
       data,
       {
-        ...(withRetry ? getDefaultRetryOptions() : {}),
         validateStatus
       }
     )
@@ -200,15 +213,13 @@ export const ProjectApi = {
     })
   },
 
-  async removeProjectAccess(
+  async removeProjectCollaborator(
     id: string,
-    userId: number,
-    withRetry?: boolean
-  ): Promise<AxiosResponse<ProjectAccess>> {
+    userId: number
+  ): Promise<AxiosResponse<void>> {
     return ProjectModule.httpService.delete(
       `/v2/projects/${id}/collaborators/${userId}`,
       {
-        ...(withRetry ? getDefaultRetryOptions() : {}),
         validateStatus
       }
     )

web-app/packages/lib/src/modules/project/store.ts

@@ -43,7 +43,7 @@ import {
   ProjectAccessDetail,
   ProjectVersionFileChange,
   ProjectVersionListItem,
-  UpdateProjectPayload,
+  UpdateProjectCollaboratorPayload,
   UpdatePublicFlagParams
 } from '@/modules/project/types'
 import { useUserStore } from '@/modules/user/store'
@@ -759,12 +759,11 @@ export const useProjectStore = defineStore('projectModule', {
       this.accessLoading = true
       const notificationStore = useNotificationStore()
       try {
-        const response = await ProjectApi.removeProjectAccess(
+        await ProjectApi.removeProjectCollaborator(
           this.project.id,
-          item.id
+          Number(item.id)
         )
         this.access = this.access.filter((access) => access.id !== item.id)
-        this.project.access = response.data
       } catch {
         notificationStore.error({
           text: `Failed to update project access for user ${item.username}`
@@ -782,23 +781,30 @@ export const useProjectStore = defineStore('projectModule', {
      */
     async updateProjectAccess(payload: {
       projectId: string
-      userId: number
-      data: UpdateProjectPayload
+      access: ProjectAccessDetail
+      data: UpdateProjectCollaboratorPayload
     }) {
       this.accessLoading = true
       try {
-        const response = await ProjectApi.updateProjectAccess(
-          payload.projectId,
-          payload.userId,
-          payload.data
-        )
+        if (!payload.access.project_role) {
+          await ProjectApi.addProjectCollaborator(payload.projectId, {
+            ...payload.data,
+            username: payload.access.username
+          })
+        } else {
+          await ProjectApi.updateProjectCollaborator(
+            payload.projectId,
+            Number(payload.access.id),
+            payload.data
+          )
+        }
         this.access = this.access.map((access) => {
-          if (access.id === payload.userId) {
+          if (access.id === payload.access.id) {
             access.project_permission = payload.data.role
+            access.project_role = payload.data.role
           }
           return access
         })
-        this.project.access = response.data
       } catch (err) {
         this.handleProjectAccessError(err, 'Failed to update project access')
       } finally {

web-app/packages/lib/src/modules/project/types.ts

@@ -5,7 +5,8 @@
 /* eslint-disable camelcase */
 import {
   ProjectRoleName,
-  ProjectPermissionName
+  ProjectPermissionName,
+  WorkspaceRoleName
 } from '@/common/permission_utils'
 import {
   PaginatedRequestParamsApi,
@@ -184,12 +185,12 @@ export interface GetAccessRequestsPayload extends GetUserAccessRequestsPayload {
 export interface AcceptProjectAccessRequestPayload {
   itemId: number
   data: AcceptProjectAccessRequestData
-  namespace?: string
+  workspace?: string
 }
 
 export interface CancelProjectAccessRequestPayload {
   itemId: number
-  namespace: string
+  workspace: string
 }
 
 export interface CreateProjectParams {
@@ -292,7 +293,12 @@ export type EnhancedProjectDetail = ProjectDetail & {
   path: string
 }
 
-export interface UpdateProjectPayload {
+export interface AddProjectCollaboratorPayload {
+  role: ProjectRoleName
+  username: string
+}
+
+export interface UpdateProjectCollaboratorPayload {
   role: ProjectRoleName
 }
 
@@ -341,11 +347,30 @@ export interface ProjectVersionFileChange {
 
 export type ErrorCodes = 'UpdateProjectAccessError'
 
+export type ProjectAccessDetailType = 'invitation' | 'member'
+
 export interface ProjectAccessDetail {
+  id: number | string
+  type: ProjectAccessDetailType
+  role: WorkspaceRoleName
+  name?: string
+  email: string
+  username?: string
+  project_permission?: ProjectRoleName
+  project_role?: ProjectRoleName | null
+  invitation?: {
+    expires_at: string
+    projects?: {
+      ids: string[]
+      permissions: ProjectPermissionName
+    }
+  }
+}
+
+export interface ProjectCollaborator {
   id: number
-  type: 'member'
+  usernaname: string
   email: string
-  username: string
-  project_permission: ProjectRoleName
-  name: string
+  workspace_role: WorkspaceRoleName
+  project_role: ProjectRoleName
 }