@saltcorn/server 1.3.0-beta.1 → 1.3.0-beta.10

package/public/saltcorn.css

@@ -824,6 +824,14 @@ tr:hover span.add-tag {
   );
 }
 
+.prevwfroomrun i.fa-trash-alt {
+  display: none;
+}
+
+.prevwfroomrun:hover i.fa-trash-alt {
+  display: inline;
+}
+
 input[type="file"].file-has-existing {
   font-size: 0;
 }

package/public/saltcorn.js

@@ -538,7 +538,7 @@ function saveAndContinue(e, k, event) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
-        reloadEmbeddedEditOwnViews(form, res.id);
+        apply_showif();
       }
       common_done(res, form.attr("data-viewname"));
       if (focusedEl) focusedEl.setAttribute("previous-val", focusedEl.value);
@@ -1338,6 +1338,14 @@ function check_delete_unsaved(tablename, script_tag) {
   }
 }
 
+function delprevwfroomrun(viewname, e, runid) {
+  e.preventDefault();
+  e.stopPropagation();
+  view_post(viewname, "delprevrun", { run_id: runid });
+  $(e.target).closest(".prevwfroomrun").remove();
+  return false;
+}
+
 function cfu_translate(that) {
   const locale = that.value;
   const translations = window.cfu_translations[locale];

package/routes/admin.js

@@ -196,6 +196,8 @@ admin_config_route({
     { section_header: "Extension store" },
     "plugins_store_endpoint",
     "packs_store_endpoint",
+    "maintenance_mode_enabled",
+    "maintenance_mode_page",
   ],
   response(form, req, res) {
     send_admin_page({
@@ -487,28 +489,22 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
-    backupForm.values.storage_s3_bucket = getState().getConfig(
-      "storage_s3_bucket"
+    backupForm.values.backup_s3_bucket =
+      getState().getConfig("backup_s3_bucket");
+    backupForm.values.backup_s3_endpoint =
+      getState().getConfig("backup_s3_endpoint");
+    backupForm.values.backup_s3_access_key = getState().getConfig(
+      "backup_s3_access_key"
     );
-    backupForm.values.storage_s3_access_key = getState().getConfig(
-      "storage_s3_access_key"
-    );
-    backupForm.values.storage_s3_access_secret = getState().getConfig(
-      "storage_s3_access_secret"
-    );
-    backupForm.values.storage_s3_region = getState().getConfig(
-      "storage_s3_region"
+    backupForm.values.backup_s3_access_secret = getState().getConfig(
+      "backup_s3_access_secret"
     );
+    backupForm.values.backup_s3_region =
+    getState().getConfig("backup_s3_region");
     aBackupFilePrefixForm.values.backup_with_event_log = getState().getConfig(
       "backup_with_event_log"
     );
-    aBackupFilePrefixForm.values.backup_with_system_zip = getState().getConfig(
-      "backup_with_system_zip"
-    );
-    aBackupFilePrefixForm.values.backup_system_zip_level = getState().getConfig(
-      "backup_system_zip_level"
-    );
-    //
+    aBackupFilePrefixForm.values.backup_password = getState().getConfig("backup_password");
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
       getState().getConfig("snapshots_enabled");
@@ -966,25 +962,13 @@ const backupFilePrefixForm = (req) =>
         name: "backup_with_event_log",
       },
       {
-        type: "Bool",
-        label: req.__("Use system zip"),
+        type: "String",
+        label: "Backup password",
+        fieldview: "password",
+        name: "backup_password",
         sublabel: req.__(
-          "Recommended. Executable <code>zip</code> must be installed"
+          "Password to encrypt the backup file. Leave empty for no encryption"
         ),
-        name: "backup_with_system_zip",
-      },
-      {
-        type: "Integer",
-        label: req.__("Zip compression level"),
-        sublabel: req.__("1=Fast, larger file, 9=Slow, smaller files"),
-        name: "backup_system_zip_level",
-        attributes: {
-          min: 1,
-          max: 9,
-        },
-        showIf: {
-          backup_with_system_zip: true,
-        },
       },
     ],
   });
@@ -1089,18 +1073,6 @@ const autoBackupForm = (req) => {
           //auto_backup_destination: "Local directory",
         },
       },
-      {
-        type: "Integer",
-        label: req.__("Expiration in days"),
-        sublabel: req.__(
-          "Delete old backup files in this directory after the set number of days"
-        ),
-        name: "auto_backup_expire_days",
-        showIf: {
-          auto_backup_frequency: ["Daily", "Weekly"],
-          auto_backup_destination: "Local directory",
-        },
-      },
       ...(isRoot
         ? [
             {
@@ -1114,10 +1086,19 @@ const autoBackupForm = (req) => {
             },
           ]
         : []),
+      {
+        type: "String",
+        label: req.__("S3 Endpoint"),
+        name: "backup_s3_endpoint",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
       {
         type: "String",
         label: req.__("S3 Bucket Name"),
-        name: "storage_s3_bucket",
+        name: "backup_s3_bucket",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1126,7 +1107,7 @@ const autoBackupForm = (req) => {
       {
         type: "String",
         label: req.__("S3 Access Key"),
-        name: "storage_s3_access_key",
+        name: "backup_s3_access_key",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1136,7 +1117,7 @@ const autoBackupForm = (req) => {
         type: "String",
         label: req.__("S3 Secret Key"),
         fieldview: "password",
-        name: "storage_s3_access_secret",
+        name: "backup_s3_access_secret",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1145,12 +1126,24 @@ const autoBackupForm = (req) => {
       {
         type: "String",
         label: req.__("S3 Region"),
-        name: "storage_s3_region",
+        name: "backup_s3_region",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
         },
       },
+      {
+        type: "Integer",
+        label: req.__("Expiration in days"),
+        sublabel: req.__(
+          "Delete old backup files in this directory after the set number of days"
+        ),
+        name: "auto_backup_expire_days",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: ["Local directory", "S3"],
+        },
+      },
     ],
   });
 };
@@ -3832,6 +3825,22 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
+
+    // if builDir exists, remove it
+    if (
+      await fs.promises
+        .access(buildDir)
+        .then(() => true)
+        .catch(() => false)
+    ) {
+      try {
+        await fs.promises.rm(buildDir, { recursive: true, force: true });
+        getState().log(5, `Removed existing build directory: ${buildDir}`);
+      } catch (error) {
+        getState().log(4, `Error removing build directory: ${error.message}`);
+      }
+    }
+
     // end http call, return the out directory name, the build directory path and the mode
     // the gui polls for results
     res.json({

package/routes/api.js

@@ -135,6 +135,21 @@ const getFlashes = (req) =>
     })
     .filter((a) => a.msg && a.msg.length && a.msg.length > 0);
 
+router.use(
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).json({ error: "in maintenance mode" });
+      return;
+    }
+    next();
+  })
+);
+
 router.post(
   "/viewQuery/:viewName/:queryName",
   error_catcher(async (req, res, next) => {
@@ -446,6 +461,44 @@ router.get(
   })
 );
 
+router.get("/:tableName/count", async (req, res, next) => {
+  const { tableName } = req.params;
+  const { approximate, ...req_query } = req.query;
+
+  const table = Table.findOne(
+    strictParseInt(tableName)
+      ? { id: strictParseInt(tableName) }
+      : { name: tableName }
+  );
+  if (!table) {
+    getState().log(3, `API get ${tableName} table not found`);
+    res.status(404).json({ error: req.__("Not found") });
+    return;
+  }
+  await passport.authenticate(
+    ["api-bearer", "jwt"],
+    { session: false },
+    async function (err, user, info) {
+      if (accessAllowedRead(req, user, table)) {
+        const tbl_fields = table.getFields();
+        readState(req_query, tbl_fields, req);
+        const qstate = stateFieldsToWhere({
+          fields: tbl_fields,
+          approximate: !!approximate,
+          state: req_query,
+          table,
+          prefix: "a.",
+        });
+        const count = await table.countRows(qstate);
+        res.json({ success: count });
+      } else {
+        getState().log(3, `API get ${table.name} not authorized`);
+        res.status(401).json({ error: req.__("Not authorized") });
+      }
+    }
+  )(req, res, next);
+});
+
 /**
  * Emit Event using POST
  * This is used from the mobile app to send an event to the server.

package/routes/files.js

@@ -52,6 +52,18 @@ const { extract } = require("@saltcorn/admin-models/models/backup");
 const router = new Router();
 module.exports = router;
 
+router.use(
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled =  state.getConfig("maintenance_mode_enabled", false);
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return;
+    }
+    next();
+  })
+)
+
 const send_files_picker = async (folder, noSubdirs, inputId, req, res) => {
   res.set("SaltcornModalWidth", "1200px");
   res.sendWrap(req.__("Please select a file"), {

package/routes/homepage.js

@@ -15,7 +15,7 @@ const Page = require("@saltcorn/data/models/page");
 const PageGroup = require("@saltcorn/data/models/page_group");
 const Plugin = require("@saltcorn/data/models/plugin");
 const { link, mkTable } = require("@saltcorn/markup");
-const { div, a, p, i, h5, span } = require("@saltcorn/markup/tags");
+const { div, a, p, i, h5, span, title } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { get_cached_packs } = require("@saltcorn/admin-models/models/pack");
 // const { restore_backup } = require("../markup/admin");
@@ -553,6 +553,28 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
+  const state = getState();
+  const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+  const maintenanceModePage = state.getConfig("maintenance_mode_page", "");
+
+  if(maintenanceModeEnabled && (!req.user || req.user.role_id > 1) && maintenanceModePage) {
+    const db_page = await Page.findOne({ name: maintenanceModePage });
+    if (db_page) {
+      res.sendWrap(
+        {
+          title: db_page.title,
+          description: db_page.description,
+          bodyClass: "page_" + db.sqlsanitize(maintenanceModePage),
+        },
+        await db_page.run(req.query, { res, req })
+      );
+      return true;
+    } else {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return true;
+    }
+  }
+
   const wrap = async (
     contents,
     homeCfg,

package/routes/list.js

@@ -466,7 +466,7 @@ router.get(
               window.tabulator_table.on("cellEdited", function(cell){
                 const row = cell.getRow().getData()
                 const fieldName = cell.getColumn().getField()
-                let ident = (row.${pkNm}||"");
+                let ident = encodeURIComponent(row.${pkNm}||"");
                 if(fieldName === "${pkNm}")
                   ident = "";
                 ajax_indicator(true);

package/routes/menu.js

@@ -624,6 +624,20 @@ router.post(
   })
 );
 
+router.post(
+  "/action/:rndid",
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).json({ error: "in maintenance mode" });
+      return;
+    }
+    next();
+  }),
+);
+
 const getIcons = () => {
   return getState().icons;
 };

package/routes/notifications.js

@@ -20,6 +20,18 @@ const db = require("@saltcorn/data/db");
 const router = new Router();
 module.exports = router;
 
+router.use(
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return;
+    }
+    next();
+  })
+);
+
 const notificationSettingsForm = () =>
   new Form({
     action: `/notifications/settings`,

package/routes/page.js

@@ -145,8 +145,23 @@ const runPageGroup = async (pageGroup, req, res, tic) => {
 router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
-    const { pagename } = req.params;
     const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModePage = state.getConfig("maintenance_mode_page", "");
+
+    if (
+      maintenanceModeEnabled &&
+      (!req.user || req.user.role_id > 1) &&
+      maintenanceModePage
+    ) {
+      const maintenancePage = await Page.findOne({ name: maintenanceModePage });
+      if (maintenancePage) {
+        await runPage(maintenancePage, req, res, new Date());
+        return;
+      }
+    }
+
+    const { pagename } = req.params;
     state.log(
       3,
       `Route /page/${pagename} user=${req.user?.id}${
@@ -177,6 +192,13 @@ router.post(
   "/:pagename/preview",
   isAdmin,
   error_catcher(async (req, res) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).json({ error: "in maintenance mode" });
+      return;
+    }
+
     const { pagename } = req.params;
     const page = await Page.findOne({ name: pagename });
     if (!page) {
@@ -191,6 +213,13 @@ router.post(
 router.post(
   "/:pagename/action/:rndid",
   error_catcher(async (req, res) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).json({ error: "in maintenance mode" });
+      return;
+    }
+
     const { pagename, rndid } = req.params;
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const db_page = await Page.findOne({ name: pagename });

package/routes/registry.js

@@ -19,12 +19,14 @@ const {
   details,
   summary,
 } = require("@saltcorn/markup/tags");
-const Table = require("@saltcorn/data/models/table");
 const { isAdmin, error_catcher } = require("./utils");
 const { send_infoarch_page } = require("../markup/admin.js");
+const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
 const Form = require("@saltcorn/data/models/form");
+const Trigger = require("@saltcorn/data/models/trigger");
+const Plugin = require("@saltcorn/data/models/plugin");
 const {
   table_pack,
   view_pack,
@@ -40,8 +42,8 @@ const {
   event_log_pack,
   install_pack,
 } = require("@saltcorn/admin-models/models/pack");
-const Trigger = require("@saltcorn/data/models/trigger");
 const { getState } = require("@saltcorn/data/db/state");
+const { sleep } = require("@saltcorn/data/utils");
 /**
  * @type {object}
  * @const
@@ -81,6 +83,10 @@ router.get(
       {},
       { orderBy: "name", nocase: true }
     );
+    const all_plugins = await Plugin.find(
+      { name: { not: { in: ["base", "sbadmin2"] } } },
+      { orderBy: "name", nocase: true }
+    );
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
 
     const all_configs_obj = await getState().getAllConfigOrDefaults();
@@ -91,7 +97,7 @@ router.get(
       }))
       .filter((c) => isRoot || !c.root_only);
 
-    let tables, views, pages, triggers, configs;
+    let tables, views, pages, triggers, configs, plugins;
     if (q) {
       const qlower = q.toLowerCase();
       const includesQ = (s) => s.toLowerCase().includes(qlower);
@@ -113,12 +119,17 @@ router.get(
         return includesQ(JSON.stringify(pack));
       });
       configs = all_configs.filter((c) => includesQ(JSON.stringify(c)));
+      plugins = all_plugins.filter(
+        (p) =>
+          includesQ(p.name) || includesQ(JSON.stringify(p.configuration || {}))
+      );
     } else {
       tables = all_tables;
       views = all_views;
       pages = all_pages;
       triggers = all_triggers;
       configs = all_configs;
+      plugins = all_plugins;
     }
     const li_link = (etype1, ename1) =>
       li(
@@ -224,6 +235,20 @@ router.get(
 
         edContents = renderForm(mkForm(trpack), req.csrfToken());
         break;
+      case "module":
+        const plugin = all_plugins.find((p) => p.name === ename);
+        cfg_link =
+          `${ename} ${etype}` +
+          a(
+            {
+              class: "ms-1 me-3",
+              href: `/plugins/configure/${encodeURIComponent(ename)}`,
+            },
+            "Configure ",
+            i({ class: "fas fa-cog" })
+          );
+        edContents = renderForm(mkForm(plugin.configuration), req.csrfToken());
+        break;
     }
     send_infoarch_page({
       res,
@@ -315,6 +340,16 @@ router.get(
                       configs.map((t) => li_link("config", t.name))
                     )
                   )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "module" },
+                    summary("Modules"),
+                    ul(
+                      { class: "ps-3" },
+                      plugins.map((m) => li_link("module", m.name))
+                    )
+                  )
                 )
               )
             ),
@@ -372,7 +407,25 @@ router.post(
         break;
     }
     await db.withTransaction(async () => {
-      await install_pack(pack);
+      if (etype === "module") {
+        const plugin = await Plugin.findOne({ name: ename });
+        if (!plugin) throw new Error(`Module ${ename} not found`);
+        let module = getState().plugins[plugin.name];
+        if (!module) {
+          module =
+            getState().plugins[getState().plugin_module_names[plugin.name]];
+        }
+        if (module.configuration_workflow) {
+          const flow = module.configuration_workflow();
+          if (flow?.onStepSave) await flow.onStepSave({}, {}, entVal);
+          if (flow?.onDone) {
+            const doneRes = await flow.onDone(entVal);
+            if (doneRes?.cleanup) await doneRes.cleanup();
+          }
+        }
+        plugin.configuration = entVal;
+        await plugin.upsert();
+      } else await install_pack(pack);
     });
     switch (etype) {
       case "table":
@@ -390,6 +443,13 @@ router.post(
       case "config":
         await getState().refresh_config();
         break;
+      case "module":
+        getState().processSend({
+          refresh_plugin_cfg: ename,
+          tenant: db.getTenantSchema(),
+        });
+        await sleep(500);
+        break;
     }
     res.redirect(
       `/registry-editor?etype=${etype}&ename=${encodeURIComponent(

package/routes/search.js

@@ -365,6 +365,16 @@ const syntax_help_link = (req) => {
  */
 router.get(
   "/",
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return;
+    }
+    next();
+  }),
   error_catcher(async (req, res) => {
     const min_role = getState().getConfig("min_role_search");
     const role = (req.user || {}).role_id || 100;