Use v2 update project access

server/mergin/sync/models.py

@@ -360,6 +360,7 @@ class ProjectAccessDetail:
     username: str
     name: Optional[str]
     project_permission: str
+    project_role: Optional[ProjectRole]
     type: str
 
 

server/mergin/sync/private_api.yaml

@@ -594,6 +594,14 @@ components:
             - writer
             - editor
             - reader
+        project_role:
+          type: string
+          nullable: true
+          enum:
+            - owner
+            - writer
+            - editor
+            - reader
         invitation:
           description: Present only for type `invitation`
           type: object

server/mergin/sync/private_api_controller.py

@@ -26,7 +26,6 @@
     AdminProjectSchema,
     ProjectAccessSchema,
     ProjectAccessDetailSchema,
-    ProjectVersionListSchema,
 )
 from .permissions import (
     require_project_by_uuid,

server/mergin/sync/schemas.py

@@ -362,6 +362,7 @@ class ProjectAccessDetailSchema(Schema):
     username = fields.String()
     name = fields.String()
     project_permission = fields.String()
+    project_role = fields.String()
     type = fields.String()
     invitation = fields.Nested(ProjectInvitationAccessSchema())
 

server/mergin/sync/workspace.py

@@ -323,17 +323,19 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
 
         direct_members_ids = [u.user_id for u in project.project_users]
         users = User.query.filter(User.active.is_(True)).order_by(User.email)
-        direct_members = users.filter(User.id.in_(direct_members_ids)).all()
+        direct_members: list[User] = users.filter(User.id.in_(direct_members_ids)).all()
 
         for dm in direct_members:
-            project_role = ProjectPermissions.get_user_project_role(project, dm)
+            project_permission = ProjectPermissions.get_user_project_role(project, dm)
+            project_role = project.get_role(dm.id)
             member = ProjectAccessDetail(
                 id=dm.id,
                 username=dm.username,
                 role=ws.get_user_role(dm).value,
                 name=dm.profile.name(),
                 email=dm.email,
-                project_permission=project_role and project_role.value,
+                project_permission=project_permission and project_permission.value,
+                project_role=project_role.value if project_role else None,
                 type="member",
             )
             result.append(member)
@@ -347,6 +349,7 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                     email=gm.email,
                     role=global_role,
                     project_permission=global_role,
+                    project_role=None,
                     type="member",
                 )
                 result.append(member)

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/common/permission_utils.ts

@@ -16,7 +16,6 @@ export enum WorkspaceRole {
 }
 
 export enum ProjectRole {
-  none,
   reader,
   editor,
   writer,
@@ -37,9 +36,10 @@ export type WorkspaceRoleName =
   | 'admin'
   | 'owner'
 
-export type ProjectRoleName =
-  | Extract<WorkspaceRoleName, 'reader' | 'editor' | 'writer' | 'owner'>
-  | 'none'
+export type ProjectRoleName = Extract<
+  WorkspaceRoleName,
+  'reader' | 'editor' | 'writer' | 'owner'
+>
 
 export type ProjectPermissionName = 'owner' | 'write' | 'edit' | 'read'
 
@@ -63,15 +63,13 @@ export const USER_ROLE_BY_NAME: Record<WorkspaceRoleName, WorkspaceRole> = {
 }
 
 export const PROJECT_ROLE_NAME_BY_ROLE: Record<ProjectRole, ProjectRoleName> = {
-  [ProjectRole.none]: 'none',
   [ProjectRole.reader]: 'reader',
   [ProjectRole.editor]: 'editor',
   [ProjectRole.writer]: 'writer',
   [ProjectRole.owner]: 'owner'
 }
 
 export const PROJECT_ROLE_BY_NAME: Record<ProjectRoleName, ProjectRole> = {
-  none: ProjectRole.none,
   reader: ProjectRole.reader,
   editor: ProjectRole.editor,
   writer: ProjectRole.writer,
@@ -191,21 +189,19 @@ export function getProjectAccessKeyByRoleName(
     owner: 'ownersnames',
     writer: 'writersnames',
     editor: 'editorsnames',
-    reader: 'readersnames',
-    none: undefined
+    reader: 'readersnames'
   }
   return mapper[roleName]
 }
 
 export function getProjectPermissionByRoleName(
   roleName: ProjectRoleName
 ): ProjectPermissionName {
-  const mapper: Record<ProjectRoleName, ProjectPermissionName | undefined> = {
+  const mapper: Record<ProjectRoleName, ProjectPermissionName> = {
     owner: 'owner',
     writer: 'write',
     editor: 'edit',
-    reader: 'read',
-    none: undefined
+    reader: 'read'
   }
   return mapper[roleName]
 }

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,29 @@ 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
       }
     )
   },
@@ -199,15 +213,14 @@ 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

@@ -41,10 +41,9 @@ import {
   SaveProjectSettings,
   ErrorCodes,
   ProjectAccessDetail,
-  UpdateProjectAccessParams,
   ProjectVersionFileChange,
   ProjectVersionListItem,
-  UpdateProjectPayload,
+  UpdateProjectCollaboratorPayload,
   UpdatePublicFlagParams
 } from '@/modules/project/types'
 import { useUserStore } from '@/modules/user/store'
@@ -757,15 +756,14 @@ export const useProjectStore = defineStore('projectModule', {
     async removeProjectAccess(
       item: Pick<ProjectAccessDetail, 'id' | 'username'>
     ) {
-      const notificationStore = useNotificationStore()
       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}`
@@ -783,33 +781,44 @@ export const useProjectStore = defineStore('projectModule', {
      */
     async updateProjectAccess(payload: {
       projectId: string
-      userId: number
-      data: UpdateProjectPayload
+      access: ProjectAccessDetail
+      data: UpdateProjectCollaboratorPayload
     }) {
-      const notificationStore = useNotificationStore()
       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 {
-        notificationStore.error({
-          text: `Failed to update project access`
-        })
+      } catch (err) {
+        this.handleProjectAccessError(err, 'Failed to update project access')
       } finally {
         this.accessLoading = false
       }
     },
 
+    handleProjectAccessError(err: unknown, defaultMessage: string) {
+      const notificationStore = useNotificationStore()
+      notificationStore.error({
+        text: getErrorMessage(err, defaultMessage)
+      })
+    },
+
     async updatePublicFlag(payload: {
       projectId: string
       data: UpdatePublicFlagParams