@budibase/server 2.5.9 → 2.5.10-alpha.0

package/dist/startup.js

@@ -44,17 +44,15 @@ const fs_1 = __importDefault(require("fs"));
 const watch_1 = require("./watch");
 const automations = __importStar(require("./automations"));
 const fileSystem = __importStar(require("./utilities/fileSystem"));
-const events_1 = __importDefault(require("./events"));
+const events_1 = __importStar(require("./events"));
 const migrations = __importStar(require("./migrations"));
 const bullboard = __importStar(require("./automations/bullboard"));
 const pro = __importStar(require("@budibase/pro"));
 const api = __importStar(require("./api"));
 const sdk_1 = __importDefault(require("./sdk"));
-const pino = require("koa-pino-logger");
 let STARTUP_RAN = false;
 function initRoutes(app) {
     return __awaiter(this, void 0, void 0, function* () {
-        app.use(pino(backend_core_1.logging.pinoSettings()));
         if (!environment_1.default.isTest()) {
             const plugin = yield bullboard.init();
             app.use(plugin);
@@ -79,8 +77,10 @@ function initPro() {
     });
 }
 function shutdown(server) {
-    server.close();
-    server.destroy();
+    if (server) {
+        server.close();
+        server.destroy();
+    }
 }
 function startup(app, server) {
     var _a;
@@ -96,6 +96,7 @@ function startup(app, server) {
         events_1.default.emitPort(environment_1.default.PORT);
         fileSystem.init();
         yield redis.init();
+        (0, events_1.init)();
         // run migrations on startup if not done via http
         // not recommended in a clustered environment
         if (!environment_1.default.HTTP_MIGRATIONS && !environment_1.default.isTest()) {
@@ -104,29 +105,7 @@ function startup(app, server) {
             }
             catch (e) {
                 backend_core_1.logging.logAlert("Error performing migrations. Exiting.", e);
-                shutdown();
-            }
-        }
-        // check and create admin user if required
-        if (environment_1.default.SELF_HOSTED &&
-            !environment_1.default.MULTI_TENANCY &&
-            environment_1.default.BB_ADMIN_USER_EMAIL &&
-            environment_1.default.BB_ADMIN_USER_PASSWORD) {
-            const checklist = yield (0, workerRequests_1.getChecklist)();
-            if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
-                try {
-                    const tenantId = backend_core_1.tenancy.getTenantId();
-                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
-                    // Need to set up an API key for automated integration tests
-                    if (environment_1.default.isTest()) {
-                        yield (0, workerRequests_1.generateApiKey)(user._id);
-                    }
-                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
-                }
-                catch (e) {
-                    backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
-                    shutdown();
-                }
+                shutdown(server);
             }
         }
         // monitor plugin directory if required
@@ -150,6 +129,30 @@ function startup(app, server) {
             // bring routes online as final step once everything ready
             yield initRoutes(app);
         }
+        // check and create admin user if required
+        // this must be run after the api has been initialised due to
+        // the app user sync
+        if (environment_1.default.SELF_HOSTED &&
+            !environment_1.default.MULTI_TENANCY &&
+            environment_1.default.BB_ADMIN_USER_EMAIL &&
+            environment_1.default.BB_ADMIN_USER_PASSWORD) {
+            const checklist = yield (0, workerRequests_1.getChecklist)();
+            if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
+                try {
+                    const tenantId = backend_core_1.tenancy.getTenantId();
+                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
+                    // Need to set up an API key for automated integration tests
+                    if (environment_1.default.isTest()) {
+                        yield (0, workerRequests_1.generateApiKey)(user._id);
+                    }
+                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
+                }
+                catch (e) {
+                    backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
+                    shutdown(server);
+                }
+            }
+        }
     });
 }
 exports.startup = startup;

package/dist/threads/automation.js

@@ -52,14 +52,14 @@ const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
 const sdkUtils = __importStar(require("../sdk/utils"));
 const environment_1 = __importDefault(require("../environment"));
-const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
-const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
+const FILTER_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.FILTER.stepId;
+const LOOP_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
 function getLoopIterations(loopStep, input) {
     const binding = automationUtils.typecastForLooping(loopStep, input);
-    if (!loopStep || !binding) {
-        return 1;
+    if (!binding) {
+        return 0;
     }
     if (Array.isArray(binding)) {
         return binding.length;
@@ -67,7 +67,7 @@ function getLoopIterations(loopStep, input) {
     if (typeof binding === "string") {
         return automationUtils.stringSplit(binding).length;
     }
-    return 1;
+    return 0;
 }
 /**
  * The automation orchestrator is a class responsible for executing automations.
@@ -372,6 +372,17 @@ class Orchestrator {
                         }
                     }
                 }
+                if (loopStep && iterations === 0) {
+                    loopStep = undefined;
+                    this.executionOutput.steps.splice(loopStepNumber + 1, 0, {
+                        id: step.id,
+                        stepId: step.stepId,
+                        outputs: { status: types_1.AutomationStatus.NO_ITERATIONS, success: true },
+                        inputs: {},
+                    });
+                    this._context.steps.splice(loopStepNumber, 1);
+                    iterations = 1;
+                }
                 // Delete the step after the loop step as it's irrelevant, since information is included
                 // in the loop step
                 if (wasLoopStep && !loopStep) {