From 503dbc8da9f55d11e67eb484ff09c0ef2d9ab12e Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Sat, 11 Feb 2023 12:30:13 -0500
Subject: [PATCH] MapView: 'Mapped by' column values should always be delivered
 - WIP

---
 .../nc-gui/components/smartsheet/Form.vue     | 10 ++++++++--
 packages/nc-gui/composables/useViewColumns.ts | 20 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 8b159cf669..3581a64e01 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1,6 +1,7 @@
 <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,
@@ -238,8 +239,13 @@ 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 as Record<string, any>)?.value
+    localColumns?.value
       .filter((col: Record<string, any>) => shouldSkipColumn(col))
       .map((col: Record<string, any>) => col.fk_column_id),
   )
@@ -827,7 +833,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/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index cf50d7d5f2..0180ffb813 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -102,27 +102,39 @@ export function useViewColumns(
     reloadData?.()
     $e('a:fields:show-all')
   }
-  const hideAll = async (ignoreIds?: any) => {
+  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)
+
     if (isLocalMode.value) {
       fields.value = fields.value?.map((field: Field) => ({
         ...field,
         show: !!field.isViewEssentialField,
       }))
-      console.log('fields.value', fields.value)
+      console.info('fields.value', fields.value)
       reloadData?.()
       return
     }
     if (view?.value?.id) {
-      if (ignoreIds) {
+      if (mergedIgnoreIds) {
+        console.info('API call with ignoreIds', mergedIgnoreIds)
         await $api.dbView.hideAllColumn(view.value.id, {
-          ignoreIds,
+          ignoreIds: mergedIgnoreIds,
         })
       } 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')
   }