Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.9.33-alpha.7",
+  "version": "2.9.33-alpha.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js

@@ -3,6 +3,9 @@ import { Screen } from "./utils/Screen"
 import { Component } from "./utils/Component"
 
 export default function (datasources) {
+  if (!Array.isArray(datasources)) {
+    return []
+  }
   return datasources.map(datasource => {
     return {
       name: `${datasource.name} - List`,

packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte

@@ -110,7 +110,7 @@
     if (mode === "table") {
       datasourceModal.show()
     } else if (mode === "blank") {
-      let templates = getTemplates($store, $tables.list)
+      let templates = getTemplates($tables.list)
       const blankScreenTemplate = templates.find(
         t => t.id === "createFromScratch"
       )