From 7d6b336fc9168cc8a0f1b3d870b6495e08b387b9 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 09:52:59 +0100
Subject: [PATCH 01/14] Added method for error handling which could be reused
 in other applications

---
 .../lib/src/modules/project/projectApi.ts       |  6 ++++--
 .../packages/lib/src/modules/project/store.ts   | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index fbd77fdd..67ff0e4e 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -184,7 +184,8 @@ export const ProjectApi = {
       `/v2/projects/${id}/collaborators/${userId}`,
       data,
       {
-        ...(withRetry ? getDefaultRetryOptions() : {})
+        ...(withRetry ? getDefaultRetryOptions() : {}),
+        validateStatus
       }
     )
   },
@@ -207,7 +208,8 @@ export const ProjectApi = {
     return ProjectModule.httpService.delete(
       `/v2/projects/${id}/collaborators/${userId}`,
       {
-        ...(withRetry ? getDefaultRetryOptions() : {})
+        ...(withRetry ? getDefaultRetryOptions() : {}),
+        validateStatus
       }
     )
   },
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index 363d2ec7..d52baeae 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/web-app/packages/lib/src/modules/project/store.ts
@@ -41,7 +41,6 @@ import {
   SaveProjectSettings,
   ErrorCodes,
   ProjectAccessDetail,
-  UpdateProjectAccessParams,
   ProjectVersionFileChange,
   ProjectVersionListItem,
   UpdateProjectPayload,
@@ -757,8 +756,8 @@ 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(
           this.project.id,
@@ -786,7 +785,6 @@ export const useProjectStore = defineStore('projectModule', {
       userId: number
       data: UpdateProjectPayload
     }) {
-      const notificationStore = useNotificationStore()
       this.accessLoading = true
       try {
         const response = await ProjectApi.updateProjectAccess(
@@ -801,15 +799,20 @@ export const useProjectStore = defineStore('projectModule', {
           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

From 14b95ab019d625583c7d4c446a51baecc44089e9 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 12:14:22 +0100
Subject: [PATCH 02/14] Use v2 api to get project collaborators and their
 project permission

---
 .../lib/src/common/permission_utils.ts        | 29 ++++++++++++++++++-
 .../components/ProjectMembersTable.vue        | 13 ++++++---
 .../lib/src/modules/project/projectApi.ts     |  6 ++++
 .../packages/lib/src/modules/project/store.ts | 16 ++++++++++
 .../packages/lib/src/modules/project/types.ts |  7 ++---
 5 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/web-app/packages/lib/src/common/permission_utils.ts b/web-app/packages/lib/src/common/permission_utils.ts
index e810b2db..4877e2b7 100644
--- a/web-app/packages/lib/src/common/permission_utils.ts
+++ b/web-app/packages/lib/src/common/permission_utils.ts
@@ -4,7 +4,7 @@
 
 import { DropdownOption } from './components/types'
 
-import { ProjectAccess } from '@/modules'
+import {ProjectAccess, ProjectAccessDetail} from '@/modules'
 
 export enum WorkspaceRole {
   guest,
@@ -41,6 +41,14 @@ export type ProjectRoleName =
   | Extract<WorkspaceRoleName, 'reader' | 'editor' | 'writer' | 'owner'>
   | 'none'
 
+const ROLE_HIERARCHY: ProjectRoleName[] = [
+  'none',
+  'reader',
+  'editor',
+  'writer',
+  'owner'
+]
+
 export type ProjectPermissionName = 'owner' | 'write' | 'edit' | 'read'
 
 export const USER_ROLE_NAME_BY_ROLE: Record<WorkspaceRole, WorkspaceRoleName> =
@@ -209,3 +217,22 @@ export function getProjectPermissionByRoleName(
   }
   return mapper[roleName]
 }
+
+export function calculateProjectPermission(
+  project_role: ProjectRoleName,
+  workspace_role: WorkspaceRoleName
+): ProjectRoleName {
+  const mappedWorkspaceRole: ProjectRoleName =
+    workspace_role === 'admin' ? 'owner' : (workspace_role as ProjectRoleName)
+
+  if (project_role === 'none' && workspace_role === 'guest') {
+    return 'none'
+  }
+
+  const projectRoleIndex = ROLE_HIERARCHY.indexOf(project_role)
+  const workspaceRoleIndex = ROLE_HIERARCHY.indexOf(mappedWorkspaceRole)
+
+  return projectRoleIndex > workspaceRoleIndex
+    ? project_role
+    : mappedWorkspaceRole
+}
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index f96f9e6d..0ea7d66f 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
             ]"
           >
             <PAvatar
-              :label="$filters.getAvatar(item.email, item.name)"
+              :label="$filters.getAvatar(item.email, item.username)"
               shape="circle"
               :pt="{
                 root: {
@@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         <template #col-roles="{ item }">
           <AppDropdown
             :options="roles"
-            :model-value="item.project_permission"
+            :model-value="ProjectPermission(item)"
             @update:model-value="(e) => roleUpdate(item, e)"
             :disabled="item.id === loggedUser.id"
             class="w-6 lg:w-full"
@@ -96,7 +96,8 @@ import { DataViewWrapperColumnItem } from '@/common/components/data-view/types'
 import {
   GlobalRole,
   ProjectRoleName,
-  isAtLeastGlobalRole
+  isAtLeastGlobalRole,
+  calculateProjectPermission
 } from '@/common/permission_utils'
 import { useInstanceStore, useUserStore } from '@/main'
 
@@ -168,11 +169,15 @@ function roleUpdate(item: ProjectAccessDetail, value: ProjectRoleName) {
   })
 }
 
+function ProjectPermission(item: ProjectAccessDetail) {
+  return calculateProjectPermission(item.project_role, item.workspace_role)
+}
+
 onUnmounted(() => {
   projectStore.access = []
 })
 
-projectStore.getProjectAccess(projectStore.project?.id)
+projectStore.getProjectCollaborators(projectStore.project?.id)
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index fbd77fdd..c1e3aba0 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -317,5 +317,11 @@ export const ProjectApi = {
     return ProjectModule.httpService.get(
       `/v1/resource/changesets/${workspace}/${projectName}/${versionId}?path=${path}`
     )
+  },
+
+  async getProjectCollaborators(
+    projectId: string
+  ): Promise<AxiosResponse<ProjectAccessDetail[]>> {
+    return ProjectModule.httpService.get(`/v2/projects/${projectId}/collaborators`)
   }
 }
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index 363d2ec7..3193b155 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/web-app/packages/lib/src/modules/project/store.ts
@@ -749,6 +749,22 @@ export const useProjectStore = defineStore('projectModule', {
       }
     },
 
+    async getProjectCollaborators(projectId: string) {
+      const notificationStore = useNotificationStore()
+
+      try {
+        this.accessLoading = true
+        const response = await ProjectApi.getProjectCollaborators(projectId)
+        this.access = response.data
+      } catch {
+        notificationStore.error({
+          text: 'Failed to get project access'
+        })
+      } finally {
+        this.accessLoading = false
+      }
+    },
+
     /**
      * Removes the given user's access to the current project.
      *
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index e8c39aaa..1763fd3a 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -5,7 +5,7 @@
 /* eslint-disable camelcase */
 import {
   ProjectRoleName,
-  ProjectPermissionName
+  ProjectPermissionName, WorkspaceRoleName
 } from '@/common/permission_utils'
 import {
   PaginatedRequestParamsApi,
@@ -343,9 +343,8 @@ export type ErrorCodes = 'UpdateProjectAccessError'
 
 export interface ProjectAccessDetail {
   id: number
-  type: 'member'
   email: string
   username: string
-  project_permission: ProjectRoleName
-  name: string
+  workspace_role: WorkspaceRoleName
+  project_role: ProjectRoleName
 }

From ec4284059c62b677d91c75dabce96bdca7abf2ab Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 12:21:29 +0100
Subject: [PATCH 03/14] Keep original interfaces

---
 web-app/packages/lib/src/common/permission_utils.ts  |  2 +-
 .../project/components/ProjectMembersTable.vue       | 10 +++++-----
 .../packages/lib/src/modules/project/projectApi.ts   |  5 +++--
 web-app/packages/lib/src/modules/project/types.ts    | 12 +++++++++++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/web-app/packages/lib/src/common/permission_utils.ts b/web-app/packages/lib/src/common/permission_utils.ts
index 4877e2b7..a86c4123 100644
--- a/web-app/packages/lib/src/common/permission_utils.ts
+++ b/web-app/packages/lib/src/common/permission_utils.ts
@@ -4,7 +4,7 @@
 
 import { DropdownOption } from './components/types'
 
-import {ProjectAccess, ProjectAccessDetail} from '@/modules'
+import { ProjectAccess } from '@/modules'
 
 export enum WorkspaceRole {
   guest,
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index 0ea7d66f..734a6cee 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -86,7 +86,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 import { computed, ref, onUnmounted } from 'vue'
 
 import { useProjectStore } from '../store'
-import { ProjectAccessDetail } from '../types'
+import { ProjectCollaborators } from '../types'
 
 import AppContainer from '@/common/components/AppContainer.vue'
 import AppDropdown from '@/common/components/AppDropdown.vue'
@@ -153,15 +153,15 @@ const searchedItems = computed(() =>
   })
 )
 
-function canRemoveMember(item: ProjectAccessDetail) {
+function canRemoveMember(item: ProjectCollaborators) {
   return props.allowRemove && item.id !== loggedUser.value?.id
 }
 
-function removeMember(item: ProjectAccessDetail) {
+function removeMember(item: ProjectCollaborators) {
   projectStore.removeProjectAccess(item)
 }
 
-function roleUpdate(item: ProjectAccessDetail, value: ProjectRoleName) {
+function roleUpdate(item: ProjectCollaborators, value: ProjectRoleName) {
   projectStore.updateProjectAccess({
     projectId: projectStore.project.id,
     userId: item.id,
@@ -169,7 +169,7 @@ function roleUpdate(item: ProjectAccessDetail, value: ProjectRoleName) {
   })
 }
 
-function ProjectPermission(item: ProjectAccessDetail) {
+function ProjectPermission(item: ProjectCollaborators) {
   return calculateProjectPermission(item.project_role, item.workspace_role)
 }
 
diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index c1e3aba0..9537d61c 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -26,7 +26,8 @@ import {
   ProjectAccess,
   ProjectVersionFileChange,
   UpdateProjectPayload,
-  UpdatePublicFlagParams
+  UpdatePublicFlagParams,
+  ProjectCollaborators
 } from '@/modules/project/types'
 
 export const ProjectApi = {
@@ -321,7 +322,7 @@ export const ProjectApi = {
 
   async getProjectCollaborators(
     projectId: string
-  ): Promise<AxiosResponse<ProjectAccessDetail[]>> {
+  ): Promise<AxiosResponse<ProjectCollaborators[]>> {
     return ProjectModule.httpService.get(`/v2/projects/${projectId}/collaborators`)
   }
 }
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 1763fd3a..8b1e4bb7 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -5,7 +5,8 @@
 /* eslint-disable camelcase */
 import {
   ProjectRoleName,
-  ProjectPermissionName, WorkspaceRoleName
+  ProjectPermissionName,
+  WorkspaceRoleName
 } from '@/common/permission_utils'
 import {
   PaginatedRequestParamsApi,
@@ -342,6 +343,15 @@ export interface ProjectVersionFileChange {
 export type ErrorCodes = 'UpdateProjectAccessError'
 
 export interface ProjectAccessDetail {
+  id: number
+  type: 'member'
+  email: string
+  username: string
+  project_permission: ProjectRoleName
+  name: string
+}
+
+export interface ProjectCollaborators {
   id: number
   email: string
   username: string

From dfb6ad72bf757f9c5f31e44236c9d7442395b62e Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 16:54:13 +0100
Subject: [PATCH 04/14] Added project_role to access

---
 server/mergin/sync/models.py        | 1 +
 server/mergin/sync/private_api.yaml | 8 ++++++++
 server/mergin/sync/schemas.py       | 1 +
 3 files changed, 10 insertions(+)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index de81676a..ff1aa137 100644
--- a/server/mergin/sync/models.py
+++ b/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
 
 
diff --git a/server/mergin/sync/private_api.yaml b/server/mergin/sync/private_api.yaml
index 4160ed07..40af2e9b 100644
--- a/server/mergin/sync/private_api.yaml
+++ b/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
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index c782c5ca..2faaae13 100644
--- a/server/mergin/sync/schemas.py
+++ b/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())
 

From 4f3c23d6a847c2074b2d8bc4e1dc6ac0887c1168 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 16:54:37 +0100
Subject: [PATCH 05/14] Cleanup of none ProjecRole

---
 .../lib/src/common/permission_utils.ts         | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/web-app/packages/lib/src/common/permission_utils.ts b/web-app/packages/lib/src/common/permission_utils.ts
index e810b2db..97179ffd 100644
--- a/web-app/packages/lib/src/common/permission_utils.ts
+++ b/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,7 +63,6 @@ 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',
@@ -71,7 +70,6 @@ export const PROJECT_ROLE_NAME_BY_ROLE: Record<ProjectRole, ProjectRoleName> = {
 }
 
 export const PROJECT_ROLE_BY_NAME: Record<ProjectRoleName, ProjectRole> = {
-  none: ProjectRole.none,
   reader: ProjectRole.reader,
   editor: ProjectRole.editor,
   writer: ProjectRole.writer,
@@ -191,8 +189,7 @@ export function getProjectAccessKeyByRoleName(
     owner: 'ownersnames',
     writer: 'writersnames',
     editor: 'editorsnames',
-    reader: 'readersnames',
-    none: undefined
+    reader: 'readersnames'
   }
   return mapper[roleName]
 }
@@ -200,12 +197,11 @@ export function getProjectAccessKeyByRoleName(
 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]
 }

From 67f146ed96fc368241c4f23b232168bbbc6e7076 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 16:55:32 +0100
Subject: [PATCH 06/14] Updated: - remove project collaborator/update project
 collaboratr methods in store.ts - replace for access methods

---
 .../modules/admin/views/AccountDetailView.vue |  3 +-
 .../components/AccessRequestTableTemplate.vue |  4 +-
 .../components/ProjectAccessRequests.vue      |  4 +-
 .../components/ProjectMembersTable.vue        |  2 +-
 .../components/ProjectsTableDataLoader.vue    |  7 ----
 .../lib/src/modules/project/projectApi.ts     | 35 ++++++++++------
 .../packages/lib/src/modules/project/store.ts | 32 +++++++++------
 .../packages/lib/src/modules/project/types.ts | 41 +++++++++++++++----
 8 files changed, 82 insertions(+), 46 deletions(-)

diff --git a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
index 86b9cd2b..9032e85b 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
+++ b/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
         }
       })
     }
diff --git a/web-app/packages/lib/src/modules/project/components/AccessRequestTableTemplate.vue b/web-app/packages/lib/src/modules/project/components/AccessRequestTableTemplate.vue
index 91eb6f22..e0e813c2 100644
--- a/web-app/packages/lib/src/modules/project/components/AccessRequestTableTemplate.vue
+++ b/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()
     },
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectAccessRequests.vue b/web-app/packages/lib/src/modules/project/components/ProjectAccessRequests.vue
index 80d0eb3e..bc7af479 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectAccessRequests.vue
+++ b/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()
     },
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index f96f9e6d..95b0edaf 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/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 }
   })
 }
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectsTableDataLoader.vue b/web-app/packages/lib/src/modules/project/components/ProjectsTableDataLoader.vue
index 04229c27..9e79484b 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectsTableDataLoader.vue
+++ b/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
       }
diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index 67ff0e4e..76f4d832 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/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
       }
     )
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index d52baeae..011b33c5 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/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 {
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index e8c39aaa..025ccdd8 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/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
 }

From 13e68b413d5397b20ebf0691eb3505638f489657 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 18 Dec 2024 17:51:38 +0100
Subject: [PATCH 07/14] Fix tests for project_role

---
 server/mergin/sync/private_api_controller.py | 1 -
 server/mergin/sync/workspace.py              | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/mergin/sync/private_api_controller.py b/server/mergin/sync/private_api_controller.py
index 616ac69d..31d3e2af 100644
--- a/server/mergin/sync/private_api_controller.py
+++ b/server/mergin/sync/private_api_controller.py
@@ -26,7 +26,6 @@
     AdminProjectSchema,
     ProjectAccessSchema,
     ProjectAccessDetailSchema,
-    ProjectVersionListSchema,
 )
 from .permissions import (
     require_project_by_uuid,
diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py
index 8cc0a27a..3f0b5eec 100644
--- a/server/mergin/sync/workspace.py
+++ b/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)

From e61f7b5f4cea1c1852e77e3d9194ffb81a23588f Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 19 Dec 2024 13:45:02 +0100
Subject: [PATCH 08/14] Address comments @varmar05 - renaming attributes

