From a3a4b65dff58bb751a5bc4e4428ff32aa939ddf0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 16 Oct 2021 13:59:42 +0530
Subject: [PATCH] fix: form view bugs

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/virtualCell/manyToManyCell.vue        |  2 +-
 .../project/spreadsheet/public/xcTable.vue           |  2 +-
 packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts       | 12 ++++++++++++
 packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts     |  6 +++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/manyToManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/manyToManyCell.vue
index f3b7fd3352..65bc240c95 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/manyToManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/manyToManyCell.vue
@@ -17,7 +17,7 @@
         <span v-if="!isLocked && value && value.length === 10" class="caption pointer ml-1 grey--text" @click="showChildListModal">more...</span>
       </div>
       <div
-        v-if="!active && !isLocked"
+        v-if="!isLocked"
         class="actions align-center justify-center px-1 flex-shrink-1"
         :class="{'d-none': !active, 'd-flex':active }"
       >
diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
index 95018f565a..34892b402e 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
@@ -495,7 +495,7 @@ export default {
 
         this.client = client
         this.meta = meta
-        this.query_params = JSON.parse(qp)
+        this.query_params = qp
         this.dbAlias = dbAlias
         this.metas = relatedTableMetas
 
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
index 0b16ccd18c..38441fd4a2 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
@@ -3716,6 +3716,18 @@ export default class NcMetaMgr {
     } catch (e) {
       console.log(e);
     }
+    viewMeta.query_params = JSON.parse(viewMeta.query_params);
+
+    viewMeta.meta = {
+      ...viewMeta.meta,
+      columns: viewMeta.meta.columns.filter(
+        c => viewMeta.query_params?.showFields?.[c._cn]
+      ),
+
+      v: viewMeta.meta.v?.filter(
+        c => viewMeta.query_params?.showFields?.[c._cn]
+      )
+    };
 
     return viewMeta;
   }
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
index 1c9d201a44..d06e890fff 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
@@ -161,12 +161,12 @@ export default class NcMetaMgrEE extends NcMetaMgr {
         where += where ? `~and(${queryParams.where})` : queryParams.where;
       }
 
-      const fields = queryParams?.fields || '*';
+      const fields = meta.columns.map(c => c._cn).join(',');
 
       return {
         model_name: viewMeta.model_name,
-        meta,
-        queryParams,
+        // meta,
+        // queryParams,
         data: await model.nestedList({
           ...req.query,
           where,