Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes

lerna.json

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

package.json

@@ -40,12 +40,5 @@
     "test:e2e:ci": "lerna run cy:ci",
     "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
     "build:docker:staging": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -"
-  },
-  "dependencies": {
-    "@spectrum-css/actionbutton": "^1.0.1",
-    "@spectrum-css/actiongroup": "^1.0.1",
-    "@spectrum-css/link": "^3.1.1",
-    "@spectrum-css/menu": "^3.0.1",
-    "@spectrum-css/toast": "^3.0.1"
   }
 }

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.4",
+    "@budibase/bbui": "^0.9.5",
-    "@budibase/client": "^0.9.4",
+    "@budibase/client": "^0.9.5",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/string-templates": "^0.9.5",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/pages/builder/app/[application]/_layout.svelte

@@ -91,14 +91,6 @@
         <DeployModal />
       </div>
     </div>
-    <div class="beta">
-      <Button
-        secondary
-        href="https://github.com/Budibase/budibase/discussions/categories/ideas"
-      >
-        Request feature
-      </Button>
-    </div>
     <slot />
   </div>
 {:catch error}
@@ -200,14 +192,4 @@
   i:hover {
     color: var(--ink);
   }
-
-  .beta {
-    position: absolute;
-    bottom: var(--spacing-m);
-    left: var(--spacing-m);
-    z-index: 1;
-  }
-  .beta :global(button) {
-    background-color: var(--background);
-  }
 </style>

packages/builder/src/pages/builder/portal/manage/_layout.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Page } from "@budibase/bbui"
   import { auth } from "stores/portal"
-  import { redirect } from "@roxi/routify"
+  import { page, redirect } from "@roxi/routify"
 
   // Only admins allowed here
   $: {
@@ -9,10 +9,12 @@
       $redirect("../")
     }
   }
+
+  $: console.log($page)
 </script>
 
 {#if $auth.isAdmin}
-  <Page>
+  <Page wide={$page.path.includes("email/:template")}>
     <slot />
   </Page>
 {/if}

packages/builder/src/pages/builder/portal/manage/email/[template].svelte

@@ -69,7 +69,6 @@
   }
 </script>
 
-<Page wide>
 <Layout gap="XS" noPadding>
   <div class="back">
     <ActionButton
@@ -133,7 +132,6 @@
     </div>
   </Tab>
 </Tabs>
-</Page>
 
 <style>
   .template-editor {

packages/builder/src/pages/builder/portal/manage/email/index.svelte

@@ -76,7 +76,6 @@
   fetchSmtp()
 </script>
 
-<Page>
 <Layout>
   <Layout noPadding gap="XS">
     <Heading size="M">Email</Heading>
@@ -140,7 +139,6 @@
     />
   {/if}
 </Layout>
-</Page>
 
 <style>
   .form-row {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -11,6 +11,12 @@
   "scripts": {
     "build": "pkg . --out-path build"
   },
+  "pkg": {
+    "targets": [
+      "node14"
+    ],
+    "outputPath": "build"
+  },
   "dependencies": {
     "axios": "^0.21.1",
     "chalk": "^4.1.0",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,13 +18,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/string-templates": "^0.9.5",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.9.4",
+    "@budibase/standard-components": "^0.9.5",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "fs-extra": "^8.1.0",

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -55,9 +55,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.4",
+    "@budibase/auth": "^0.9.5",
-    "@budibase/client": "^0.9.4",
+    "@budibase/client": "^0.9.5",
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/string-templates": "^0.9.5",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -107,7 +107,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.9.4",
+    "@budibase/standard-components": "^0.9.5",
     "@jest/test-sequencer": "^24.8.0",
     "docker-compose": "^0.23.6",
     "eslint": "^6.8.0",

packages/server/src/api/controllers/application.js

@@ -92,10 +92,6 @@ async function createInstance(template) {
     // https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification
     views: {},
   })
-  // add view for linked rows
-  await createLinkView(appId)
-  await createRoutingView(appId)
-  await createAllSearchIndex(appId)
 
   // replicate the template data to the instance DB
   // this is currently very hard to test, downloading and importing template files
@@ -110,6 +106,11 @@ async function createInstance(template) {
     await db.put(USERS_TABLE_SCHEMA)
   }
 
+  // add view for linked rows
+  await createLinkView(appId)
+  await createRoutingView(appId)
+  await createAllSearchIndex(appId)
+
   return { _id: appId }
 }
 

packages/server/src/api/controllers/automation.js

@@ -65,7 +65,10 @@ async function checkForCronTriggers({ appId, oldAuto, newAuto }) {
   // need to create cron job
   else if (isCronTrigger(newAuto) && cronTriggerActivated) {
     const job = await triggers.automationQueue.add(
-      { automation: newAuto, event: { appId } },
+      {
+        automation: newAuto,
+        event: { appId, timestamp: Date.now() },
+      },
       { repeat: { cron: newTrigger.inputs.cron } }
     )
     // Assign cron job ID from bull so we can remove it later if the cron trigger is removed

packages/server/src/automations/triggers.js

@@ -216,7 +216,15 @@ const BUILTIN_DEFINITIONS = {
         },
         required: ["cron"],
       },
-      outputs: {},
+      outputs: {
+        properties: {
+          timestamp: {
+            type: "number",
+            description: "Timestamp the cron was executed",
+          },
+        },
+        required: ["timestamp"],
+      },
     },
     type: "TRIGGER",
   },

packages/standard-components/package.json

@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.4",
+    "@budibase/bbui": "^0.9.5",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
     "apexcharts": "^3.22.1",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.4",
+    "@budibase/auth": "^0.9.5",
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/string-templates": "^0.9.5",
     "@koa/router": "^8.0.0",
     "aws-sdk": "^2.811.0",
     "bcryptjs": "^2.4.3",

yarn.lock

@@ -824,31 +824,6 @@
     estree-walker "^1.0.1"
     micromatch "^4.0.2"
 
-"@spectrum-css/actionbutton@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
-  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
-
-"@spectrum-css/actiongroup@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c"
-  integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA==
-
-"@spectrum-css/link@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb"
-  integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA==
-
-"@spectrum-css/menu@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe"
-  integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg==
-
-"@spectrum-css/toast@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796"
-  integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg==
-
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"