From 8098f3fb57a0ad75f7c6d5fa53ad2d9284607d86 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Fri, 29 Jul 2022 13:14:59 +0200
Subject: [PATCH] chore(gui-v2): cleanup

---
 packages/nc-gui-v2/components/general/Sponsors.test.ts      | 2 +-
 .../nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue | 6 +++---
 .../components/smartsheet-toolbar/SortListMenu.vue          | 5 ++---
 packages/nc-gui-v2/composables/useGlobal/index.ts           | 2 ++
 packages/nc-gui-v2/middleware/auth.global.ts                | 4 ++++
 packages/nc-gui-v2/plugins/{i18n.ts => a.i18n.ts}           | 0
 packages/nc-gui-v2/plugins/state.ts                         | 2 ++
 7 files changed, 14 insertions(+), 7 deletions(-)
 rename packages/nc-gui-v2/plugins/{i18n.ts => a.i18n.ts} (100%)

diff --git a/packages/nc-gui-v2/components/general/Sponsors.test.ts b/packages/nc-gui-v2/components/general/Sponsors.test.ts
index fc3800bf67..967adda867 100644
--- a/packages/nc-gui-v2/components/general/Sponsors.test.ts
+++ b/packages/nc-gui-v2/components/general/Sponsors.test.ts
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import { expect, test } from 'vitest'
 import Sponsors from './Sponsors.vue'
 import { createVuetifyPlugin } from '~/plugins/vuetify'
-import { createI18nPlugin } from '~/plugins/i18n'
+import { createI18nPlugin } from '~/plugins/a.i18n'
 
 const mountComponent = async (nav: boolean) => {
   const vuetify = createVuetifyPlugin()
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index 615439ff9e..bd45f04b3b 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -3,9 +3,9 @@ import { ExportTypes } from 'nocodb-sdk'
 import { useToast } from 'vue-toastification'
 import FileSaver from 'file-saver'
 import { useNuxtApp } from '#app'
-import useProject from '~/composables/useProject'
+import { useProject } from '#imports'
 import { ActiveViewInj, MetaInj } from '~/context'
-import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
+import { extractSdkResponseErrorMsg } from '~/utils'
 import MdiFlashIcon from '~icons/mdi/flash-outline'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
 import MdiDownloadIcon from '~icons/mdi/download-outline'
@@ -80,7 +80,7 @@ const exportCsv = async () => {
         toast.success('Successfully exported all table data')
       }
     }
-  } catch (e) {
+  } catch (e: any) {
     toast.error(extractSdkResponseErrorMsg(e))
   }
 }
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index b79eadfbe6..6756d328e8 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import FieldListAutoCompleteDropdown from './FieldListAutoCompleteDropdown.vue'
-import { computed, inject } from '#imports'
+import { computed, inject, useViewSorts } from '#imports'
 import { ActiveViewInj, IsLockedInj, MetaInj, ReloadViewDataHookInj } from '~/context'
-import useViewSorts from '~/composables/useViewSorts'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
 import MdiSortIcon from '~icons/mdi/sort'
 import MdiDeleteIcon from '~icons/mdi/close-box'
@@ -18,7 +17,7 @@ const { sorts, saveOrUpdate, loadSorts, addSort, deleteSort } = useViewSorts(vie
 const columns = computed(() => meta?.value?.columns || [])
 
 watch(
-  () => view?.value?.id,
+  () => (view?.value as any)?.id,
   () => {
     loadSorts()
   },
diff --git a/packages/nc-gui-v2/composables/useGlobal/index.ts b/packages/nc-gui-v2/composables/useGlobal/index.ts
index 16b3e26d93..a66547ae04 100644
--- a/packages/nc-gui-v2/composables/useGlobal/index.ts
+++ b/packages/nc-gui-v2/composables/useGlobal/index.ts
@@ -46,5 +46,7 @@ export const useGlobal = (): UseGlobalReturn => {
   /** provide a fresh state instance into nuxt app */
   provide('state', state)
 
+  console.log('provided state')
+
   return { ...toRefs($$(state)), ...getters, ...actions }
 }
diff --git a/packages/nc-gui-v2/middleware/auth.global.ts b/packages/nc-gui-v2/middleware/auth.global.ts
index 00f4cef0f5..e25694244b 100644
--- a/packages/nc-gui-v2/middleware/auth.global.ts
+++ b/packages/nc-gui-v2/middleware/auth.global.ts
@@ -22,6 +22,10 @@ import { defineNuxtRouteMiddleware, navigateTo, useNuxtApp } from '#app'
 export default defineNuxtRouteMiddleware((to, from) => {
   const { $state } = useNuxtApp()
 
+  if (!$state) return navigateTo('/')
+
+  console.log($state)
+
   /** if auth is required or unspecified (same as required) and user is not signed in, redirect to signin page */
   if ((to.meta.requiresAuth || typeof to.meta.requiresAuth === 'undefined') && !$state.signedIn.value) {
     return navigateTo('/signin')
diff --git a/packages/nc-gui-v2/plugins/i18n.ts b/packages/nc-gui-v2/plugins/a.i18n.ts
similarity index 100%
rename from packages/nc-gui-v2/plugins/i18n.ts
rename to packages/nc-gui-v2/plugins/a.i18n.ts
diff --git a/packages/nc-gui-v2/plugins/state.ts b/packages/nc-gui-v2/plugins/state.ts
index c7cd9d5fe2..8d189367fc 100644
--- a/packages/nc-gui-v2/plugins/state.ts
+++ b/packages/nc-gui-v2/plugins/state.ts
@@ -17,6 +17,8 @@ import { useBreakpoints, useDark, useGlobal, watch } from '#imports'
 export default defineNuxtPlugin((nuxtApp) => {
   const state = useGlobal()
 
+  console.log('state', state)
+
   const darkMode = useDark()
 
   /** get current breakpoints (for enabling sidebar) */