From aac40e3494ebaf911fe969a90df36f2daa65d7cf Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Wed, 17 Aug 2022 23:18:48 +0200
Subject: [PATCH] chore(gui-v2): cleanup imports

---
 .../components/dlg/AirtableImport.vue         | 59 ++++++++++---------
 .../nc-gui-v2/components/dlg/TableCreate.vue  | 16 ++---
 .../[projectType]/[projectId]/index/index.vue | 18 +++++-
 .../[projectId]/index/index/index.vue         |  1 +
 4 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/packages/nc-gui-v2/components/dlg/AirtableImport.vue b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
index ae70558e9e..0ec751c566 100644
--- a/packages/nc-gui-v2/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
@@ -1,12 +1,20 @@
 <script setup lang="ts">
-import io from 'socket.io-client'
 import type { Socket } from 'socket.io-client'
-import { Form, message } from 'ant-design-vue'
+import io from 'socket.io-client'
 import type { Card as AntCard } from 'ant-design-vue'
-import { extractSdkResponseErrorMsg, fieldRequiredValidator } from '~/utils'
-import MdiCloseCircleOutlineIcon from '~icons/mdi/close-circle-outline'
-import MdiCurrencyUsdIcon from '~icons/mdi/currency-usd'
-import MdiLoadingIcon from '~icons/mdi/loading'
+import { Form, message } from 'ant-design-vue'
+import {
+  computed,
+  extractSdkResponseErrorMsg,
+  fieldRequiredValidator,
+  nextTick,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  useNuxtApp,
+  useProject,
+  watch,
+} from '#imports'
 
 interface Props {
   modelValue: boolean
@@ -54,29 +62,21 @@ const syncSource = ref({
   },
 })
 
-const validators = computed(() => {
-  return {
-    'details.apiKey': [fieldRequiredValidator],
-    'details.syncSourceUrlOrId': [fieldRequiredValidator],
-  }
-})
+const validators = computed(() => ({
+  'details.apiKey': [fieldRequiredValidator],
+  'details.syncSourceUrlOrId': [fieldRequiredValidator],
+}))
 
 const dialogShow = computed({
-  get() {
-    return modelValue
-  },
-  set(v) {
-    emit('update:modelValue', v)
-  },
+  get: () => modelValue,
+  set: (v) => emit('update:modelValue', v),
 })
 
 const useForm = Form.useForm
 
 const { validateInfos } = useForm(syncSource, validators)
 