---
 server/mergin/sync/models.py                  |  2 +-
 server/mergin/sync/private_api.yaml           | 48 +++++++++----------
 server/mergin/sync/schemas.py                 |  2 +-
 server/mergin/sync/workspace.py               |  6 +--
 .../mergin/tests/test_private_project_api.py  | 28 +++++------
 .../components/ProjectMembersTable.vue        |  2 +-
 .../packages/lib/src/modules/project/store.ts |  2 +-
 .../packages/lib/src/modules/project/types.ts |  4 +-
 8 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index ff1aa137..cccd7b43 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -359,7 +359,7 @@ class ProjectAccessDetail:
     role: str
     username: str
     name: Optional[str]
-    project_permission: str
+    workspace_role: str
     project_role: Optional[ProjectRole]
     type: str
 
diff --git a/server/mergin/sync/private_api.yaml b/server/mergin/sync/private_api.yaml
index 40af2e9b..0116cd65 100644
--- a/server/mergin/sync/private_api.yaml
+++ b/server/mergin/sync/private_api.yaml
@@ -551,8 +551,7 @@ components:
         - id
         - type
         - email
-        - project_permission
-        - role
+        - workspace_role
       properties:
         id:
           description: User/Invitation (uu)id
@@ -569,16 +568,9 @@ components:
           type: string
           format: email
           example: john.doe@example.com
-        role:
+        workspace_role:
           description: Workspace role
-          type: string
-          enum:
-            - owner
-            - admin
-            - writer
-            - editor
-            - reader
-            - guest
+          $ref: "#/components/schemas/WorkspaceRole"
         username:
           description: Present only for type `member`
           type: string
@@ -587,21 +579,13 @@ components:
           description: Present only for type `member`
           type: string
           example: John Doe
-        project_permission:
-          type: string
-          enum:
-            - owner
-            - writer
-            - editor
-            - reader
+        role:
+          description: Project role defined as combination of project and workspace roles
+          $ref: "#/components/schemas/ProjectRole"
         project_role:
-          type: string
           nullable: true
