Merge branch 'master' of github.com:Budibase/budibase into form-builder

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.3",
+  "version": "0.6.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.5.3",
+  "version": "0.6.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.55.2",
-    "@budibase/client": "^0.5.3",
+    "@budibase/client": "^0.6.2",
     "@budibase/colorpicker": "^1.0.1",
-    "@budibase/string-templates": "^0.5.3",
+    "@budibase/string-templates": "^0.6.2",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "^0.7.0",

packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte

@@ -20,10 +20,7 @@
 </script>
 
 <div on:click|stopPropagation bind:this={anchor}>
-  <TextButton
+  <TextButton text on:click={dropdown.show} active={false}>
-    text
-    on:click={dropdown.show}
-    active={false}>
     <Icon name="add" />
     Add Parameters
   </TextButton>

packages/builder/src/components/common/Notification/NotificationDisplay.svelte

@@ -1,6 +1,6 @@
 <script>
   import { notificationStore } from "builderStore/store/notifications"
-  import { flip } from 'svelte/animate';
+  import { flip } from "svelte/animate"
   import { fly } from "svelte/transition"
 
   export let themes = {

packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte

@@ -33,6 +33,9 @@
       parameters: {},
       [EVENT_TYPE_KEY]: actionType.name,
     }
+    if (!actions) {
+      actions = []
+    }
     actions.push(newAction)
     selectedAction = newAction
     actions = actions
@@ -73,7 +76,8 @@
         <div class="action-container">
           <div class="action-header" on:click={selectAction(action)}>
             <span class:selected={action === selectedAction}>
-              {index + 1}. {action[EVENT_TYPE_KEY]}
+              {index + 1}.
+              {action[EVENT_TYPE_KEY]}
             </span>
           </div>
           <i

packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte

@@ -34,7 +34,9 @@
     }))
     return [...acc, ...viewsArr]
   }, [])
-  $: queries = $backendUiStore.queries.filter(query => query.queryVerb === "read").map(query => ({
+  $: queries = $backendUiStore.queries
+    .filter(query => query.queryVerb === "read")
+    .map(query => ({
       label: query.name,
       name: query.name,
       tableId: query._id,

packages/builder/src/components/integration/QueryFieldsBuilder.svelte

@@ -24,7 +24,7 @@
 </script>
 
 <form on:submit|preventDefault>
-<div class="field">
+  <div class="field">
     {#each schemaKeys as field}
       <Input
         placeholder="Enter {field} name"
@@ -34,7 +34,7 @@
         required={schema.fields[field]?.required}
         bind:value={fields[field]} />
     {/each}
-</div>
+  </div>
 </form>
 {#if schema.customisable}
   <Editor

packages/builder/src/components/integration/QueryViewer.svelte

@@ -136,7 +136,10 @@
   </div>
   {#if config}
     <div class="props">
-    <div class="query-type">Query type: <span class="query-type-span">{config[query.queryVerb].type}</span></div>
+      <div class="query-type">
+        Query type:
+        <span class="query-type-span">{config[query.queryVerb].type}</span>
+      </div>
       <div class="select">
         <Select primary thin bind:value={query.queryVerb}>
           {#each Object.keys(config) as queryVerb}
@@ -145,7 +148,9 @@
         </Select>
       </div>
     </div>
-    <EditQueryParamsPopover bind:parameters={query.parameters} bindable={false} />
+    <EditQueryParamsPopover
+      bind:parameters={query.parameters}
+      bindable={false} />
   {/if}
 </header>
 <Spacer extraLarge />
@@ -182,7 +187,11 @@
               {#each fields as field, idx}
                 <Spacer small />
                 <div class="field">
-                  <Input outline placeholder="Field Name" type={'text'} bind:value={field.name} />
+                  <Input
+                    outline
+                    placeholder="Field Name"
+                    type={'text'}
+                    bind:value={field.name} />
                   <Select thin border bind:value={field.type}>
                     <option value={''}>Select a field type</option>
                     <option value={'STRING'}>Text</option>
@@ -206,7 +215,6 @@
 {/if}
 
 <style>
-
   .input {
     width: 300px;
   }

packages/builder/src/components/integration/index.svelte

@@ -20,7 +20,6 @@
   }
 </script>
 
-
 {#if schema}
   {#key query._id}
     {#if schema.type === QueryTypes.SQL}

packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte

@@ -58,7 +58,6 @@
       </div>
     </div>
   </section>
-
 {/if}
 
 <style>

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.5.3",
+  "version": "0.6.2",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.5.3",
+    "@budibase/string-templates": "^0.6.2",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.5.3",
+    "@budibase/standard-components": "^0.6.2",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",

packages/client/src/components/ClientApp.svelte

@@ -4,18 +4,12 @@
   import Component from "./Component.svelte"
   import NotificationDisplay from "./NotificationDisplay.svelte"
   import SDK from "../sdk"
-  import {
+  import { createDataStore, initialise, screenStore } from "../store"
-    createDataStore,
-    initialise,
-    screenStore,
-    builderStore,
-  } from "../store"
 
   // Provide contexts
   setContext("sdk", SDK)
   setContext("component", writable({}))
   setContext("data", createDataStore())
-  setContext("screenslot", false)
 
   let loaded = false
 

packages/client/src/components/NotificationDisplay.svelte

@@ -1,5 +1,5 @@
 <script>
-    import { flip } from 'svelte/animate';
+  import { flip } from "svelte/animate"
   import { fly } from "svelte/transition"
   import { getContext } from "svelte"
   const { notifications } = getContext("sdk")
@@ -11,9 +11,9 @@
     info: "#5bc0de",
     default: "#aaaaaa",
   }
-  </script>
+</script>
 
-  <div class="notifications">
+<div class="notifications">
   {#each $notifications as notification (notification.id)}
     <div
       animate:flip
@@ -24,9 +24,9 @@
       {#if notification.icon}<i class={notification.icon} />{/if}
     </div>
   {/each}
-  </div>
+</div>
 
-  <style>
+<style>
   .notifications {
     position: fixed;
     top: 10px;
@@ -56,5 +56,4 @@
     color: white;
     font-weight: 500;
   }
-  </style>
+</style>
-  

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.5.3",
+  "version": "0.6.2",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,8 +49,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.5.3",
+    "@budibase/client": "^0.6.2",
-    "@budibase/string-templates": "^0.5.3",
+    "@budibase/string-templates": "^0.6.2",
     "@elastic/elasticsearch": "^7.10.0",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",

packages/standard-components/.npmignore

@@ -1,3 +0,0 @@
-*
-!dist/*
-!components.json

packages/standard-components/package.json

@@ -10,6 +10,11 @@
     "start:dev": "sirv public --single --dev",
     "dev:builder": "rollup -cw"
   },
+  "files": [
+    "manifest.json",
+    "package.json",
+    "dist"
+  ],
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.1",
     "@rollup/plugin-commonjs": "^16.0.0",
@@ -30,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.5.3",
+  "version": "0.6.2",
   "license": "MIT",
   "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
   "dependencies": {

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.5.3",
+  "version": "0.6.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "dist/bundle.js",
   "module": "dist/bundle.js",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.5.3",
+  "version": "0.6.2",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {