@saltcorn/server 0.8.6-beta.14 → 0.8.6-beta.16

package/load_plugins.js

@@ -209,13 +209,14 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
     }
   }
   if (version) plugin.version = version;
-  if (!noSignalOrDB) await plugin.upsert();
-  if (!noSignalOrDB && process.send)
-    process.send({
+  if (!noSignalOrDB) {
+    await plugin.upsert();
+    getState().processSend({
       installPlugin: plugin,
       tenant: db.getTenantSchema(),
       force,
     });
+  }
 };
 
 module.exports = {

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.6-beta.14",
+  "version": "0.8.6-beta.16",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.6-beta.14",
-    "@saltcorn/builder": "0.8.6-beta.14",
-    "@saltcorn/data": "0.8.6-beta.14",
-    "@saltcorn/admin-models": "0.8.6-beta.14",
-    "@saltcorn/filemanager": "0.8.6-beta.14",
-    "@saltcorn/markup": "0.8.6-beta.14",
-    "@saltcorn/sbadmin2": "0.8.6-beta.14",
+    "@saltcorn/base-plugin": "0.8.6-beta.16",
+    "@saltcorn/builder": "0.8.6-beta.16",
+    "@saltcorn/data": "0.8.6-beta.16",
+    "@saltcorn/admin-models": "0.8.6-beta.16",
+    "@saltcorn/filemanager": "0.8.6-beta.16",
+    "@saltcorn/markup": "0.8.6-beta.16",
+    "@saltcorn/sbadmin2": "0.8.6-beta.16",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/routes/actions.js

@@ -171,6 +171,13 @@ const triggerForm = async (req, trigger) => {
         required: true,
         options: Trigger.when_options.map((t) => ({ value: t, label: t })),
         sublabel: req.__("Event type which runs the trigger"),
+        attributes: {
+          explainers: {
+            Often: "Every 5 minutes",
+            Never:
+              "Not scheduled but can be run as an action from a button click",
+          },
+        },
       },
       {
         name: "table_id",

package/routes/admin.js

@@ -954,12 +954,14 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
-      if (process.send) process.send("RestartServer");
+      if (process.send) getState().processSend("RestartServer");
       else process.exit(0);
     } else {
       await restart_tenant(loadAllPlugins);
-      process.send &&
-        process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
+      getState().processSend({
+        restart_tenant: true,
+        tenant: db.getTenantSchema(),
+      });
       req.flash("success", req.__("Restart complete"));
       res.redirect("/admin");
     }
@@ -1000,7 +1002,7 @@ router.post(
           )
         );
         setTimeout(() => {
-          if (process.send) process.send("RestartServer");
+          getState().processSend("RestartServer");
           process.exit(0);
         }, 100);
       });

package/routes/plugins.js

@@ -669,11 +669,10 @@ router.post(
       const instore = await Plugin.store_plugins_available();
       const store_plugin = instore.find((p) => p.name === plugin.name);
       if (store_plugin && store_plugin.has_auth) flash_restart(req);
-      process.send &&
-        process.send({
-          refresh_plugin_cfg: plugin.name,
-          tenant: db.getTenantSchema(),
-        });
+      getState().processSend({
+        refresh_plugin_cfg: plugin.name,
+        tenant: db.getTenantSchema(),
+      });
       if (module.layout) await sleep(500); // Allow other workers to reload this plugin
       res.redirect("/plugins");
     }
@@ -700,11 +699,10 @@ router.post(
         };
         await plugin.upsert();
         await load_plugins.loadPlugin(plugin);
-        process.send &&
-          process.send({
-            refresh_plugin_cfg: plugin.name,
-            tenant: db.getTenantSchema(),
-          });
+        getState().processSend({
+          refresh_plugin_cfg: plugin.name,
+          tenant: db.getTenantSchema(),
+        });
         res.json({ success: "ok" });
       }
     }
@@ -955,8 +953,10 @@ router.get(
       }
       req.flash("success", req.__(`Modules up-to-date`));
       await restart_tenant(loadAllPlugins);
-      process.send &&
-        process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
+      getState().processSend({
+        restart_tenant: true,
+        tenant: db.getTenantSchema(),
+      });
     }
     res.redirect(`/plugins`);
   })

package/routes/tables.js

@@ -563,9 +563,9 @@ router.get(
     const { idorname } = req.params;
     let id = parseInt(idorname);
     let table;
-    if (id) table = Table.findOne({ id });
+    if (id) [table] = await Table.find({ id });
     else {
-      table = Table.findOne({ name: idorname });
+      [table] = await Table.find({ name: idorname });
     }
 
     if (!table) {
@@ -911,12 +911,10 @@ router.post(
         rest.provider_name !== "Database table"
       ) {
         const table = await Table.create(name, rest);
-        await sleep(500); // Allow other workers to load this view
         res.redirect(`/table/provider-cfg/${table.id}`);
       } else {
         delete rest.provider_name;
         const table = await Table.create(name, rest);
-        await sleep(500); // Allow other workers to load this view
         req.flash("success", req.__(`Table %s created`, name));
         res.redirect(`/table/${table.id}`);
       }

package/routes/view.js

@@ -117,7 +117,7 @@ router.post(
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 
-    const view = await View.findOne({ name: viewname });
+    const [view] = await View.find({ name: viewname });
     if (!view) {
       res.send("");
       return;

package/routes/viewedit.js

@@ -470,7 +470,6 @@ router.post(
           else v.configuration = {};
           //console.log(v);
           await View.create(v);
-          await sleep(500); // Allow other workers to load this view
         }
         res.redirect(
           addOnDoneRedirect(
@@ -583,7 +582,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { name } = req.params;
     const { step } = req.query;
-    const view = await View.findOne({ name });
+    const [view] = await View.find({ name });
     if (!view) {
       req.flash("error", `View not found: ${text(name)}`);
       res.redirect("/viewedit");

package/serve.js

@@ -263,7 +263,7 @@ module.exports =
             httpsServer.setTimeout(timeout * 1000);
             process.on("message", workerDispatchMsg);
             glx.serveApp(app);
-            process.send && process.send("Start");
+            getState().processSend("Start");
           })
           .master(() => {
             initMaster(appargs).then(initMasterListeners);
@@ -349,7 +349,7 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
       console.log(`Saltcorn listening on http://localhost:${port}/`);
     });
   }
-  process.send && process.send("Start");
+  getState().processSend("Start");
 };
 
 /**