-          enum:
-            - owner
-            - writer
-            - editor
-            - reader
+          description: Project role defined in database, not calculated version
+          $ref: "#/components/schemas/ProjectRole"
         invitation:
           description: Present only for type `invitation`
           type: object
@@ -666,3 +650,19 @@ components:
           items:
             type: integer
             example: [1]
+    WorkspaceRole:
+      type: string
+      enum:
+        - owner
+        - admin
+        - writer
+        - editor
+        - reader
+        - guest
+    ProjectRole:
+      type: string
+      enum:
+        - owner
+        - writer
+        - editor
+        - reader
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 2faaae13..c282b56c 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -361,7 +361,7 @@ class ProjectAccessDetailSchema(Schema):
     role = fields.String()
     username = fields.String()
     name = fields.String()
-    project_permission = fields.String()
+    workspace_role = fields.String()
     project_role = fields.String()
     type = fields.String()
     invitation = fields.Nested(ProjectInvitationAccessSchema())
diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py
index 3f0b5eec..25b8e6fe 100644
--- a/server/mergin/sync/workspace.py
+++ b/server/mergin/sync/workspace.py
@@ -331,10 +331,10 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
             member = ProjectAccessDetail(
                 id=dm.id,
                 username=dm.username,
-                role=ws.get_user_role(dm).value,
+                workspace_role=ws.get_user_role(dm).value,
                 name=dm.profile.name(),
                 email=dm.email,
-                project_permission=project_permission and project_permission.value,
+                role=project_permission and project_permission.value,
                 project_role=project_role.value if project_role else None,
                 type="member",
             )
@@ -347,8 +347,8 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                     username=gm.username,
                     name=gm.profile.name(),
                     email=gm.email,
+                    workspace_role=global_role,
                     role=global_role,
-                    project_permission=global_role,
                     project_role=None,
                     type="member",
                 )
diff --git a/server/mergin/tests/test_private_project_api.py b/server/mergin/tests/test_private_project_api.py
index c8aabd9e..f475255f 100644
--- a/server/mergin/tests/test_private_project_api.py
+++ b/server/mergin/tests/test_private_project_api.py
@@ -490,7 +490,7 @@ def test_get_project_access(client):
     resp = client.get(url)
     assert resp.status_code == 200
     assert len(resp.json) == 1
-    assert resp.json[0]["project_permission"] == "owner"
+    assert resp.json[0]["role"] == "owner"
     project.set_role(users[0].id, ProjectRole.OWNER)
     project.set_role(users[1].id, ProjectRole.WRITER)
     project.set_role(users[2].id, ProjectRole.READER)
@@ -498,9 +498,9 @@ def test_get_project_access(client):
     resp = client.get(url)
     assert resp.status_code == 200
     assert len(resp.json) == 4
-    assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 2
-    assert sum(map(lambda x: int(x["project_permission"] == "writer"), resp.json)) == 1
-    assert sum(map(lambda x: int(x["project_permission"] == "reader"), resp.json)) == 1
+    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 2
+    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 1
+    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 1
     # user3 does not have access to the project
     assert not any(users[3].email == access["email"] for access in resp.json)
     assert any(users[2].email == access["email"] for access in resp.json)
@@ -508,27 +508,27 @@ def test_get_project_access(client):
     resp = client.get(url)
     assert resp.status_code == 200
     assert len(resp.json) == 6
-    assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 2
-    assert sum(map(lambda x: int(x["project_permission"] == "writer"), resp.json)) == 1
-    assert sum(map(lambda x: int(x["project_permission"] == "reader"), resp.json)) == 3
+    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 2
+    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 1
+    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 3
     Configuration.GLOBAL_WRITE = True
     resp = client.get(url)
     assert resp.status_code == 200
     assert len(resp.json) == 6
-    assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 2
-    assert sum(map(lambda x: int(x["project_permission"] == "writer"), resp.json)) == 4
-    assert sum(map(lambda x: int(x["project_permission"] == "reader"), resp.json)) == 0
+    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 2
+    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 4
+    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 0
     Configuration.GLOBAL_ADMIN = True
     resp = client.get(url)
     assert resp.status_code == 200
     assert len(resp.json) == 6
-    assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 6
-    assert sum(map(lambda x: int(x["project_permission"] == "writer"), resp.json)) == 0
-    assert sum(map(lambda x: int(x["project_permission"] == "reader"), resp.json)) == 0
+    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 6
+    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 0
+    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 0
     # pretend a user was deleted to test that api can handle it
     users[3].inactivate()
     users[3].anonymize()
     resp = client.get(url)
     assert resp.status_code == 200
     assert len(resp.json) == 5
-    assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 5
+    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 5
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index 95b0edaf..6f066f2b 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         <template #col-roles="{ item }">
           <AppDropdown
             :options="roles"
