From fee34c1233f94bb65a272a1cf0a5120af1d5f1cd Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Fri, 23 Sep 2022 11:36:46 +0200
Subject: [PATCH] fix(nc-gui): pass shared base id to loadProjectRoles

---
 packages/nc-gui/composables/useProject.ts     | 6 +++++-
 packages/nc-gui/composables/useRoles/index.ts | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/composables/useProject.ts b/packages/nc-gui/composables/useProject.ts
index 1ed25b61c6..050c20be52 100644
--- a/packages/nc-gui/composables/useProject.ts
+++ b/packages/nc-gui/composables/useProject.ts
@@ -100,7 +100,11 @@ const [setup, use] = useInjectionState((_projectId?: MaybeRef<string>) => {
       return
     }
 
-    await loadProjectRoles(project.value.id || (route.params.projectId as string), isSharedBase.value)
+    await loadProjectRoles(
+      project.value.id || (route.params.projectId as string),
+      isSharedBase.value,
+      route.params.projectId as string,
+    )
 
     await loadTables()
 
diff --git a/packages/nc-gui/composables/useRoles/index.ts b/packages/nc-gui/composables/useRoles/index.ts
index eaa3711fb3..bfa8fd4e1f 100644
--- a/packages/nc-gui/composables/useRoles/index.ts
+++ b/packages/nc-gui/composables/useRoles/index.ts
@@ -37,7 +37,7 @@ export const useRoles = createSharedComposable(() => {
     ...projectRoles.value,
   }))
 
-  async function loadProjectRoles(projectId: string, isSharedBase: boolean) {
+  async function loadProjectRoles(projectId: string, isSharedBase?: boolean, sharedBaseId?: string) {
     projectRoles.value = {}
 
     if (isSharedBase) {
@@ -45,7 +45,7 @@ export const useRoles = createSharedComposable(() => {
         {},
         {
           headers: {
-            'xc-shared-base-id': projectId,
+            'xc-shared-base-id': sharedBaseId,
           },
         },
       )