From 42109fa4a75cc2a4f53aacd2597f5532111af9e6 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Fri, 29 Jul 2022 12:37:11 +0200
Subject: [PATCH] chore(gui-v2): cleanup

---
 packages/nc-gui-v2/components/cell/Attachment.vue   |  4 ++--
 .../nc-gui-v2/components/dashboard/TreeView.vue     | 13 ++++++-------
 .../components/dashboard/settings/AppStore.vue      |  1 +
 .../components/smartsheet-header/VirtualCell.vue    |  2 +-
 .../nc-gui-v2/components/smartsheet/Toolbar.vue     |  2 --
 packages/nc-gui-v2/components/tabs/Smartsheet.vue   |  3 +--
 .../components/virtual-cell/ManyToMany.vue          |  3 ++-
 packages/nc-gui-v2/pages/index/index.vue            | 13 +++++++------
 packages/nc-gui-v2/pages/nc/[projectId]/index.vue   |  5 +++--
 .../nc-gui-v2/pages/nc/[projectId]/index/index.vue  |  4 +---
 packages/nc-gui-v2/pages/projects/index.vue         |  4 +---
 packages/nc-gui-v2/pages/projects/index/index.vue   |  2 +-
 packages/nc-gui-v2/pages/projects/index/list.vue    |  1 -
 packages/nc-gui-v2/plugins/i18n.ts                  |  2 +-
 packages/nc-gui-v2/plugins/tele.ts                  |  4 ++--
 packages/nc-gui-v2/utils/projectCreateUtils.ts      |  2 +-
 16 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/Attachment.vue b/packages/nc-gui-v2/components/cell/Attachment.vue
index 4aaa5534bb..52180b6cbb 100644
--- a/packages/nc-gui-v2/components/cell/Attachment.vue
+++ b/packages/nc-gui-v2/components/cell/Attachment.vue
@@ -3,8 +3,8 @@ import { useToast } from 'vue-toastification'
 import { inject, ref, useProject, watchEffect } from '#imports'
 import { useNuxtApp } from '#app'
 import { ColumnInj, MetaInj } from '~/context'
-import { NOCO } from '~/lib/constants'
-import { isImage } from '~/utils/fileUtils'
+import { NOCO } from '~/lib'
+import { isImage } from '~/utils'
 import MaterialPlusIcon from '~icons/mdi/plus'
 import MaterialArrowExpandIcon from '~icons/mdi/arrow-expand'
 
diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index 9c040b6ce1..dbadea1fe1 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -1,15 +1,14 @@
 <script setup lang="ts">
 import { computed } from '@vue/reactivity'
 import { Modal } from 'ant-design-vue'
