diff --git a/packages/nc-gui-v2/composables/useProject.ts b/packages/nc-gui-v2/composables/useProject.ts index b0e6565aef..da9f6d1b92 100644 --- a/packages/nc-gui-v2/composables/useProject.ts +++ b/packages/nc-gui-v2/composables/useProject.ts @@ -78,8 +78,10 @@ const [setup, use] = useInjectionState((_projectId?: MaybeRef) => { if (projectType === 'base') { const baseData = await $api.public.sharedBaseGet(route.params.projectId as string) project.value = await $api.project.read(baseData.project_id!) - } else { + } else if (projectId.value) { project.value = await $api.project.read(projectId.value) + } else { + return } await loadProjectRoles() await loadTables() diff --git a/packages/nc-gui-v2/composables/useUIPermission/index.ts b/packages/nc-gui-v2/composables/useUIPermission/index.ts index 48e3caaae6..8557bc6524 100644 --- a/packages/nc-gui-v2/composables/useUIPermission/index.ts +++ b/packages/nc-gui-v2/composables/useUIPermission/index.ts @@ -17,7 +17,6 @@ export function useUIPermission() { return acc }, {}) } - // merge user role and project specific user roles const roles = { ...userRoles, diff --git a/packages/nc-gui-v2/composables/useUIPermission/rolePermissions.ts b/packages/nc-gui-v2/composables/useUIPermission/rolePermissions.ts index fec40365bb..0754afbcbf 100644 --- a/packages/nc-gui-v2/composables/useUIPermission/rolePermissions.ts +++ b/packages/nc-gui-v2/composables/useUIPermission/rolePermissions.ts @@ -1,5 +1,9 @@ const rolePermissions = { - super: '*', + /** todo: enable wildcard permission + * limited permission due to unexpected behaviour in shared base if opened in same window */ + super: { + projectTheme: true, + }, creator: '*', owner: '*', guest: {},