-const disableImportButton = computed(() => {
-  return !syncSource.value.details.apiKey || !syncSource.value.details.syncSourceUrlOrId
-})
+const disableImportButton = computed(() => !syncSource.value.details.apiKey || !syncSource.value.details.syncSourceUrlOrId)
 
 async function saveAndSync() {
   await createOrUpdate()
@@ -86,6 +86,7 @@ async function saveAndSync() {
 async function createOrUpdate() {
   try {
     const { id, ...payload } = syncSource.value
+
     if (id !== '') {
       await $fetch(`/api/v1/db/meta/syncs/${id}`, {
         baseURL,
@@ -94,13 +95,12 @@ async function createOrUpdate() {
         body: payload,
       })
     } else {
-      const data: any = await $fetch(`/api/v1/db/meta/projects/${project.value.id}/syncs`, {
+      syncSource.value = await $fetch(`/api/v1/db/meta/projects/${project.value.id}/syncs`, {
         baseURL,
         method: 'POST',
         headers: { 'xc-auth': $state.token.value as string },
         body: payload,
       })
-      syncSource.value = data
     }
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
@@ -113,7 +113,9 @@ async function loadSyncSrc() {
     method: 'GET',
     headers: { 'xc-auth': $state.token.value as string },
   })
+
   const { list: srcs } = data
+
   if (srcs && srcs[0]) {
     srcs[0].details = srcs[0].details || {}
     syncSource.value = migrateSync(srcs[0])
@@ -171,6 +173,7 @@ function migrateSync(src: any) {
     src.details.options.syncViews = src.syncViews
     delete src.syncViews
   }
+
   return src
 }
 
@@ -188,6 +191,7 @@ onMounted(async () => {
   socket = io(new URL(baseURL, window.location.href.split(/[?#]/)[0]).href, {
     extraHeaders: { 'xc-auth': $state.token.value as string },
   })
+
   socket.on('connect_error', () => {
     socket?.disconnect()
     socket = null
@@ -203,7 +207,7 @@ onMounted(async () => {
     progress.value.push(d)
 
     // FIXME: this doesn't work
-    nextTick(() => {
+    await nextTick(() => {
       ;(logRef.value?.$el as HTMLDivElement).scrollTo()
     })
 
@@ -213,6 +217,7 @@ onMounted(async () => {
       // TODO: add tab of the first table
     }
   })
+
   await loadSyncSrc()
 })
 
@@ -317,13 +322,13 @@ onBeforeUnmount(() => {
         <a-card ref="logRef" :body-style="{ backgroundColor: '#000000', height: '400px', overflow: 'auto' }">
           <div v-for="({ msg, status }, i) in progress" :key="i">
             <div v-if="status === 'FAILED'" class="flex items-center">
-              <MdiCloseCircleOutlineIcon class="text-red-500" />
+              <MdiCloseCircleOutline class="text-red-500" />
 
               <span class="text-red-500 ml-2">{{ msg }}</span>
             </div>
 
             <div v-else class="flex items-center">
-              <MdiCurrencyUsdIcon class="text-green-500" />
+              <MdiCurrencyUsd class="text-green-500" />
 
               <span class="text-green-500 ml-2">{{ msg }}</span>
             </div>
@@ -337,7 +342,7 @@ onBeforeUnmount(() => {
             "
             class="flex items-center"
           >
-            <MdiLoadingIcon class="text-green-500 animate-spin" />
+            <MdiLoading class="text-green-500 animate-spin" />
             <span class="text-green-500 ml-2"> Importing</span>
           </div>
         </a-card>
diff --git a/packages/nc-gui-v2/components/dlg/TableCreate.vue b/packages/nc-gui-v2/components/dlg/TableCreate.vue
index 7fcef598a9..c6f0166121 100644
--- a/packages/nc-gui-v2/components/dlg/TableCreate.vue
+++ b/packages/nc-gui-v2/components/dlg/TableCreate.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { Form } from 'ant-design-vue'
-import { onMounted, useProject, useTable, useTabs } from '#imports'
-import { validateTableName } from '~/utils/validation'
+import { computed, onMounted, ref, useProject, useTable, useTabs, useVModel, validateTableName } from '#imports'
 import { TabType } from '~/composables'
 
 interface Props {
-  modelValue?: boolean
+  modelValue: boolean
 }
 
 const props = defineProps<Props>()
@@ -16,6 +15,8 @@ const dialogShow = useVModel(props, 'modelValue', emit)
 
 const isAdvanceOptVisible = ref(false)
 
+const inputEl = ref<HTMLInputElement>()
+
 const { addTab } = useTabs()
 
 const { loadTables } = useProject()
@@ -28,16 +29,14 @@ const { table, createTable, generateUniqueTitle, tables, project } = useTable(as
     title: table.title,
     type: TabType.TABLE,
   })
+
   dialogShow.value = false
 })
 
-const validateDuplicateAlias = (v: string) => {
-  return (tables?.value || []).every((t) => t.title !== (v || '')) || 'Duplicate table alias'
-}
-const inputEl = ref<HTMLInputElement>()
-
 const useForm = Form.useForm
 
+const validateDuplicateAlias = (v: string) => (tables.value || []).every((t) => t.title !== (v || '')) || 'Duplicate table alias'
+
 const validators = computed(() => {
   return {
     title: [validateTableName, validateDuplicateAlias],
@@ -48,6 +47,7 @@ const { validateInfos } = useForm(table, validators)
 
 onMounted(() => {
   generateUniqueTitle()
+
   inputEl.value?.focus()
 })
 </script>
diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
index 9c56c35bd5..6a87f73002 100644
--- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
@@ -33,13 +33,17 @@ const icon = (tab: TabItem) => {
 function openQuickImportDialog(type: string) {
   $e(`a:actions:import-${type}`)
 
+  const isOpen = ref(true)
+
   const { close } = useDialog(DlgQuickImport, {
-    'modelValue': true,
+    'modelValue': isOpen,
     'importType': type,
     'onUpdate:modelValue': closeDialog,
   })
 
   function closeDialog() {
+    isOpen.value = false
+
     close(1000)
   }
 }
@@ -47,12 +51,16 @@ function openQuickImportDialog(type: string) {
 function openTableCreateDialog() {
   $e('a:actions:create-table')
 
+  const isOpen = ref(true)
+
   const { close } = useDialog(DlgTableCreate, {
-    'modelValue': true,
+    'modelValue': isOpen,
     'onUpdate:modelValue': closeDialog,
   })
 
   function closeDialog() {
+    isOpen.value = false
+
     close(1000)
   }
 }
@@ -60,12 +68,16 @@ function openTableCreateDialog() {
 function openAirtableImportDialog() {
   $e('a:actions:import-airtable')
 
+  const isOpen = ref(true)
+
   const { close } = useDialog(DlgAirtableImport, {
-    'modelValue': true,
+    'modelValue': isOpen,
     'onUpdate:modelValue': closeDialog,
   })
 
   function closeDialog() {
+    isOpen.value = false
+
     close(1000)
   }
 }
diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
index e7a3d92c44..e26ac514c4 100644
--- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
+++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
@@ -76,6 +76,7 @@ function openQuickImportDialog(type: QuickImportTypes, file: File) {
 
   function closeDialog() {
     isOpen.value = false
+
     close(1000)
   }
 }