From 5e9b17eb0428aba974ff9d04dd533f65652101c5 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Mon, 25 Jul 2022 16:36:13 +0530
Subject: [PATCH] 
 refactor/gui-v2-settings-modal-rebase-issues-solved-and-pr-reviews-followed

---
 packages/nc-gui-v2/components.d.ts            |  3 ++-
 .../components/dashboard/TreeView.vue         |  3 ++-
 .../dashboard/settings/AuditTab.vue           |  2 +-
 .../dashboard/settings/SettingsModal.vue      |  2 +-
 packages/nc-gui-v2/package-lock.json          | 19 +++++++++++++++++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts
index 1bdea8dc28..5e5f7425e2 100644
--- a/packages/nc-gui-v2/components.d.ts
+++ b/packages/nc-gui-v2/components.d.ts
@@ -46,8 +46,9 @@ declare module '@vue/runtime-core' {
     ATabs: typeof import('ant-design-vue/es')['Tabs']
     ATag: typeof import('ant-design-vue/es')['Tag']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
+    ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle']
     AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
-}
\ No newline at end of file
+}
diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index ee49e992ae..37d97671bf 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -19,6 +19,7 @@ import MdiPlus from '~icons/mdi/plus-circle-outline'
 import MdiDrag from '~icons/mdi/drag-vertical'
 import MdiMenuIcon from '~icons/mdi/dots-vertical'
 import MdiAPIDocIcon from '~icons/mdi/open-in-new'
+import SettingsModal from '~/components/dashboard/settings/SettingsModal.vue'
 
 const { addTab } = useTabs()
 const toast = useToast()
@@ -290,7 +291,7 @@ const addTableTab = (table: TableType) => {
       <span> {{ $t('title.teamAndSettings') }}</span>
     </div>
 
-    <a-modal v-model:visible="settingsDlg" width="max(90vw, 600px)"> Team and settings</a-modal>
+    <SettingsModal :show="settingsDlg" @closed="settingsDlg = false" />
     <DlgTableCreate v-model="tableCreateDlg" />
     <DlgTableRename v-if="renameTableMeta" v-model="renameTableDlg" :table-meta="renameTableMeta" />
   </div>
diff --git a/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue b/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue
index 18045ead4f..a11e763013 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue
@@ -43,7 +43,7 @@ onMounted(async () => {
   }
 })
 
-const tableHeaderRenderer = (label: string) => (value: { text: string }) => h('div', { class: 'text-gray-500' }, label)
+const tableHeaderRenderer = (label: string) => () => h('div', { class: 'text-gray-500' }, label)
 
 const columns = [
   {
diff --git a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
index b894442a9e..38807b799e 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
@@ -131,7 +131,7 @@ watch(
 
 <style scoped>
 .modal-body {
-  height: 70vh;
+  @apply h-[70vh];
 }
 ::-webkit-scrollbar-thumb {
   background-color: darkgrey;
diff --git a/packages/nc-gui-v2/package-lock.json b/packages/nc-gui-v2/package-lock.json
index 7f1dbc4ea1..f55e71ed2e 100644
--- a/packages/nc-gui-v2/package-lock.json
+++ b/packages/nc-gui-v2/package-lock.json
@@ -24,6 +24,7 @@
         "@iconify-json/clarity": "^1.1.4",
         "@iconify-json/material-symbols": "^1.1.8",
         "@iconify-json/mdi": "^1.1.25",
+        "@iconify-json/ri": "^1.1.3",
         "@intlify/vite-plugin-vue-i18n": "^4.0.0",
         "@types/sortablejs": "^1.13.0",
         "@vitejs/plugin-vue": "^2.3.3",
@@ -986,6 +987,15 @@
         "@iconify/types": "*"
       }
     },
+    "node_modules/@iconify-json/ri": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@iconify-json/ri/-/ri-1.1.3.tgz",
+      "integrity": "sha512-YQ45kQNpuHc2bso4fDGhooWou43qy7njD/I5l7vpjcujb+P/K2BfLASbWYTTUKu6lMersuFmO8F7NdGzy6eGWw==",
+      "dev": true,
+      "dependencies": {
+        "@iconify/types": "*"
+      }
+    },
     "node_modules/@iconify/types": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@iconify/types/-/types-1.1.0.tgz",
@@ -14919,6 +14929,15 @@
         "@iconify/types": "*"
       }
     },
+    "@iconify-json/ri": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@iconify-json/ri/-/ri-1.1.3.tgz",
+      "integrity": "sha512-YQ45kQNpuHc2bso4fDGhooWou43qy7njD/I5l7vpjcujb+P/K2BfLASbWYTTUKu6lMersuFmO8F7NdGzy6eGWw==",
+      "dev": true,
+      "requires": {
+        "@iconify/types": "*"
+      }
+    },
     "@iconify/types": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@iconify/types/-/types-1.1.0.tgz",