@budibase/server 1.2.46 → 1.2.49

package/dist/utilities/queue/inMemoryQueue.js

@@ -119,5 +119,8 @@ class InMemoryQueue {
             return {};
         });
     }
+    on() {
+        // do nothing
+    }
 }
 module.exports = InMemoryQueue;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.46",
+  "version": "1.2.49",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.2.46",
-    "@budibase/client": "^1.2.46",
-    "@budibase/pro": "1.2.45",
-    "@budibase/string-templates": "^1.2.46",
-    "@budibase/types": "^1.2.46",
+    "@budibase/backend-core": "^1.2.49",
+    "@budibase/client": "^1.2.49",
+    "@budibase/pro": "1.2.48",
+    "@budibase/string-templates": "^1.2.49",
+    "@budibase/types": "^1.2.49",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "9c20cb857b8fd3caa99fab0c926c32bc2189deaa"
+  "gitHead": "279e3878011f8c1fdb7c1502bc7f19a9efd4bd90"
 }

package/src/api/controllers/row/index.ts

@@ -35,8 +35,9 @@ export async function patch(ctx: any): Promise<any> {
       pickApi(tableId).patch(ctx)
     )
     ctx.status = 200
-    ctx.eventEmitter &&
+    if (!ctx.disableEmit && ctx.eventEmitter) {
       ctx.eventEmitter.emitRow(`row:update`, appId, row, table)
+    }
     ctx.message = `${table.name} updated successfully.`
     ctx.body = row
   } catch (err) {

package/src/automations/listeners.ts

@@ -4,11 +4,11 @@ import * as automation from "../threads/automation"
 
 export const addListeners = (queue: Queue) => {
   logging(queue)
-  // handleStalled(queue)
+  handleStalled(queue)
 }
 
 const handleStalled = (queue: Queue) => {
-  queue.on("active", async (job: Job) => {
+  queue.on("stalled", async (job: Job) => {
     await automation.removeStalled(job as AutomationEvent)
   })
 }

package/src/automations/steps/queryRows.js

@@ -125,6 +125,14 @@ const hasNullFilters = filters =>
 
 exports.run = async function ({ inputs, appId }) {
   const { tableId, filters, sortColumn, sortOrder, limit } = inputs
+  if (!tableId) {
+    return {
+      success: false,
+      response: {
+        message: "You must select a table to query.",
+      },
+    }
+  }
   const table = await getTable(appId, tableId)
   let sortType = FieldTypes.STRING
   if (table && table.schema && table.schema[sortColumn] && sortColumn) {

package/src/automations/steps/updateRow.js

@@ -1,6 +1,7 @@
 const rowController = require("../../api/controllers/row")
 const automationUtils = require("../automationUtils")
 const { buildCtx } = require("./utils")
+const env = require("../../environment")
 
 exports.definition = {
   name: "Update Row",
@@ -83,6 +84,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
       rowId: inputs.rowId,
       tableId: tableId,
     },
+    disableEmit: !env.SELF_HOSTED,
   })
 
   try {

package/src/threads/automation.ts

@@ -473,9 +473,9 @@ export function execute(input: AutomationEvent, callback: WorkerCallback) {
   })
 }
 
-export const removeStalled = (input: AutomationEvent) => {
+export const removeStalled = async (input: AutomationEvent) => {
   const appId = input.data.event.appId
-  doInAppContext(appId, async () => {
+  await doInAppContext(appId, async () => {
     const automationOrchestrator = new Orchestrator(
       input.data.automation,
       input.data.event,

package/src/utilities/queue/inMemoryQueue.js

@@ -113,6 +113,10 @@ class InMemoryQueue {
   async getJob() {
     return {}
   }
+
+  on() {
+    // do nothing
+  }
 }
 
 module.exports = InMemoryQueue