-import { UITypes } from 'nocodb-sdk'
 import type { LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import Sortable from 'sortablejs'
 import { useToast } from 'vue-toastification'
-import { watchEffect } from '#imports'
+import SettingsModal from './settings/SettingsModal.vue'
+import { useProject, useTabs, useUIPermission, watchEffect } from '#imports'
 import { useNuxtApp, useRoute } from '#app'
-import useProject from '~/composables/useProject'
-import useTabs from '~/composables/useTabs'
-import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
+import { extractSdkResponseErrorMsg } from '~/utils'
 import MdiSettingIcon from '~icons/mdi/cog'
 import MdiTable from '~icons/mdi/table'
 import MdiView from '~icons/mdi/eye-circle-outline'
@@ -19,7 +18,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'
+import { TabType } from '~/composables'
 
 const { addTab } = useTabs()
 const toast = useToast()
@@ -165,7 +164,7 @@ const deleteTable = (table: TableType) => {
         await $api.dbTable.delete(table?.id as string)
 
         closeTab({
-          type: 'table',
+          type: TabType.TABLE,
           id: table.id,
           title: table.title,
         })
diff --git a/packages/nc-gui-v2/components/dashboard/settings/AppStore.vue b/packages/nc-gui-v2/components/dashboard/settings/AppStore.vue
index 74adc645b1..59c5b5c27a 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/AppStore.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/AppStore.vue
@@ -4,6 +4,7 @@ import AppInstall from './app-store/AppInstall.vue'
 import MdiEditIcon from '~icons/ic/round-edit'
 import MdiCloseCircleIcon from '~icons/mdi/close-circle-outline'
 import MdiPlusIcon from '~icons/mdi/plus'
+
 const { $api, $e } = useNuxtApp()
 const toast = useToast()
 
diff --git a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
index 6cd3dadd3d..003d7c4832 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType } from 'nocodb-sdk'
-import { ColumnInj } from '../../context'
+import { ColumnInj } from '~/context'
 import { provide } from '#imports'
 
 const { column } = defineProps<{ column: ColumnType & { meta: any } }>()
diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
index 9c328647e5..93135792eb 100644
--- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
@@ -1,5 +1,3 @@
-<script setup lang="ts"></script>
-
 <template>
   <div class="nc-table-toolbar w-full py-1 flex gap-1 items-center" style="z-index: 7">
     <SmartsheetToolbarSearchData class="flex-shrink" />
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index 24a9501d14..e633514fcd 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import type { ColumnType, ViewType } from 'nocodb-sdk'
 import { ViewTypes } from 'nocodb-sdk'
-import { computed, inject, provide, watch, watchEffect } from '#imports'
+import { computed, inject, provide, useMetas, watch, watchEffect } from '#imports'
 import { ActiveViewInj, FieldsInj, IsLockedInj, MetaInj, ReloadViewDataHookInj, TabMetaInj } from '~/context'
-import useMetas from '~/composables/useMetas'
 
 const { getMeta, metas } = useMetas()
 
diff --git a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
index e022d5a4f3..e7ea737029 100644
--- a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
@@ -2,7 +2,8 @@
 import type { ColumnType } from 'nocodb-sdk'
 import ItemChip from './components/ItemChip.vue'
 import { ColumnInj } from '~/context'
-import useManyToMany from '~/composables/useManyToMany'
+import { useManyToMany } from '#imports'
+
 const column = inject(ColumnInj)
 const value = inject('value')
 const active = false
diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue
index 575ca831eb..62ad1ffd1b 100644
--- a/packages/nc-gui-v2/pages/index/index.vue
+++ b/packages/nc-gui-v2/pages/index/index.vue
@@ -4,8 +4,7 @@ import type { ProjectType } from 'nocodb-sdk'
 import { useToast } from 'vue-toastification'
 import { navigateTo } from '#app'
 import { computed, onMounted } from '#imports'
-import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
-
+import { extractSdkResponseErrorMsg } from '~/utils'
 import MdiDeleteOutline from '~icons/mdi/delete-outline'
 import MdiEditOutline from '~icons/mdi/edit-outline'
 import MdiRefresh from '~icons/mdi/refresh'
@@ -18,7 +17,7 @@ const toast = useToast()
 
 const filterQuery = ref('')
 const loading = ref(true)
-const projects = ref()
+const projects = ref<ProjectType[]>()
 
 const loadProjects = async () => {
   loading.value = true
@@ -28,8 +27,10 @@ const loadProjects = async () => {
 }
 
 const filteredProjects = computed(() => {
-  return projects.value.filter(
-    (project) => !filterQuery.value || project.title?.toLowerCase?.().includes(filterQuery.value.toLowerCase()),
+  return (
+    projects.value?.filter(
+      (project) => !filterQuery.value || project.title?.toLowerCase?.().includes(filterQuery.value.toLowerCase()),
+    ) ?? []
   )
 })
 
@@ -44,7 +45,7 @@ const deleteProject = (project: ProjectType) => {
       try {
         $e('c:project:delete')
         await $api.project.delete(project.id as string)
-        projects.value.splice(projects.value.indexOf(project), 1)
+        projects.value?.splice(projects.value.indexOf(project), 1)
       } catch (e) {
         toast.error(await extractSdkResponseErrorMsg(e))
       }
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
index 7bbdff21e4..4c70c5f50d 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import useTabs from '~/composables/useTabs'
+import { useTabs } from '#imports'
+import { TabType } from '~/composables'
 
 const route = useRoute()
 const { loadProject, loadTables } = useProject(route.params.projectId as string)
@@ -7,7 +8,7 @@ const { addTab } = useTabs()
 const { $state } = useNuxtApp()
 
 if (!route.params.type) {
-  addTab({ type: 'auth', title: 'Team & Auth' })
+  addTab({ type: TabType.AUTH, title: 'Team & Auth' })
 }
 
 await loadProject(route.params.projectId as string)
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
index c45330a8aa..023742631a 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import useTabs from '~/composables/useTabs'
 import { TabMetaInj } from '~/context'
-import useUIPermission from '~/composables/useUIPermission'
+import { useTabs, useUIPermission } from '#imports'
 import MdiPlusIcon from '~icons/mdi/plus'
 import MdiTableIcon from '~icons/mdi/table'
 import MdiCsvIcon from '~icons/mdi/file-document-outline'
@@ -9,7 +8,6 @@ import MdiExcelIcon from '~icons/mdi/file-excel'
 import MdiJSONIcon from '~icons/mdi/code-json'
 import MdiAirTableIcon from '~icons/mdi/table-large'
 import MdiRequestDataSourceIcon from '~icons/mdi/open-in-new'
-import MdiAccountGroupIcon from '~icons/mdi/account-group'
 
 const { tabs, activeTabIndex, activeTab, closeTab } = useTabs()
 
diff --git a/packages/nc-gui-v2/pages/projects/index.vue b/packages/nc-gui-v2/pages/projects/index.vue
index df4a64efe7..3180393d24 100644
--- a/packages/nc-gui-v2/pages/projects/index.vue
+++ b/packages/nc-gui-v2/pages/projects/index.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup>
-import { createVNode } from '@vue/runtime-core'
 import { Modal } from 'ant-design-vue'
 import type { ProjectType } from 'nocodb-sdk'
 import { useToast } from 'vue-toastification'
 import { navigateTo } from '#app'
-import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
+import { extractSdkResponseErrorMsg } from '~/utils'
 import MaterialSymbolsFormatListBulletedRounded from '~icons/material-symbols/format-list-bulleted-rounded'
 import MaterialSymbolsGridView from '~icons/material-symbols/grid-view'
 import MdiPlus from '~icons/mdi/plus'
 import MdiDatabaseOutline from '~icons/mdi/database-outline'
 import MdiFolderOutline from '~icons/mdi/folder-outline'
-import ExclamationCircleOutlined from '~icons/mdi/information-outline'
 
 const navDrawerOptions = [
   {
diff --git a/packages/nc-gui-v2/pages/projects/index/index.vue b/packages/nc-gui-v2/pages/projects/index/index.vue
index c690767640..ef02642fcd 100644
--- a/packages/nc-gui-v2/pages/projects/index/index.vue
+++ b/packages/nc-gui-v2/pages/projects/index/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ProjectType } from 'nocodb-sdk'
 import { navigateTo } from '#app'
-import useColors from '~/composables/useColors'
+import { useColors } from '#imports'
 import MdiMenuDown from '~icons/mdi/menu-down'
 import MdiDeleteOutline from '~icons/mdi/delete-outline'
 import MdiPlus from '~icons/mdi/plus'
diff --git a/packages/nc-gui-v2/pages/projects/index/list.vue b/packages/nc-gui-v2/pages/projects/index/list.vue
index 2dcb96680b..e604e5049c 100644
--- a/packages/nc-gui-v2/pages/projects/index/list.vue
+++ b/packages/nc-gui-v2/pages/projects/index/list.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import type { ProjectType } from 'nocodb-sdk'
 import { navigateTo } from '#app'
-
 import MdiDeleteOutline from '~icons/mdi/delete-outline'
 import MdiEditOutline from '~icons/mdi/edit-outline'
 
diff --git a/packages/nc-gui-v2/plugins/i18n.ts b/packages/nc-gui-v2/plugins/i18n.ts
index fd1f45b7ff..93215ee711 100644
--- a/packages/nc-gui-v2/plugins/i18n.ts
+++ b/packages/nc-gui-v2/plugins/i18n.ts
@@ -46,7 +46,7 @@ export const createI18nPlugin = async () =>
 export default defineNuxtPlugin(async (nuxtApp) => {
   const i18n = await createI18nPlugin()
 
-  nuxtApp.vueApp.i18n = i18n.global
+  nuxtApp.vueApp.i18n = i18n.global as any
 
   nuxtApp.vueApp.use(i18n)
 })
diff --git a/packages/nc-gui-v2/plugins/tele.ts b/packages/nc-gui-v2/plugins/tele.ts
index 1b3d50e5ab..4d93493f09 100644
--- a/packages/nc-gui-v2/plugins/tele.ts
+++ b/packages/nc-gui-v2/plugins/tele.ts
@@ -1,7 +1,7 @@
 import { defineNuxtPlugin } from 'nuxt/app'
 import type { Socket } from 'socket.io-client'
 import io from 'socket.io-client'
-import type { GlobalState } from '~/lib/types'
+import type { UseGlobalReturn } from '~/composables/useGlobal/types'
 
 // todo: ignore init if tele disabled
 export default defineNuxtPlugin(async (nuxtApp) => {
@@ -81,7 +81,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     }
   }
 
-  watch((nuxtApp.$state as GlobalState).token, (newToken, oldToken) => {
+  watch((nuxtApp.$state as UseGlobalReturn).token, (newToken, oldToken) => {
     if (newToken && newToken !== oldToken) init(newToken)
     else if (!newToken) socket.disconnect()
   })
diff --git a/packages/nc-gui-v2/utils/projectCreateUtils.ts b/packages/nc-gui-v2/utils/projectCreateUtils.ts
index 685a9e9ae5..0acc5a0f31 100644
--- a/packages/nc-gui-v2/utils/projectCreateUtils.ts
+++ b/packages/nc-gui-v2/utils/projectCreateUtils.ts
@@ -1,4 +1,4 @@
-import { ClientType } from '~/lib/enums'
+import { ClientType } from '~/lib'
 
 export interface ProjectCreateForm {
   title: string