From 3f5ed0cab4def5f1588aa6fadc3a73ef99f73ae9 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 4 Mar 2025 10:41:00 +0100 Subject: [PATCH 1/5] add base url for admin /admin to router --- web-app/packages/admin-app/src/router.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-app/packages/admin-app/src/router.ts b/web-app/packages/admin-app/src/router.ts index d4a423cf..1de530fd 100644 --- a/web-app/packages/admin-app/src/router.ts +++ b/web-app/packages/admin-app/src/router.ts @@ -33,7 +33,7 @@ import { LoginView } from './modules/user' export const createRouter = (pinia: Pinia) => { const router = createRouterInstance({ - history: createWebHistory(), + history: createWebHistory(import.meta.env.BASE_URL), routes: [ { path: '/:pathMatch(.*)*', From c98a9188eef4eba1cb869101cdd948c8dd360df9 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 4 Mar 2025 10:52:06 +0100 Subject: [PATCH 2/5] Disable message about opt-out anytime --- .../packages/admin-lib/src/modules/admin/views/SettingsView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue index ee94513d..8204b41a 100644 --- a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue +++ b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue @@ -49,7 +49,7 @@ const settingsItems = ref([ { title: 'Collect statistics', description: - 'Help us improve Mergin Maps by sharing usage information. Mergin Maps collects anonymous usage information to make the service better overtime. You can opt-out anytime.', + 'Help us improve Mergin Maps by sharing usage information. Mergin Maps collects anonymous usage information to make the service better overtime.', key: 'usageInformation' } ]) From 487701ca9893c7fc1766713e2cc6bd4dba3337fe Mon Sep 17 00:00:00 2001 From: Herman Snevajs Date: Tue, 4 Mar 2025 11:15:43 +0100 Subject: [PATCH 3/5] Use the correct method when sharing with new user --- .../lib/src/modules/project/components/ProjectShareDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-app/packages/lib/src/modules/project/components/ProjectShareDialog.vue b/web-app/packages/lib/src/modules/project/components/ProjectShareDialog.vue index 4912777c..9fac8ecc 100644 --- a/web-app/packages/lib/src/modules/project/components/ProjectShareDialog.vue +++ b/web-app/packages/lib/src/modules/project/components/ProjectShareDialog.vue @@ -163,7 +163,7 @@ const share = async () => { roleName: data.permission, projectName: projectStore.project.name }) - await projectStore.getProjectAccess(projectStore.project?.id) + await projectStore.getProjectCollaborators(projectStore.project?.id) dialogStore.close() } catch (err) { emit('onShareError', err as Error) From 925e106125a828944cb59f7004d81cefb15550fc Mon Sep 17 00:00:00 2001 From: Marcel Kocisek Date: Tue, 4 Mar 2025 12:37:23 +0100 Subject: [PATCH 4/5] version 2025.2.1 --- server/mergin/version.py | 2 +- server/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mergin/version.py b/server/mergin/version.py index a366d530..acd1cb0b 100644 --- a/server/mergin/version.py +++ b/server/mergin/version.py @@ -4,4 +4,4 @@ def get_version(): - return "2025.2.0" + return "2025.2.1" diff --git a/server/setup.py b/server/setup.py index 70673c1c..16252a16 100644 --- a/server/setup.py +++ b/server/setup.py @@ -6,7 +6,7 @@ setup( name="mergin", - version="2025.2.0", + version="2025.2.1", url="https://github.com/MerginMaps/mergin", license="AGPL-3.0-only", author="Lutra Consulting Limited", From 8235c98a3423a51d20ecca6ab9eb5025ed7ce6e7 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 5 Mar 2025 10:57:55 +0100 Subject: [PATCH 5/5] Add mapper between global role and project role --- web-app/packages/lib/src/common/permission_utils.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web-app/packages/lib/src/common/permission_utils.ts b/web-app/packages/lib/src/common/permission_utils.ts index 4bba95b5..be94ba8c 100644 --- a/web-app/packages/lib/src/common/permission_utils.ts +++ b/web-app/packages/lib/src/common/permission_utils.ts @@ -128,7 +128,12 @@ export function isAtLeastGlobalRole( roleName: ProjectRoleName, globalRole: GlobalRole ): boolean { - return PROJECT_ROLE_BY_NAME[roleName] >= globalRole + const globalProjectRole = { + [GlobalRole.global_read]: ProjectRole.reader, + [GlobalRole.global_write]: ProjectRole.writer, + [GlobalRole.global_admin]: ProjectRole.owner + } + return PROJECT_ROLE_BY_NAME[roleName] >= globalProjectRole[globalRole] } export function getProjectRoleNameValues(): DropdownOption[] {