From da25d8b6e5d6f46e3fc321e16fca43ba9496a80f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 30 Apr 2021 15:44:37 +0100 Subject: [PATCH] tidy up --- package.json | 3 +-- .../automation/SetupPanel/AutomationBlockSetup.svelte | 1 + packages/server/scripts/dev/manage.js | 2 +- packages/server/src/api/controllers/script.js | 5 ++--- packages/server/src/api/routes/admin.js | 4 ---- packages/server/src/api/routes/script.js | 6 +----- packages/server/src/automations/steps/executeQuery.js | 1 - packages/server/src/automations/steps/executeScript.js | 8 +++++++- packages/server/src/automations/triggers.js | 1 - 9 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 packages/server/src/api/routes/admin.js diff --git a/package.json b/package.json index 64a3720317..a4b0993fde 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,5 @@ "test:e2e:ci": "lerna run cy:ci", "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": {} + } } diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 58ea8bc67f..758aae2f35 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -91,6 +91,7 @@ {:else if value.customType === 'code'} 
{JSON.stringify(bindings, null, 2)}
+ { diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js index 06262cd797..305df573e4 100644 --- a/packages/server/scripts/dev/manage.js +++ b/packages/server/scripts/dev/manage.js @@ -37,7 +37,7 @@ async function init() { PORT: 4001, MINIO_URL: "http://localhost:10000/", COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/", - // REDIS_URL: "http://localhost:10000/cache/", + REDIS_URL: "http://localhost:10000/cache/", WORKER_URL: "http://localhost:4002", JWT_SECRET: "testsecret", MINIO_ACCESS_KEY: "budibase", diff --git a/packages/server/src/api/controllers/script.js b/packages/server/src/api/controllers/script.js index 297833596e..3e069f8bd9 100644 --- a/packages/server/src/api/controllers/script.js +++ b/packages/server/src/api/controllers/script.js @@ -9,8 +9,8 @@ class ScriptExecutor { } execute() { - this.script.runInContext(this.context) - return this.context + const returnValue = this.script.runInContext(this.context) + return returnValue } } @@ -18,6 +18,5 @@ exports.execute = async function(ctx) { const executor = new ScriptExecutor(ctx.request.body) const result = executor.execute() - ctx.body = result } diff --git a/packages/server/src/api/routes/admin.js b/packages/server/src/api/routes/admin.js deleted file mode 100644 index 540e0d7c6d..0000000000 --- a/packages/server/src/api/routes/admin.js +++ /dev/null @@ -1,4 +0,0 @@ -const app = require("express")() -const { router } = require("bull-board") - -app.use("/admin/queues", router) diff --git a/packages/server/src/api/routes/script.js b/packages/server/src/api/routes/script.js index 48cbad84b3..020d3ec59a 100644 --- a/packages/server/src/api/routes/script.js +++ b/packages/server/src/api/routes/script.js @@ -1,14 +1,10 @@ const Router = require("@koa/router") const controller = require("../controllers/hosting") const authorized = require("../../middleware/authorized") -const selfhost = require("../../middleware/selfhost") const { BUILDER } = require("../../utilities/security/permissions") const router = Router() -router - .post("/api/script", authorized(BUILDER), controller.save) - // this isn't risky, doesn't return anything about apps other than names and URLs - .get("/api/hosting/apps", selfhost, controller.getDeployedApps) +router.post("/api/script", authorized(BUILDER), controller.save) module.exports = router diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js index 0c74cd562e..0ab44e15db 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.js @@ -53,7 +53,6 @@ module.exports.run = async function({ inputs, appId, emitter }) { } const { queryId, ...rest } = inputs.query - console.log(JSON.stringify(inputs.query)) const ctx = { params: { diff --git a/packages/server/src/automations/steps/executeScript.js b/packages/server/src/automations/steps/executeScript.js index b08ab180af..523a9a25e2 100644 --- a/packages/server/src/automations/steps/executeScript.js +++ b/packages/server/src/automations/steps/executeScript.js @@ -2,7 +2,7 @@ const scriptController = require("../../api/controllers/script") module.exports.definition = { name: "Scripting", - tagline: "Execute code", + tagline: "Execute JavaScript Code", icon: "ri-terminal-box-line", description: "Run a piece of JavaScript code in your automation", type: "ACTION", @@ -21,6 +21,11 @@ module.exports.definition = { }, outputs: { properties: { + value: { + type: "string", + description: + "The result of the last statement of the executed script.", + }, success: { type: "boolean", description: "Whether the action was successful", @@ -56,6 +61,7 @@ module.exports.run = async function({ inputs, appId, context, emitter }) { await scriptController.execute(ctx) return { success: ctx.status === 200, + value: ctx.body, } } catch (err) { console.error(err) diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js index e274aed946..3fda81cf1d 100644 --- a/packages/server/src/automations/triggers.js +++ b/packages/server/src/automations/triggers.js @@ -1,6 +1,5 @@ const CouchDB = require("../db") const emitter = require("../events/index") -// const InMemoryQueue = require("../utilities/queue/inMemoryQueue") const Queue = require("bull") const { setQueues, BullAdapter } = require("bull-board") const { getAutomationParams } = require("../db/utils")