From 38e42c0e9ebbe78feea31bed7ffdfe3cb24d050f Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Thu, 8 Oct 2020 17:45:47 +0200
Subject: [PATCH] fix optional chaining error and adds guard for no model
 selected.

---
 .../ComponentDropdownMenu.svelte              |  1 -
 packages/standard-components/package.json     |  6 +--
 packages/standard-components/rollup.config.js |  2 +
 .../src/DataGrid/Component.svelte             | 47 ++++++++++---------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
index ec2122d6bf..74fdac6f8e 100644
--- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
@@ -113,7 +113,6 @@
   </div>
 </div>
 <DropdownMenu
-  class="menu"
   bind:this={dropdown}
   on:click={hideDropdown}
   width="170px"
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 8990035d70..2d7eca756c 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -16,13 +16,13 @@
     "@budibase/client": "^0.1.25",
     "@rollup/plugin-commonjs": "^11.1.0",
     "lodash": "^4.17.15",
-    "rollup": "^1.11.0",
+    "rollup": "^2.11.2",
     "rollup-plugin-commonjs": "^10.0.2",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-livereload": "^1.0.1",
     "rollup-plugin-node-resolve": "^5.0.0",
     "rollup-plugin-postcss": "^3.1.5",
-    "rollup-plugin-svelte": "^5.0.0",
+    "rollup-plugin-svelte": "^5.0.3",
     "rollup-plugin-terser": "^7.0.2",
     "shortid": "^2.2.15",
     "sirv-cli": "^0.4.4",
@@ -48,4 +48,4 @@
     "svelte-flatpickr": "^2.4.0",
     "svelte-fusioncharts": "^1.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/standard-components/rollup.config.js b/packages/standard-components/rollup.config.js
index c9230bab00..297b9dbd38 100644
--- a/packages/standard-components/rollup.config.js
+++ b/packages/standard-components/rollup.config.js
@@ -2,6 +2,7 @@ import svelte from "rollup-plugin-svelte"
 import resolve from "rollup-plugin-node-resolve"
 import commonjs from "@rollup/plugin-commonjs"
 import postcss from "rollup-plugin-postcss"
+import { terser } from "rollup-plugin-terser";
 
 const lodash_fp_exports = ["isEmpty"]
 
@@ -16,6 +17,7 @@ export default {
     },
   ],
   plugins: [
+    terser(),
     postcss({
       plugins: [],
     }),
diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index ce5c58aa93..fb323aca79 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -24,29 +24,32 @@
   let model
 
   onMount(async () => {
-    const jsonModel = await _bb.api.get(`/api/models/${datasource.modelId}`)
-    model = await jsonModel.json()
-    const { schema } = model
-    console.log(schema)
-    if (!isEmpty(datasource)) {
-      data = await fetchData(datasource)
-      columnDefs = Object.keys(schema).map((key, i) => {
-        return {
-          headerCheckboxSelection: i === 0,
-          checkboxSelection: i === 0,
-          valueSetter: setters.get(schema[key].type),
-          headerName: key.charAt(0).toUpperCase() + key.slice(1),
-          field: key,
-          hide: shouldHideField(key),
-          sortable: true,
-          editable:
-            schema[key].type !== "boolean" && schema[key].type !== "attachment",
-          cellRenderer: renderers.get(schema[key].type),
-          autoHeight: schema[key].type === "attachment",
-        }
-      })
+    if (datasource.modelId) {
+      const jsonModel = await _bb.api.get(`/api/models/${datasource.modelId}`)
+      model = await jsonModel.json()
+      const { schema } = model
+      console.log(schema)
+      if (!isEmpty(datasource)) {
+        data = await fetchData(datasource)
+        columnDefs = Object.keys(schema).map((key, i) => {
+          return {
+            headerCheckboxSelection: i === 0,
+            checkboxSelection: i === 0,
+            valueSetter: setters.get(schema[key].type),
+            headerName: key.charAt(0).toUpperCase() + key.slice(1),
+            field: key,
+            hide: shouldHideField(key),
+            sortable: true,
+            editable:
+              schema[key].type !== "boolean" &&
+              schema[key].type !== "attachment",
+            cellRenderer: renderers.get(schema[key].type),
+            autoHeight: schema[key].type === "attachment",
+          }
+        })
+      }
+      dataLoaded = true
     }
-    dataLoaded = true
   })
 
   const shouldHideField = name => {