-            :model-value="item.project_permission"
+            :model-value="item.role"
             @update:model-value="(e) => roleUpdate(item, e)"
             :disabled="item.id === loggedUser.id"
             class="w-6 lg:w-full"
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index 011b33c5..c97c80b6 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/web-app/packages/lib/src/modules/project/store.ts
@@ -800,7 +800,7 @@ export const useProjectStore = defineStore('projectModule', {
         }
         this.access = this.access.map((access) => {
           if (access.id === payload.access.id) {
-            access.project_permission = payload.data.role
+            access.role = payload.data.role
             access.project_role = payload.data.role
           }
           return access
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 025ccdd8..8effa954 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -352,11 +352,11 @@ export type ProjectAccessDetailType = 'invitation' | 'member'
 export interface ProjectAccessDetail {
   id: number | string
   type: ProjectAccessDetailType
-  role: WorkspaceRoleName
+  workspace_role: WorkspaceRoleName
   name?: string
   email: string
   username?: string
-  project_permission?: ProjectRoleName
+  role?: ProjectRoleName
   project_role?: ProjectRoleName | null
   invitation?: {
     expires_at: string

From 6ba981167b7aa2a635daef27c3750ddc3c432f63 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 20 Dec 2024 09:43:30 +0100
Subject: [PATCH 09/14] Use v2 api in collaborators tab

- add role (aka project_permission) - combination of workspace_role and project_role to Project collaborator response
- adjust FE API
---
 server/mergin/sync/models.py                  |  4 +++
 server/mergin/sync/public_api_v2.yaml         |  7 +++++
 .../mergin/sync/public_api_v2_controller.py   |  1 +
 server/mergin/sync/schemas.py                 |  1 +
 .../lib/src/common/permission_utils.ts        | 30 +------------------
 .../components/ProjectMembersTable.vue        | 29 ++++++++----------
 .../lib/src/modules/project/projectApi.ts     |  6 ++--
 .../packages/lib/src/modules/project/store.ts |  4 +--
 .../packages/lib/src/modules/project/types.ts | 13 ++------
 9 files changed, 35 insertions(+), 60 deletions(-)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index ff1aa137..493e04f7 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -283,6 +283,8 @@ def unset_role(self, user_id: int) -> None:
 
     def get_member(self, user_id: int) -> Optional[ProjectMember]:
         """Get project member"""
+        from .permissions import ProjectPermissions
+
         member = self._member(user_id)
         if member:
             return ProjectMember(
@@ -291,6 +293,7 @@ def get_member(self, user_id: int) -> Optional[ProjectMember]:
                 email=member.user.email,
                 project_role=ProjectRole(member.role),
                 workspace_role=self.workspace.get_user_role(member.user),
+                role=ProjectPermissions.get_user_project_role(self, member.user),
             )
 
     def members_by_role(self, role: ProjectRole) -> List[int]:
@@ -350,6 +353,7 @@ class ProjectMember:
     username: str
     workspace_role: WorkspaceRole
     project_role: Optional[ProjectRole]
+    role: ProjectRole
 
 
 @dataclass
diff --git a/server/mergin/sync/public_api_v2.yaml b/server/mergin/sync/public_api_v2.yaml
index a167cb26..bd4b1c0c 100644
--- a/server/mergin/sync/public_api_v2.yaml
+++ b/server/mergin/sync/public_api_v2.yaml
@@ -265,6 +265,11 @@ components:
         - reader
         - guest
       example: writer
+    Role:
+      allOf:
+        - $ref: '#/components/schemas/ProjectRole'
+          nullable: false
+          description: combination of workspace role and project role
     ProjectMember:
       type: object
       properties:
@@ -282,3 +287,5 @@ components:
           $ref: '#/components/schemas/WorkspaceRole'
         project_role:
           $ref: '#/components/schemas/ProjectRole'
+        role:
+          $ref: '#/components/schemas/Role'
diff --git a/server/mergin/sync/public_api_v2_controller.py b/server/mergin/sync/public_api_v2_controller.py
index d2076910..30b2bcb8 100644
--- a/server/mergin/sync/public_api_v2_controller.py
+++ b/server/mergin/sync/public_api_v2_controller.py
@@ -81,6 +81,7 @@ def get_project_collaborators(id):
                     email=user.email,
                     project_role=project_role,
                     workspace_role=workspace_role,
+                    role=ProjectPermissions.get_user_project_role(project, user),
                 )
             )
 
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 2faaae13..b532f5a8 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -405,3 +405,4 @@ class ProjectMemberSchema(Schema):
     email = fields.Email()
     project_role = fields.Enum(enum=ProjectRole, by_value=True)
     workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
+    role = fields.Enum(enum=ProjectRole, by_value=True)
diff --git a/web-app/packages/lib/src/common/permission_utils.ts b/web-app/packages/lib/src/common/permission_utils.ts
index 0470066c..4bba95b5 100644
--- a/web-app/packages/lib/src/common/permission_utils.ts
+++ b/web-app/packages/lib/src/common/permission_utils.ts
@@ -41,14 +41,6 @@ export type ProjectRoleName = Extract<
   'reader' | 'editor' | 'writer' | 'owner'
 >
 
-const ROLE_HIERARCHY: ProjectRoleName[] = [
-  'none',
-  'reader',
-  'editor',
-  'writer',
-  'owner'
-]
-
 export type ProjectPermissionName = 'owner' | 'write' | 'edit' | 'read'
 
 export const USER_ROLE_NAME_BY_ROLE: Record<WorkspaceRole, WorkspaceRoleName> =
@@ -136,8 +128,7 @@ export function isAtLeastGlobalRole(
   roleName: ProjectRoleName,
   globalRole: GlobalRole
 ): boolean {
-  // We have also none role, so we need to add 1 to the global role
-  return PROJECT_ROLE_BY_NAME[roleName] >= globalRole + 1
+  return PROJECT_ROLE_BY_NAME[roleName] >= globalRole
 }
 
 export function getProjectRoleNameValues(): DropdownOption<ProjectRoleName>[] {
@@ -213,22 +204,3 @@ export function getProjectPermissionByRoleName(
   }
   return mapper[roleName]
 }
-
-export function calculateProjectPermission(
-  project_role: ProjectRoleName,
-  workspace_role: WorkspaceRoleName
-): ProjectRoleName {
-  const mappedWorkspaceRole: ProjectRoleName =
-    workspace_role === 'admin' ? 'owner' : (workspace_role as ProjectRoleName)
-
-  if (project_role === 'none' && workspace_role === 'guest') {
-    return 'none'
-  }
-
-  const projectRoleIndex = ROLE_HIERARCHY.indexOf(project_role)
-  const workspaceRoleIndex = ROLE_HIERARCHY.indexOf(mappedWorkspaceRole)
-
-  return projectRoleIndex > workspaceRoleIndex
-    ? project_role
-    : mappedWorkspaceRole
-}
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index 07907142..2b5e9892 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         <template #col-roles="{ item }">
           <AppDropdown
             :options="roles"
-            :model-value="ProjectPermission(item)"
+            :model-value="item.role"
             @update:model-value="(e) => roleUpdate(item, e)"
             :disabled="item.id === loggedUser.id"
             class="w-6 lg:w-full"
@@ -86,7 +86,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 import { computed, ref, onUnmounted } from 'vue'
 
 import { useProjectStore } from '../store'
-import { ProjectCollaborators } from '../types'
+import { ProjectCollaborator } from '../types'
 
 import AppContainer from '@/common/components/AppContainer.vue'
 import AppDropdown from '@/common/components/AppDropdown.vue'
@@ -96,20 +96,14 @@ import { DataViewWrapperColumnItem } from '@/common/components/data-view/types'
 import {
   GlobalRole,
   ProjectRoleName,
-  isAtLeastGlobalRole,
-  calculateProjectPermission
+  isAtLeastGlobalRole, USER_ROLE_NAME_BY_ROLE, WorkspaceRole
 } from '@/common/permission_utils'
 import { useInstanceStore, useUserStore } from '@/main'
 
-interface Props {
-  allowRemove?: boolean
-}
-
 const projectStore = useProjectStore()
 const userStore = useUserStore()
 const instanceStore = useInstanceStore()
 
-const props = withDefaults(defineProps<Props>(), { allowRemove: true })
 
 const itemsPerPage = ref(10)
 const columns = ref<DataViewWrapperColumnItem[]>([
@@ -135,6 +129,8 @@ const columns = ref<DataViewWrapperColumnItem[]>([
     fixed: true
   }
 ])
+
+// TODO: do not bother with GlobalRole but use workspace_role attribute
 const roles = computed(() =>
   projectStore.availableRoles.map((item) => ({
     ...item,
@@ -153,15 +149,18 @@ const searchedItems = computed(() =>
   })
 )
 
-function canRemoveMember(item: ProjectCollaborators) {
-  return props.allowRemove && item.id !== loggedUser.value?.id
+function canRemoveMember(item: ProjectCollaborator) {
+  return (
+    item.workspace_role === USER_ROLE_NAME_BY_ROLE[WorkspaceRole.guest] &&
+    item.id !== loggedUser.value?.id
+  )
 }
 
-function removeMember(item: ProjectCollaborators) {
+function removeMember(item: ProjectCollaborator) {
   projectStore.removeProjectAccess(item)
 }
 
-function roleUpdate(item: ProjectCollaborators, value: ProjectRoleName) {
+function roleUpdate(item: ProjectCollaborator, value: ProjectRoleName) {
   projectStore.updateProjectAccess({
     projectId: projectStore.project.id,
     access: item,
@@ -169,10 +168,6 @@ function roleUpdate(item: ProjectCollaborators, value: ProjectRoleName) {
   })
 }
 
-function ProjectPermission(item: ProjectCollaborators) {
-  return calculateProjectPermission(item.project_role, item.workspace_role)
-}
-
 onUnmounted(() => {
   projectStore.access = []
 })
diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index 7fc36010..6804eb5a 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -334,7 +334,9 @@ export const ProjectApi = {
 
   async getProjectCollaborators(
     projectId: string
-  ): Promise<AxiosResponse<ProjectCollaborators[]>> {
-    return ProjectModule.httpService.get(`/v2/projects/${projectId}/collaborators`)
+  ): Promise<AxiosResponse<ProjectCollaborator[]>> {
+    return ProjectModule.httpService.get(
+      `/v2/projects/${projectId}/collaborators`
+    )
   }
 }
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index 9b9e2bc1..3d43915e 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/web-app/packages/lib/src/modules/project/store.ts
@@ -757,7 +757,7 @@ export const useProjectStore = defineStore('projectModule', {
         this.access = response.data
       } catch {
         notificationStore.error({
-          text: 'Failed to get project access'
+          text: 'Failed to get project collaborators'
         })
       } finally {
         this.accessLoading = false
@@ -816,7 +816,7 @@ export const useProjectStore = defineStore('projectModule', {
         }
         this.access = this.access.map((access) => {
           if (access.id === payload.access.id) {
-            access.project_permission = payload.data.role
+            access.role = payload.data.role
             access.project_role = payload.data.role
           }
           return access
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index febb4898..ad27ca59 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -351,7 +351,7 @@ export type ProjectAccessDetailType = 'invitation' | 'member'
 
 export interface ProjectAccessDetail {
   id: number | string
-  type: ProjectAccessDetailType
+  type?: ProjectAccessDetailType
   role: WorkspaceRoleName
   name?: string
   email: string
@@ -368,17 +368,10 @@ export interface ProjectAccessDetail {
 }
 
 export interface ProjectCollaborator {
-  id: number
-  usernaname: string
-  email: string
-  workspace_role: WorkspaceRoleName
-  project_role: ProjectRoleName
-}
-
-export interface ProjectCollaborators {
   id: number
   email: string
   username: string
   workspace_role: WorkspaceRoleName
-  project_role: ProjectRoleName
+  project_role: ProjectRoleName | null
+  role: ProjectRoleName
 }

From 7f73a3222b1a0300ae94815aac819d4d76cf40f1 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 20 Dec 2024 10:34:51 +0100
Subject: [PATCH 10/14] Add a collaborators property to the project store

---
 .../modules/project/components/ProjectMembersTable.vue   | 8 +++++---
 web-app/packages/lib/src/modules/project/projectApi.ts   | 1 +
 web-app/packages/lib/src/modules/project/store.ts        | 9 ++++++---
 3 files changed, 12 insertions(+), 6 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
index 2b5e9892..33959ed7 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -96,7 +96,9 @@ import { DataViewWrapperColumnItem } from '@/common/components/data-view/types'
 import {
   GlobalRole,
   ProjectRoleName,
-  isAtLeastGlobalRole, USER_ROLE_NAME_BY_ROLE, WorkspaceRole
+  isAtLeastGlobalRole,
+  USER_ROLE_NAME_BY_ROLE,
+  WorkspaceRole
 } from '@/common/permission_utils'
 import { useInstanceStore, useUserStore } from '@/main'
 
@@ -142,7 +144,7 @@ const roles = computed(() =>
 )
 const loggedUser = computed(() => userStore.loggedUser)
 const searchedItems = computed(() =>
-  projectStore.access.filter((item) => {
+  projectStore.collaborators.filter((item) => {
     return [item.username, item.email].some(
       (v) => v && v.toString().toLowerCase().includes(projectStore.accessSearch)
     )
@@ -169,7 +171,7 @@ function roleUpdate(item: ProjectCollaborator, value: ProjectRoleName) {
 }
 
 onUnmounted(() => {
-  projectStore.access = []
+  projectStore.collaborators = []
 })
 
 projectStore.getProjectCollaborators(projectStore.project?.id)
diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index 6804eb5a..7dd04ba7 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -315,6 +315,7 @@ export const ProjectApi = {
     return ProjectModule.httpService.get(url, { responseType: 'blob' })
   },
 
+  // Kept for EE (collaborators + invitation) access, TODO: remove when a separate invitation endpoint is implemented
   async getProjectAccess(
     projectId: string
   ): Promise<AxiosResponse<ProjectAccessDetail[]>> {
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index 3d43915e..ded681af 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/web-app/packages/lib/src/modules/project/store.ts
@@ -44,7 +44,8 @@ import {
   ProjectVersionFileChange,
   ProjectVersionListItem,
   UpdateProjectCollaboratorPayload,
-  UpdatePublicFlagParams
+  UpdatePublicFlagParams,
+  ProjectCollaborator
 } from '@/modules/project/types'
 import { useUserStore } from '@/modules/user/store'
 
@@ -75,6 +76,7 @@ export interface ProjectState {
   availablePermissions: DropdownOption<ProjectPermissionName>[]
   availableRoles: DropdownOption<ProjectRoleName>[]
   versionsChangesetLoading: boolean
+  collaborators: ProjectCollaborator[]
 }
 
 export const useProjectStore = defineStore('projectModule', {
@@ -99,7 +101,8 @@ export const useProjectStore = defineStore('projectModule', {
     accessSorting: undefined,
     availablePermissions: permissionUtils.getProjectPermissionsValues(),
     availableRoles: permissionUtils.getProjectRoleNameValues(),
-    versionsChangesetLoading: false
+    versionsChangesetLoading: false,
+    collaborators: []
   }),
 
   getters: {
@@ -754,7 +757,7 @@ export const useProjectStore = defineStore('projectModule', {
       try {
         this.accessLoading = true
         const response = await ProjectApi.getProjectCollaborators(projectId)
-        this.access = response.data
+        this.collaborators = response.data
       } catch {
         notificationStore.error({
           text: 'Failed to get project collaborators'

From 8389be3318dd6d912fcfebbde6b179c086fd454b Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 20 Dec 2024 11:17:30 +0100
Subject: [PATCH 11/14] Cleanup unused project API

---
 server/mergin/sync/private_api.yaml           | 15 +----
 server/mergin/sync/workspace.py               |  1 +
 .../mergin/tests/test_private_project_api.py  | 58 +------------------
 3 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/server/mergin/sync/private_api.yaml b/server/mergin/sync/private_api.yaml
index 0116cd65..fdd2cab8 100644
--- a/server/mergin/sync/private_api.yaml
+++ b/server/mergin/sync/private_api.yaml
@@ -329,6 +329,7 @@ paths:
         required: true
         schema:
           type: string
+    #  // Kept for EE (collaborators + invitation) access, TODO: remove when a separate invitation endpoint is implemented
     get:
       tags:
         - project
@@ -351,30 +352,18 @@ paths:
           $ref: "#/components/responses/NotFoundResp"
       x-openapi-router-controller: mergin.sync.private_api_controller
     patch:
-      summary: Update direct project access (sharing)
+      summary: Update public project flag
       operationId: update_project_access
       requestBody:
         description: Request data
-        required: true
         content:
           application/json:
             schema:
               type: object
               properties:
-                user_id:
-                  type: integer
                 public:
                   type: boolean
                   nullable: true
-                role:
-                  type: string
-                  enum:
-                    - owner
-                    - writer
-                    - editor
-                    - reader
-                    - none
-                  example: writer
       responses:
         "200":
           $ref: "#/components/schemas/ProjectAccessUpdated"
diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py
index 25b8e6fe..79aef2b9 100644
--- a/server/mergin/sync/workspace.py
+++ b/server/mergin/sync/workspace.py
@@ -307,6 +307,7 @@ def access_requests_query():
         """Project access base query"""
         return AccessRequest.query.join(Project)
 
+    # not used in CE, TODO: remove together with EE when it's replaced there
     def project_access(self, project: Project) -> List[ProjectAccessDetail]:
         """
         Project access users overview
diff --git a/server/mergin/tests/test_private_project_api.py b/server/mergin/tests/test_private_project_api.py
index f475255f..f4add3b8 100644
--- a/server/mergin/tests/test_private_project_api.py
+++ b/server/mergin/tests/test_private_project_api.py
@@ -335,45 +335,7 @@ def test_template_projects(client):
 def test_update_project_access(client, diff_project):
     url = f"/app/project/{diff_project.id}/access"
     original_creator_id = diff_project.creator.id
-    # create user and grant him write access
-    user = add_user("reader", "reader")
-    assert not diff_project.get_role(user.id)
-
-    data = {"user_id": user.id, "role": "none"}
-    # nothing happens
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
-    assert not diff_project.get_role(user.id)
-
-    # grant read access
-    data["role"] = "reader"
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
-    assert diff_project.get_role(user.id) is ProjectRole.READER
-
-    # grant editor access
-    data["role"] = "editor"
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
-    assert diff_project.get_role(user.id) is ProjectRole.EDITOR
-
-    # change to write access
-    data["role"] = "writer"
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
-    assert diff_project.get_role(user.id) is ProjectRole.WRITER
-
-    # downgrade to read access
-    data["role"] = "reader"
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
-    assert diff_project.get_role(user.id) is ProjectRole.READER
-
-    # remove access
-    data["role"] = "none"
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
-    assert not diff_project.get_role(user.id)
+    data = {}
 
     # update public parameter => public: True
     data["public"] = True
@@ -381,24 +343,6 @@ def test_update_project_access(client, diff_project):
     assert resp.status_code == 200
     assert diff_project.public == True
 
-    # access of project creator can be removed
-    data["user_id"] = diff_project.creator_id
-    resp = client.patch(
-        f"/app/project/{diff_project.id}/access",
-        headers=json_headers,
-        data=json.dumps(data),
-    )
-    assert resp.status_code == 200
-    db.session.rollback()
-    assert not diff_project.get_role(user.id)
-    assert diff_project.creator_id == original_creator_id
-
-    # try to grant access to inaccessible user
-    data = {"user_id": 100, "role": "reader"}
-    # nothing happens
-    resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 404
-
 
 def test_restore_project(client, diff_project):
     """Test delete project by user and restore by admin"""

From bbe772067379f66855d6487e4bcd6383d31c554c Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 20 Dec 2024 11:46:07 +0100
Subject: [PATCH 12/14] Separate collaborators method in Project store

---
 .../components/ProjectMembersTable.vue        |  5 +--
 .../packages/lib/src/modules/project/store.ts | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 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
index 33959ed7..e7e01062 100644
--- 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
index ded681af..e9b1f4e4 100644
--- 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({

From c13f1b21dc3894b61616bcbee0a524662ce7cb79 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 20 Dec 2024 13:14:41 +0100
Subject: [PATCH 13/14] update project public flag

---
 server/mergin/sync/private_api.yaml             | 17 ++++++++++++-----
 server/mergin/sync/private_api_controller.py    |  9 ++++-----
 server/mergin/sync/schemas.py                   |  6 +++---
 server/mergin/tests/test_private_project_api.py |  4 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/server/mergin/sync/private_api.yaml b/server/mergin/sync/private_api.yaml
index fdd2cab8..5db24675 100644
--- a/server/mergin/sync/private_api.yaml
+++ b/server/mergin/sync/private_api.yaml
@@ -351,11 +351,19 @@ paths:
         "404":
           $ref: "#/components/responses/NotFoundResp"
       x-openapi-router-controller: mergin.sync.private_api_controller
+  /project/{id}/public:
+    parameters:
+      - name: id
+        in: path
+        description: Project uuid
+        required: true
+        schema:
+          type: string
     patch:
       summary: Update public project flag
-      operationId: update_project_access
+      operationId: update_project_public_flag
       requestBody:
-        description: Request data
+        required: true
         content:
           application/json:
             schema:
@@ -363,10 +371,9 @@ paths:
               properties:
                 public:
                   type: boolean
-                  nullable: true
       responses:
-        "200":
-          $ref: "#/components/schemas/ProjectAccessUpdated"
+        "204":
+          description: OK
         "400":
           $ref: "#/components/responses/BadStatusResp"
         "401":
diff --git a/server/mergin/sync/private_api_controller.py b/server/mergin/sync/private_api_controller.py
index 816c44e9..00d0a13d 100644
--- a/server/mergin/sync/private_api_controller.py
+++ b/server/mergin/sync/private_api_controller.py
@@ -303,17 +303,16 @@ def unsubscribe_project(id):  # pylint: disable=W0612
 
 
 @auth_required
-def update_project_access(id: str):
+def update_project_public_flag(id: str):
     """Modify the project's public flag
 
     :param id: Project uuid
     """
     project = require_project_by_uuid(id, ProjectPermissions.Update)
 
-    if "public" in request.json:
-        project.public = request.json["public"]
-        db.session.commit()
-    return ProjectAccessSchema().dump(project), 200
+    project.public = request.json.get("public", False)
+    db.session.commit()
+    return NoContent, 204
 
 
 @auth_required
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 74e619f6..0d8a11d5 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -358,11 +358,11 @@ def _deserialize(self, value, attr, data, **kwargs):
 class ProjectAccessDetailSchema(Schema):
     id = StrOrInt()
     email = fields.String()
-    role = fields.String()
+    role = fields.Enum(enum=ProjectRole, by_value=True)
     username = fields.String()
     name = fields.String()
-    workspace_role = fields.String()
-    project_role = fields.String()
+    project_role = fields.Enum(enum=ProjectRole, by_value=True)
+    workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
     type = fields.String()
     invitation = fields.Nested(ProjectInvitationAccessSchema())
 
diff --git a/server/mergin/tests/test_private_project_api.py b/server/mergin/tests/test_private_project_api.py
index f4add3b8..f9ac4452 100644
--- a/server/mergin/tests/test_private_project_api.py
+++ b/server/mergin/tests/test_private_project_api.py
@@ -333,14 +333,14 @@ def test_template_projects(client):
 
 
 def test_update_project_access(client, diff_project):
-    url = f"/app/project/{diff_project.id}/access"
+    url = f"/app/project/{diff_project.id}/public"
     original_creator_id = diff_project.creator.id
     data = {}
 
     # update public parameter => public: True
     data["public"] = True
     resp = client.patch(url, headers=json_headers, data=json.dumps(data))
-    assert resp.status_code == 200
+    assert resp.status_code == 204
     assert diff_project.public == True
 
 

From 6b1ac374d31a4db45ad260a58f83faa91569d866 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 20 Dec 2024 14:44:17 +0100
Subject: [PATCH 14/14] Fix tests by rm

---
 .../mergin/tests/test_private_project_api.py  | 58 -------------------
 1 file changed, 58 deletions(-)

diff --git a/server/mergin/tests/test_private_project_api.py b/server/mergin/tests/test_private_project_api.py
index f9ac4452..5d5ec518 100644
--- a/server/mergin/tests/test_private_project_api.py
+++ b/server/mergin/tests/test_private_project_api.py
@@ -418,61 +418,3 @@ def test_admin_project_list(client):
     p.delete()
     resp = client.get("/app/admin/projects?page=1&per_page=15&like=mergin")
     assert len(resp.json["items"]) == 14
-
-
-def test_get_project_access(client):
-    workspace = create_workspace()
-    user = User.query.filter(User.username == "mergin").first()
-    project = create_project("test-project", workspace, user)
-    url = f"/app/project/{project.id}/access"
-    users = []
-    for i in range(5):
-        users.append(add_user(str(i), str(i)))
-    Configuration.GLOBAL_ADMIN = False
-    Configuration.GLOBAL_WRITE = False
-    Configuration.GLOBAL_READ = False
-    resp = client.get(url)
-    assert resp.status_code == 200
-    assert len(resp.json) == 1
-    assert resp.json[0]["role"] == "owner"
-    project.set_role(users[0].id, ProjectRole.OWNER)
-    project.set_role(users[1].id, ProjectRole.WRITER)
-    project.set_role(users[2].id, ProjectRole.READER)
-    db.session.commit()
-    resp = client.get(url)
-    assert resp.status_code == 200
-    assert len(resp.json) == 4
-    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 2
-    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 1
-    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 1
-    # user3 does not have access to the project
-    assert not any(users[3].email == access["email"] for access in resp.json)
-    assert any(users[2].email == access["email"] for access in resp.json)
-    Configuration.GLOBAL_READ = True
-    resp = client.get(url)
-    assert resp.status_code == 200
-    assert len(resp.json) == 6
-    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 2
-    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 1
-    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 3
-    Configuration.GLOBAL_WRITE = True
-    resp = client.get(url)
-    assert resp.status_code == 200
-    assert len(resp.json) == 6
-    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 2
-    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 4
-    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 0
-    Configuration.GLOBAL_ADMIN = True
-    resp = client.get(url)
-    assert resp.status_code == 200
-    assert len(resp.json) == 6
-    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 6
-    assert sum(map(lambda x: int(x["role"] == "writer"), resp.json)) == 0
-    assert sum(map(lambda x: int(x["role"] == "reader"), resp.json)) == 0
-    # pretend a user was deleted to test that api can handle it
-    users[3].inactivate()
-    users[3].anonymize()
-    resp = client.get(url)
-    assert resp.status_code == 200
-    assert len(resp.json) == 5
-    assert sum(map(lambda x: int(x["role"] == "owner"), resp.json)) == 5