Merge branch 'master' of github.com:Budibase/budibase into develop

lerna.json

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

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.59",
+  "version": "0.9.63",
   "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.59",
+  "version": "0.9.63",
   "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.59",
+  "version": "0.9.63",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.59",
-    "@budibase/client": "^0.9.59",
+    "@budibase/bbui": "^0.9.63",
+    "@budibase/client": "^0.9.63",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.59",
+    "@budibase/string-templates": "^0.9.63",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte

@@ -14,7 +14,6 @@
   $: allowDeleteTrigger = !steps.length
 
   function deleteStep() {
-    console.log("Running")
     automationStore.actions.deleteAutomationBlock(block)
   }
 </script>

packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte

@@ -16,11 +16,13 @@
   $: automation = $automationStore.selectedAutomation?.automation
 
   onMount(async () => {
-    // save the automation initially
-    await automationStore.actions.save({
-      instanceId,
-      automation,
-    })
+    if (!automation?.definition?.trigger?.inputs.schemaUrl) {
+      // save the automation initially
+      await automationStore.actions.save({
+        instanceId,
+        automation,
+      })
+    }
     interval = setInterval(async () => {
       await automationStore.actions.fetch()
       const outputs = automation?.definition?.trigger.schema.outputs?.properties

packages/builder/src/components/automation/Shared/WebhookDisplay.svelte

@@ -9,6 +9,9 @@
   $: appUrl = $hostingStore.appUrl
 
   function fullWebhookURL(uri) {
+    if (!uri) {
+      return ""
+    }
     if (production) {
       return `${appUrl}/${uri}`
     } else {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.59",
+  "version": "0.9.63",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.59",
+  "version": "0.9.63",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.59",
-    "@budibase/standard-components": "^0.9.59",
-    "@budibase/string-templates": "^0.9.59",
+    "@budibase/bbui": "^0.9.63",
+    "@budibase/standard-components": "^0.9.63",
+    "@budibase/string-templates": "^0.9.63",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/__mocks__/node-fetch.js

@@ -4,6 +4,11 @@ module.exports = async (url, opts) => {
   function json(body, status = 200) {
     return {
       status,
+      headers: {
+        get: () => {
+          return ["application/json"]
+        },
+      },
       json: async () => {
         return body
       },

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.59",
+  "version": "0.9.63",
   "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.59",
-    "@budibase/client": "^0.9.59",
-    "@budibase/string-templates": "^0.9.59",
+    "@budibase/auth": "^0.9.63",
+    "@budibase/client": "^0.9.63",
+    "@budibase/string-templates": "^0.9.63",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.59",
+    "@budibase/standard-components": "^0.9.63",
     "@jest/test-sequencer": "^24.8.0",
     "babel-jest": "^27.0.2",
     "docker-compose": "^0.23.6",

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

@@ -88,6 +88,8 @@ async function checkForCronTriggers({ appId, oldAuto, newAuto }) {
 async function checkForWebhooks({ appId, oldAuto, newAuto }) {
   const oldTrigger = oldAuto ? oldAuto.definition.trigger : null
   const newTrigger = newAuto ? newAuto.definition.trigger : null
+  const triggerChanged =
+    oldTrigger && newTrigger && oldTrigger.id !== newTrigger.id
   function isWebhookTrigger(auto) {
     return (
       auto &&
@@ -98,25 +100,32 @@ async function checkForWebhooks({ appId, oldAuto, newAuto }) {
   // need to delete webhook
   if (
     isWebhookTrigger(oldAuto) &&
-    !isWebhookTrigger(newAuto) &&
+    (!isWebhookTrigger(newAuto) || triggerChanged) &&
     oldTrigger.webhookId
   ) {
-    let db = new CouchDB(appId)
-    // need to get the webhook to get the rev
-    const webhook = await db.get(oldTrigger.webhookId)
-    const ctx = {
-      appId,
-      params: { id: webhook._id, rev: webhook._rev },
+    try {
+      let db = new CouchDB(appId)
+      // need to get the webhook to get the rev
+      const webhook = await db.get(oldTrigger.webhookId)
+      const ctx = {
+        appId,
+        params: { id: webhook._id, rev: webhook._rev },
+      }
+      // might be updating - reset the inputs to remove the URLs
+      if (newTrigger) {
+        delete newTrigger.webhookId
+        newTrigger.inputs = {}
+      }
+      await webhooks.destroy(ctx)
+    } catch (err) {
+      // don't worry about not being able to delete, if it doesn't exist all good
     }
-    // might be updating - reset the inputs to remove the URLs
-    if (newTrigger) {
-      delete newTrigger.webhookId
-      newTrigger.inputs = {}
-    }
-    await webhooks.destroy(ctx)
   }
   // need to create webhook
-  else if (!isWebhookTrigger(oldAuto) && isWebhookTrigger(newAuto)) {
+  if (
+    (!isWebhookTrigger(oldAuto) || triggerChanged) &&
+    isWebhookTrigger(newAuto)
+  ) {
     const ctx = {
       appId,
       request: {

packages/server/src/api/controllers/static/templates/app.hbs

@@ -1,8 +1,8 @@
 <!doctype html>
 <html>
 
-  <head>   
-    {{{head}}}   
+  <head>
+    {{{head}}}
   </head>
 
   <script>

packages/server/src/automations/steps/outgoingWebhook.js

@@ -77,14 +77,34 @@ module.exports.run = async function ({ inputs }) {
     requestBody.length !== 0 &&
     BODY_REQUESTS.indexOf(requestMethod) !== -1
   ) {
-    request.body = JSON.parse(requestBody)
+    request.body =
+      typeof requestBody === "string"
+        ? requestBody
+        : JSON.stringify(requestBody)
+    request.headers = {
+      "Content-Type": "application/json",
+    }
   }
 
   try {
+    // do a quick JSON parse if there is a body, to generate an error if its invalid
+    if (request.body) {
+      JSON.parse(request.body)
+    }
     const response = await fetch(url, request)
+    const contentType = response.headers.get("content-type")
+    const success = response.status === 200
+    let resp
+    if (!success) {
+      resp = response.statusText
+    } else if (contentType && contentType.indexOf("application/json") !== -1) {
+      resp = await response.json()
+    } else {
+      resp = await response.text()
+    }
     return {
-      response: await response.json(),
-      success: response.status === 200,
+      response: resp,
+      success: success,
     }
   } catch (err) {
     /* istanbul ignore next */

packages/server/src/automations/tests/outgoingWebhook.spec.js

@@ -25,7 +25,7 @@ describe("test the outgoing webhook action", () => {
     expect(res.success).toEqual(true)
     expect(res.response.url).toEqual("http://www.test.com")
     expect(res.response.method).toEqual("POST")
-    expect(res.response.body.a).toEqual(1)
+    expect(JSON.parse(res.response.body).a).toEqual(1)
   })
 
   it("should return an error if something goes wrong in fetch", async () => {

packages/server/src/integrations/utils.js

@@ -24,7 +24,7 @@ exports.generateRowIdField = (keyProps = []) => {
     keyProps = [keyProps]
   }
   // this conserves order and types
-  return encodeURIComponent(JSON.stringify(keyProps))
+  return encodeURIComponent(JSON.stringify(keyProps).replace(/"/g, "'"))
 }
 
 // should always return an array

packages/standard-components/package.json

@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.59",
+  "version": "0.9.63",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.59",
+    "@budibase/bbui": "^0.9.63",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/string-templates/package.json

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

packages/string-templates/src/helpers/index.js

@@ -20,10 +20,13 @@ const HELPERS = [
   // this help is applied to all statements
   new Helper(HelperFunctionNames.ALL, value => {
     // null/undefined values produce bad results
-    if (value == null) {
-      return ""
+    if (value == null || typeof value !== "string") {
+      return value || ""
     }
-    let text = new SafeString(unescape(value).replace(/&/g, "&"))
+    if (value && value.string) {
+      value = value.string
+    }
+    let text = new SafeString(value.replace(/&/g, "&"))
     if (text == null || typeof text !== "string") {
       return text
     }

packages/string-templates/test/helpers.spec.js

@@ -442,4 +442,15 @@ describe("Cover a few complex use cases", () => {
     const output = await processObject(input, tableJson)
     expect(output.dataProvider).not.toBe("Invalid Binding")
   })
+
+  it("should be able to handle external ids", async () => {
+    const input = {
+      dataProvider: "{{ literal [_id] }}",
+    }
+    const context = {
+      _id: "%5B%221%22%2C%221%22%5D",
+    }
+    const output = await processObject(input, context)
+    expect(output.dataProvider).toBe("%5B%221%22%2C%221%22%5D")
+  })
 })

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.59",
+  "version": "0.9.63",
   "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.59",
-    "@budibase/string-templates": "^0.9.59",
+    "@budibase/auth": "^0.9.63",
+    "@budibase/string-templates": "^0.9.63",
     "@koa/router": "^8.0.0",
     "aws-sdk": "^2.811.0",
     "bcryptjs": "^2.4.3",