From e8b375fd5b04090f3eb3e271553cc7263cec5c78 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Sun, 12 Feb 2023 00:03:24 -0500
Subject: [PATCH] MapView: 'Mapped by' column values should always be delivered
 - new approach - WIP

---
 .../nc-gui/components/smartsheet/Form.vue     | 10 ++-----
 .../nc-gui/components/smartsheet/Kanban.vue   |  2 --
 packages/nc-gui/components/smartsheet/Map.vue |  2 --
 .../smartsheet/toolbar/FieldsMenu.vue         | 30 -------------------
 .../smartsheet/toolbar/MappedBy.vue           | 30 -------------------
 packages/nc-gui/composables/useViewColumns.ts | 26 ++++------------
 packages/nc-gui/lib/enums.ts                  |  1 -
 packages/nocodb/src/lib/models/View.ts        | 27 +++++++++++------
 8 files changed, 26 insertions(+), 102 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 3581a64e01..8b159cf669 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable'
 import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isVirtualCol } from 'nocodb-sdk'
-import { Ref } from '@vue/reactivity'
 import {
   ActiveViewInj,
   IsFormInj,
@@ -239,13 +238,8 @@ async function removeAllColumns() {
   for (const col of (localColumns as Record<string, any>)?.value) {
     if (!shouldSkipColumn(col)) col.show = false
   }
-  // // const FOO = (localColumns as Ref<Record<string, any>[]>)?.value
-  // const FOO = localColumns?.value
-  //   .filter((col: Record<string, any>) => shouldSkipColumn(col))
-  //   .map((col: Record<string, any>) => col.fk_column_id)
-
   await hideAll(
-    localColumns?.value
+    (localColumns as Record<string, any>)?.value
       .filter((col: Record<string, any>) => shouldSkipColumn(col))
       .map((col: Record<string, any>) => col.fk_column_id),
   )
@@ -833,7 +827,7 @@ watch(view, (nextView) => {
     @apply px-4 min-h-[75px] w-full h-full;
 
     .nc-attachment {
-      @apply md: (w-[50px] h-[50px]) lg:(w-[75px] h-[75px]) min-h-[50px] min-w-[50px];
+      @apply md:(w-[50px] h-[50px]) lg:(w-[75px] h-[75px]) min-h-[50px] min-w-[50px];
     }
 
     .nc-attachment-cell-dropzone {
diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue
index 2f87ef99c0..7ba8adbc50 100644
--- a/packages/nc-gui/components/smartsheet/Kanban.vue
+++ b/packages/nc-gui/components/smartsheet/Kanban.vue
@@ -111,7 +111,6 @@ const isRowEmpty = (record: any, col: any) => {
 }
 
 reloadViewDataHook?.on(async () => {
-  // alert('reloadViewDataHook')
   await loadKanbanMeta()
   await loadKanbanData()
 })
@@ -132,7 +131,6 @@ const attachments = (record: any): Attachment[] => {
 const reloadAttachments = ref(false)
 
 reloadViewMetaHook?.on(async () => {
-  // alert('reloadViewMetaHook')
   await loadKanbanMeta()
 
   reloadAttachments.value = true
diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 0778a9c233..f512acefd4 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -155,12 +155,10 @@ onMounted(async () => {
 })
 
 reloadViewMetaHook?.on(async () => {
-  // alert('reloadViewMetaHook')
   await loadMapMeta()
 })
 
 reloadViewDataHook?.on(async () => {
-  // alert('reloadViewDataHook')
   await loadMapData()
 })
 
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index fc59c05b56..19c0973f8d 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -52,45 +52,15 @@ const {
 
 const { eventBus } = useSmartsheetStoreOrThrow()
 
-
 eventBus.on((event) => {
-  // alert('eventBus.on in FieldsMenu')
   if (event === SmartsheetStoreEvents.FIELD_RELOAD) {
-    // alert('SmartsheetStoreEvents.FIELD_RELOAD')
     loadViewColumns()
   }
-
-  else if (event === SmartsheetStoreEvents.MAPPED_BY_COLUMN_CHANGE) {
-    alert('SmartsheetStoreEvents.MAPPED_BY_COLUMN_CHANGE')
-    // loadViewColumns()
-  }
 })
 
-// watch(
-//   () => meta.value,
-//   (v) => {
-//     alert('watch(meta.value, (v) => {')
-//     if (v) {
-//       loadViewColumns()
-//     }
-//   },
-// )
-
-// watch(
-//   () => activeView.value,
-//   async (newVal, oldVal) => {
-//     if (newVal !== oldVal && meta.value) {
-//       alert('FOO')
-//       await loadViewColumns()
-//     }
-//   },
-//   { immediate: true },
-// )
-
 watch(
   sortedAndFilteredFields,
   (v) => {
-    // alert('watch(sortedAndFilteredFields, (v) => {')
     if (rootFields) rootFields.value = v || []
   },
   { immediate: true },
diff --git a/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue b/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue
index e753e3e7d6..10c8b30752 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue
@@ -28,34 +28,6 @@ const { loadMapData, loadMapMeta, updateMapMeta, mapMetaData, geoDataFieldColumn
 
 const mappedByDropdown = ref(false)
 
-const { eventBus } = useSmartsheetStoreOrThrow()
-
-
-// const reloadDataHook = inject(ReloadViewDataHookInj)!
-
-// const reloadViewMetaHook = inject(ReloadViewMetaHookInj, undefined)!
-
-// const rootFields = inject(FieldsInj)
-
-// const isLocked = inject(IsLockedInj, ref(false))
-
-// const isPublic = inject(IsPublicInj, ref(false))
-
-// const { $api, $e } = useNuxtApp()
-
-// const {
-//   showSystemFields,
-//   sortedAndFilteredFields,
-//   fields,
-//   filteredFieldList,
-//   filterQuery,
-//   showAll,
-//   hideAll,
-//   saveOrUpdate,
-//   metaColumnById,
-//   loadViewColumns,
-// } = useViewColumns(activeView, meta, () => reloadDataHook.trigger())
-
 watch(
   () => activeView.value?.id,
   async (newVal, oldVal) => {
@@ -76,8 +48,6 @@ const geoDataMappingFieldColumnId = computed({
       await loadMapMeta()
       await loadMapData()
       ;(activeView.value?.view as MapType).fk_geo_data_col_id = val
-      await loadViewColumns()
-      eventBus.emit(SmartsheetStoreEvents.MAPPED_BY_COLUMN_CHANGE)
     }
   },
 })
diff --git a/packages/nc-gui/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index 37c21e4789..294fbc85d2 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -1,5 +1,5 @@
-import { ViewTypes, isSystemColumn } from 'nocodb-sdk'
-import type { ColumnType, MapType, TableType, ViewType } from 'nocodb-sdk'
+import { isSystemColumn } from 'nocodb-sdk'
+import type { ColumnType, TableType, ViewType } from 'nocodb-sdk'
 import type { ComputedRef, Ref } from 'vue'
 import { IsPublicInj, computed, inject, ref, useNuxtApp, useProject, useUIPermission, watch } from '#imports'
 import type { Field } from '~/lib'
@@ -25,7 +25,6 @@ export function useViewColumns(
     () => isPublic.value || !isUIAllowed('hideAllColumns') || !isUIAllowed('showAllColumns') || isSharedBase.value,
   )
 
-  // const isColumnOrFieldViewEssential = (columnOrField: { id?: string }) => {
   const isColumnViewEssential = (column: ColumnType) => {
     // TODO: delegate this via a cleaner design pattern to map view specific check logic
     // (on the other hand, the logic complexity is still very low atm - might be overkill)
@@ -71,7 +70,6 @@ export function useViewColumns(
             ...currentColumnField,
             order: currentColumnField.order || order++,
             system: isSystemColumn(metaColumnById?.value?.[currentColumnField.fk_column_id!]),
-            // show: isColumnViewEssential(column) || !!currentColumnField.show,
             isViewEssentialField: isColumnViewEssential(column),
           }
         })
@@ -103,39 +101,27 @@ export function useViewColumns(
     reloadData?.()
     $e('a:fields:show-all')
   }
-  const hideAll = async (ignoreIds?: any[]) => {
-    console.info('isLocalMode.value', isLocalMode.value)
-    const viewEssentialColumnIds = fields.value
-      ?.filter((field: Field) => field.isViewEssentialField)
-      ?.map((field: Field) => field.fk_column_id)
-    console.info('viewEssentialColumnIds', viewEssentialColumnIds)
-
-    const mergedIgnoreIds = [...(viewEssentialColumnIds || []), ...(ignoreIds || [])]
-    console.info('mergedIgnoreIds', mergedIgnoreIds)
-
+  const hideAll = async (ignoreIds?: any) => {
     if (isLocalMode.value) {
       fields.value = fields.value?.map((field: Field) => ({
         ...field,
+        // show: false,
         show: !!field.isViewEssentialField,
       }))
-      console.info('fields.value', fields.value)
       reloadData?.()
       return
     }
     if (view?.value?.id) {
-      if (mergedIgnoreIds) {
-        console.info('API call with ignoreIds', mergedIgnoreIds)
+      if (ignoreIds) {
         await $api.dbView.hideAllColumn(view.value.id, {
-          ignoreIds: mergedIgnoreIds,
+          ignoreIds,
         })
       } else {
         await $api.dbView.hideAllColumn(view.value.id)
       }
-      console.info('fields.value AFTER API CALL for hideAllColumn', fields.value)
     }
 
     await loadViewColumns()
-    console.info('fields.value AFTER loadViewColumns', fields.value)
     reloadData?.()
     $e('a:fields:show-all')
   }
diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index a56f85e4ed..e5d60396ec 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -87,7 +87,6 @@ export enum SmartsheetStoreEvents {
   FILTER_RELOAD = 'filter-reload',
   DATA_RELOAD = 'data-reload',
   FIELD_RELOAD = 'field-reload',
-  MAPPED_BY_COLUMN_CHANGE = 'mapped-by-column-change',
   FIELD_ADD = 'field-add',
 }
 
diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index 8dbc13566a..2d23dc2181 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -17,6 +17,7 @@ import Filter from './Filter';
 import {
   ColumnReqType,
   isSystemColumn,
+  MapType,
   UITypes,
   ViewType,
   ViewTypes,
@@ -433,9 +434,7 @@ export default class View implements ViewType {
           } else {
             show = false;
           }
-        }
-
-        else if (view.type === ViewTypes.KANBAN && !copyFromView) {
+        } else if (view.type === ViewTypes.KANBAN && !copyFromView) {
           const kanbanView = await KanbanView.get(view_id, ncMeta);
           if (vCol.id === kanbanView?.fk_grp_col_id) {
             // include grouping field if it exists
@@ -452,14 +451,12 @@ export default class View implements ViewType {
             // other columns will be hidden
             show = false;
           }
-        }
-        
-        else if (view.type === ViewTypes.MAP && !copyFromView) {
+        } else if (view.type === ViewTypes.MAP && !copyFromView) {
           const mapView = await MapView.get(view_id, ncMeta);
           if (vCol.id === mapView?.fk_geo_data_col_id) {
             show = true;
+          }
         }
-      }
 
         // if columns is list of virtual columns then get the parent column
         const col = vCol.fk_column_id
@@ -1167,9 +1164,21 @@ export default class View implements ViewType {
     const scope = this.extractViewColumnsTableNameScope(view);
     // get existing cache
     const dataList = await NocoCache.getList(scope, [viewId]);
+
+    // (view.type !== ViewTypes.MAP || (view as MapType).fk_geo_data_col_id === o
+    const mergedIgnoreColdIds = [
+      ...ignoreColdIds,
+      ...(view.type === ViewTypes.MAP
+        ? [(view as MapType).fk_geo_data_col_id]
+        : []),
+    ];
+
     if (dataList?.length) {
       for (const o of dataList) {
-        if (!ignoreColdIds?.length || !ignoreColdIds.includes(o.fk_column_id)) {
+        if (
+          !mergedIgnoreColdIds?.length ||
+          !mergedIgnoreColdIds.includes(o.fk_column_id)
+        ) {
           // set data
           o.show = false;
           // set cache
@@ -1186,7 +1195,7 @@ export default class View implements ViewType {
       {
         fk_view_id: viewId,
       },
-      ignoreColdIds?.length
+      mergedIgnoreColdIds?.length
         ? {
             _not: {
               fk_column_id: {