From 9d4d7a043414b8004ef19e487f67fe060362a33c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 21 Oct 2021 12:20:31 +0530
Subject: [PATCH] feat: public grid view height adjustment

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../project/spreadsheet/public/xcTable.vue    | 30 +++++++------------
 .../nocodb/src/lib/noco/meta/NcMetaMgr.ts     |  2 +-
 .../nocodb/src/lib/noco/meta/NcMetaMgrEE.ts   |  4 +--
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
index fa39cbc20b..7299b247b2 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
@@ -121,12 +121,12 @@
 
       <div
         v-if="meta"
+        class="nc-grid-wrapper d-flex"
         :class="`cell-height-${cellHeight}`"
         style="overflow:auto;transition: width 500ms "
-        class="d-flex"
       >
         <div class="flex-grow-1 h-100" style="overflow-y: auto">
-          <div ref="table" style=" overflow: auto;width:100%">
+          <div ref="table" class="nc-grid" style=" overflow: auto;width:100%">
             <v-skeleton-loader v-if="loadingData" type="table" />
 
             <xc-grid-view
@@ -375,24 +375,6 @@ export default {
     } catch (e) {
       console.log(e)
     }
-
-    if (this.data.length) {
-      // eslint-disable-next-line no-unused-vars
-      const options = {
-        ...this.options,
-        columns: [...this.meta.columns.map((col) => {
-          return {
-            readOnly: col.ai,
-            type: typeof this.data[0][col._cn],
-            title: col._cn,
-            width: '150px'
-          }
-        }), {
-          type: 'hidden',
-          key: ''
-        }]
-      }
-    }
     this.searchField = this.primaryValueColumn
   },
   created() {
@@ -706,6 +688,14 @@ export default {
   justify-content: center;
 }
 
+.nc-grid-wrapper{
+  height:calc(100vh - 120px)
+}
+
+.nc-grid{
+  height: calc(100% - 34px)
+}
+
 </style>
 
 <!--
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
index 8c76d3e6fb..eb36bf181c 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
@@ -3796,7 +3796,7 @@ export default class NcMetaMgr {
     } catch (e) {
       console.log(e);
     }
-    viewMeta.query_params = JSON.parse(viewMeta.query_params);
+    viewMeta.query_params = JSON.parse(viewMeta.query_params) || {};
 
     viewMeta.meta = {
       ...viewMeta.meta,
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
index 2789f5aec1..8392103be1 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
@@ -152,7 +152,7 @@ export default class NcMetaMgrEE extends NcMetaMgr {
       if (!model) {
         throw new Error('Meta not found');
       }
-      const queryParams = JSON.parse(viewMeta.query_params);
+      const queryParams = JSON.parse(viewMeta.query_params) || {};
 
       if (!meta) {
         throw new Error('Meta not found');
@@ -172,7 +172,7 @@ export default class NcMetaMgrEE extends NcMetaMgr {
 
       // todo: move  this logic to a common library
       // todo: replace with condition prop
-      const privateViewWhere = queryParams.filters?.reduce?.(
+      const privateViewWhere = queryParams?.filters?.reduce?.(
         (condition, filt, i) => {
           if (!i && !filt.logicOp) {
             return condition;