From 213c028011cb33d472c1be49fa6d4bc0a72f5f83 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 2 Aug 2022 14:31:25 +0200
Subject: [PATCH] chore(gui-v2): update types in `useViewColumns`

---
 .../nc-gui-v2/composables/useViewColumns.ts   | 79 ++++++++++---------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index ffd7ea68f9..9c5a522681 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -29,15 +29,18 @@ export function useViewColumns(
 
     let order = 1
     if (view?.value?.id) {
-      const data = await $api.dbViewColumn.list(view?.value?.id as string)
-      const fieldById: Record<string, any> = data.reduce((o: Record<string, any>, f: any) => {
-        f.show = !!f.show
+      const data = (await $api.dbViewColumn.list(view?.value?.id)) as any[]
+
+      const fieldById = data.reduce<Record<string, any>>((acc, curr) => {
+        curr.show = !!curr.show
+
         return {
-          ...o,
-          [f.fk_column_id as string]: f,
+          ...acc,
+          [curr.fk_column_id]: curr,
         }
       }, {})
-      fields.value = meta.value?.columns
+
+      fields.value = meta.value.columns
         ?.map((column) => {
           const currentColumnField = fieldById[column.id!] || {}
 
@@ -56,32 +59,37 @@ export function useViewColumns(
   }
 
   const showAll = async () => {
-    await $api.dbView.showAllColumn(view?.value?.id as string)
+    if (view?.value?.id) await $api.dbView.showAllColumn(view.value.id)
+
     await loadViewColumns()
     reloadData?.()
   }
   const hideAll = async () => {
-    await $api.dbView.hideAllColumn(view?.value?.id as string)
+    if (view?.value?.id) await $api.dbView.hideAllColumn(view.value.id)
+
     await loadViewColumns()
     reloadData?.()
   }
 
   const saveOrUpdate = async (field: any, index: number) => {
-    if (field.id) {
-      await $api.dbViewColumn.update(view?.value?.id as string, field.id, field)
-    } else {
-      if (fields.value) fields.value[index] = (await $api.dbViewColumn.create(view?.value?.id as string, field)) as any
+    if (field.id && view?.value?.id) {
+      await $api.dbViewColumn.update(view.value.id, field.id, field)
+    } else if (view?.value?.id) {
+      if (fields.value) fields.value[index] = (await $api.dbViewColumn.create(view.value.id, field)) as any
     }
+
     reloadData?.()
   }
 
   const metaColumnById = computed(() => {
-    return meta?.value?.columns?.reduce<Record<string, ColumnType>>((o: Record<string, any>, c: any) => {
-      return {
-        ...o,
-        [c.id]: c,
-      }
-    }, {})
+    return (
+      meta.value.columns?.reduce<Record<string, ColumnType>>((acc, curr) => {
+        return {
+          ...acc,
+          [curr.id!]: curr,
+        }
+      }, {}) || {}
+    )
   })
 
   const showSystemFields = computed({
@@ -90,28 +98,27 @@ export function useViewColumns(
       return (view?.value as any)?.show_system_fields || false
     },
     set(v) {
-      if (view?.value) {
-        $api.dbView.update(
-          view?.value?.id as string,
-          {
-            // todo: update swagger
-            show_system_fields: v,
-          } as any,
-        )
+      if (view?.value?.id) {
+        $api.dbView.update(view.value.id, {
+          // todo: update swagger
+          show_system_fields: v,
+        } as any)
         ;(view.value as any).show_system_fields = v
       }
     },
   })
 
   const filteredFieldList = computed(() => {
-    return fields.value?.filter((field) => {
-      // hide system columns if not enabled
-      if (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[field.fk_column_id as string])) {
-        return false
-      }
+    return (
+      fields.value?.filter((field) => {
+        // hide system columns if not enabled
+        if (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[field.fk_column_id!])) {
+          return false
+        }
 
-      return !filterQuery?.value || field.title.toLowerCase().includes(filterQuery.value.toLowerCase())
-    })
+        return !filterQuery?.value || field.title.toLowerCase().includes(filterQuery.value.toLowerCase())
+      }) || {}
+    )
   })
 
   const sortedAndFilteredFields = computed<ColumnType[]>(() => {
@@ -121,15 +128,15 @@ export function useViewColumns(
         if (
           !showSystemFields.value &&
           metaColumnById.value &&
-          metaColumnById?.value?.[c.fk_column_id as string] &&
-          isSystemColumn(metaColumnById?.value?.[c.fk_column_id as string])
+          metaColumnById?.value?.[c.fk_column_id!] &&
+          isSystemColumn(metaColumnById.value?.[c.fk_column_id!])
         ) {
           return false
         }
         return c.show
       })
       ?.sort((a, b) => a.order - b.order)
-      ?.map((c) => metaColumnById?.value?.[c.fk_column_id as string]) || []) as ColumnType[]
+      ?.map((c) => metaColumnById?.value?.[c.fk_column_id!]) || []) as ColumnType[]
   })
 
   // reload view columns when table meta changes