From 3522ea667aa80e705d94c08f06ee42f33f9e19fd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Sep 2022 14:58:51 +0530
Subject: [PATCH 1/2] fix(gui): add key to avoid router related issues

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/pages/[projectType]/[projectId]/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
index 9dfd3d5852..65d4baacbb 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
@@ -465,7 +465,7 @@ onBeforeUnmount(reset)
       </a-layout-sider>
     </template>
 
-    <div>
+    <div :key="$route.fullPath">
       <dashboard-settings-modal v-model="dialogOpen" :open-key="openDialogKey" />
 
       <NuxtPage />

From 0a95987acfd70d5756d649dbf04a5132b5083e96 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Sep 2022 15:07:32 +0530
Subject: [PATCH 2/2] fix(gui): auth and token tab missing

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/dashboard/settings/Modal.vue   | 32 +++++++++++--------
 .../nc-gui/components/general/FullScreen.vue  |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/Modal.vue b/packages/nc-gui/components/dashboard/settings/Modal.vue
index ebc2cc828e..e9f7546f3f 100644
--- a/packages/nc-gui/components/dashboard/settings/Modal.vue
+++ b/packages/nc-gui/components/dashboard/settings/Modal.vue
@@ -53,20 +53,24 @@ const tabsInfo: TabGroup = {
     title: t('title.teamAndAuth'),
     icon: TeamFillIcon,
     subTabs: {
-      ...(isUIAllowed('userMgmtTab') && {
-        usersManagement: {
-          // Users Management
-          title: t('title.userMgmt'),
-          body: UserManagement,
-        },
-      }),
-      ...(isUIAllowed('apiTokenTab') && {
-        apiTokenManagement: {
-          // API Tokens Management
-          title: t('title.apiTokenMgmt'),
-          body: ApiTokenManagement,
-        },
-      }),
+      ...(isUIAllowed('userMgmtTab')
+        ? {
+            usersManagement: {
+              // Users Management
+              title: t('title.userMgmt'),
+              body: UserManagement,
+            },
+          }
+        : {}),
+      ...(isUIAllowed('apiTokenTab')
+        ? {
+            apiTokenManagement: {
+              // API Tokens Management
+              title: t('title.apiTokenMgmt'),
+              body: ApiTokenManagement,
+            },
+          }
+        : {}),
     },
     onClick: () => {
       $e('c:settings:team-auth')
diff --git a/packages/nc-gui/components/general/FullScreen.vue b/packages/nc-gui/components/general/FullScreen.vue
index d24dcb8030..4667c01daa 100644
--- a/packages/nc-gui/components/general/FullScreen.vue
+++ b/packages/nc-gui/components/general/FullScreen.vue
@@ -16,7 +16,7 @@ const isSidebarsOpen = computed({
 <template>
   <a-tooltip>
     <!-- todo: i18n -->
-    <template #title> {{ isSidebarsOpen ? 'Full width': 'Exit full width'   }}</template>
+    <template #title> {{ isSidebarsOpen ? 'Full width' : 'Exit full width' }}</template>
     <div
       v-e="['c:toolbar:fullscreen']"
       class="nc-fullscreen-btn cursor-pointer flex align-center self-center px-2 py-2 mr-2"