@saltcorn/server 1.1.0-beta.8 → 1.1.0

package/routes/admin.js

@@ -91,10 +91,7 @@ const {
 } = require("../markup/admin.js");
 const packagejson = require("../package.json");
 const Form = require("@saltcorn/data/models/form");
-const {
-  get_latest_npm_version,
-  isFixedConfig,
-} = require("@saltcorn/data/models/config");
+const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const { getMailTransport } = require("@saltcorn/data/models/email");
 const {
   getBaseDomain,
@@ -107,7 +104,10 @@ const PageGroup = require("@saltcorn/data/models/page_group");
 const { getConfigFile } = require("@saltcorn/data/db/connect");
 const os = require("os");
 const Page = require("@saltcorn/data/models/page");
-const { getSafeSaltcornCmd } = require("@saltcorn/data/utils");
+const {
+  getSafeSaltcornCmd,
+  getFetchProxyOptions,
+} = require("@saltcorn/data/utils");
 const stream = require("stream");
 const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
@@ -155,6 +155,7 @@ admin_config_route({
   field_names: [
     "site_name",
     "timezone",
+    "default_locale",
     "base_url",
     ...(getConfigFile() ? ["multitenancy_enabled"] : []),
     { section_header: "Logo image" },
@@ -534,6 +535,7 @@ router.get(
       {},
       { orderBy: "created", orderDesc: true, fields: ["id", "created", "hash"] }
     );
+    const locale = getState().getConfig("default_locale", "en");
     send_admin_page({
       res,
       req,
@@ -555,9 +557,11 @@ router.get(
                             )}`,
                             target: "_blank",
                           },
-                          `${localeDateTime(snap.created)} (${moment(
-                            snap.created
-                          ).fromNow()})`
+                          `${localeDateTime(
+                            snap.created,
+                            {},
+                            locale
+                          )} (${moment(snap.created).fromNow()})`
                         )
                       )
                     )
@@ -595,6 +599,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { type, name } = req.params;
     const snaps = await Snapshot.entity_history(type, name);
+    const locale = getState().getConfig("default_locale", "en");
     res.set("Page-Title", `Restore ${text(name)}`);
     res.send(
       mkTable(
@@ -602,7 +607,9 @@ router.get(
           {
             label: req.__("When"),
             key: (r) =>
-              `${localeDateTime(r.created)} (${moment(r.created).fromNow()})`,
+              `${localeDateTime(r.created, {}, locale)} (${moment(
+                r.created
+              ).fromNow()})`,
           },
 
           {
@@ -981,39 +988,6 @@ router.post(
   })
 );
 
-router.post(
-  "/save-config",
-  isAdmin,
-  error_catcher(async (req, res) => {
-    const state = getState();
-
-    //TODO check this is a config key
-    const validKeyName = (k) =>
-      k !== "_csrf" && k !== "constructor" && k !== "__proto__";
-
-    for (const [k, v] of Object.entries(req.body)) {
-      if (!isFixedConfig(k) && typeof v !== "undefined" && validKeyName(k)) {
-        //TODO read value from type
-        await state.setConfig(k, v);
-      }
-    }
-
-    // checkboxes that are false are not sent in post body. Check here
-    const { boolcheck } = req.query;
-    const boolchecks =
-      typeof boolcheck === "undefined"
-        ? []
-        : Array.isArray(boolcheck)
-        ? boolcheck
-        : [boolcheck];
-    for (const k of boolchecks) {
-      if (typeof req.body[k] === "undefined" && validKeyName(k))
-        await state.setConfig(k, false);
-    }
-    res.json({ success: "ok" });
-  })
-);
-
 /**
  * Do Auto backup now
  */
@@ -1284,10 +1258,14 @@ router.post(
   })
 );
 
-const pullCordovaBuilder = (req, res) => {
-  const child = spawn("docker", ["pull", "saltcorn/cordova-builder"], {
-    stdio: ["ignore", "pipe", "pipe"],
-  });
+const pullCapacitorBuilder = (req, res, version) => {
+  const child = spawn(
+    "docker",
+    ["pull", `saltcorn/capacitor-builder:${version}`],
+    {
+      stdio: ["ignore", "pipe", "pipe"],
+    }
+  );
   return new Promise((resolve, reject) => {
     child.stdout.on("data", (data) => {
       res.write(data);
@@ -1359,7 +1337,8 @@ router.get(
   error_catcher(async (req, res) => {
     try {
       const pkgInfo = await npmFetch.json(
-        "https://registry.npmjs.org/@saltcorn/cli"
+        "https://registry.npmjs.org/@saltcorn/cli",
+        getFetchProxyOptions()
       );
       if (!pkgInfo?.versions)
         throw new Error(req.__("Unable to fetch versions"));
@@ -1543,9 +1522,9 @@ const doInstall = async (req, res, version, deepClean, runPull) => {
         }
         if (runPull) {
           res.write(
-            req.__("Pulling the cordova-builder docker image...") + "\n"
+            req.__("Pulling the capacitor-builder docker image...") + "\n"
           );
-          const pullCode = await pullCordovaBuilder(req, res);
+          const pullCode = await pullCapacitorBuilder(req, res, version);
           res.write(req.__("Pull done with code %s", pullCode) + "\n");
           if (pullCode === 0) {
             res.write(req.__("Pruning docker...") + "\n");
@@ -1741,8 +1720,8 @@ router.post(
 
       let altname = await tenant_letsencrypt_name(subdomain);
 
-      if (!altname || domain) {
-        req.json({ error: "Set Base URL for both tenant and root first." });
+      if (!altname || !domain) {
+        res.json({ error: "Set Base URL for both tenant and root first." });
         return;
       }
 
@@ -1759,13 +1738,14 @@ router.post(
 
         await greenlock.sites.add({
           subject: altname,
+          altnames: [altname],
         });
         // letsencrypt
         const tenant_letsencrypt_sites = getState().getConfig(
           "tenant_letsencrypt_sites",
           []
         );
-        await getState().setConfig(tenant_letsencrypt_sites, [
+        await getState().setConfig("tenant_letsencrypt_sites", [
           altname,
           ...tenant_letsencrypt_sites,
         ]);
@@ -1775,12 +1755,10 @@ router.post(
           notify: "Certificate added, please restart server",
         });
       } catch (e) {
-        req.flash("error", e.message);
-        res.redirect("/useradmin/ssl");
+        res.json({ error: e.message });
       }
     } else {
-      req.flash("error", req.__("Not possible for tenant"));
-      res.redirect("/useradmin/ssl");
+      res.json({ error: req.__("Not possible for tenant") });
     }
   })
 );
@@ -1849,7 +1827,7 @@ router.post(
           "tenant_letsencrypt_sites",
           []
         );
-        await getState().setConfig(tenant_letsencrypt_sites, [
+        await getState().setConfig("tenant_letsencrypt_sites", [
           ...altnames,
           ...tenant_letsencrypt_sites,
         ]);
@@ -1991,9 +1969,9 @@ router.get(
     });
   })
 );
-const buildDialogScript = (cordovaBuilderAvailable, isSbadmin2) =>
+const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
   `<script>
-  var cordovaBuilderAvailable = ${cordovaBuilderAvailable};
+  var capacitorBuilderAvailable = ${capacitorBuilderAvailable};
   var isSbadmin2 = ${isSbadmin2};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
@@ -2018,11 +1996,26 @@ const buildDialogScript = (cordovaBuilderAvailable, isSbadmin2) =>
   function handleMessages() {
     notifyAlert("Building the app, please wait.", true)
   }
+  const versionPattern = /^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$/;
+  ${domReady(`
+  const versionInput = document.getElementById('appVersionInputId');
+  if (versionInput) {
+    versionInput.addEventListener('change', () => {
+      const version = versionInput.value;
+      if ((version !== '0.0.0' && versionPattern.test(version)) || version === "")
+        versionInput.classList.remove('is-invalid');
+      else
+        versionInput.classList.add('is-invalid');
+    });
+  }
+  else
+    console.error('versionInput not found');
+`)}
   </script>`;
 
 const imageAvailable = async () => {
   try {
-    const image = new Docker().getImage("saltcorn/cordova-builder");
+    const image = new Docker().getImage("saltcorn/capacitor-builder");
     await image.inspect();
     return true;
   } catch (e) {
@@ -2405,9 +2398,15 @@ router.get(
                         class: "form-control",
                         name: "appVersion",
                         id: "appVersionInputId",
-                        placeholder: "1.0.0",
+                        placeholder: "0.0.1",
                         value: builderSettings.appVersion || "",
-                      })
+                      }),
+                      div(
+                        { class: "invalid-feedback" },
+                        req.__(
+                          "Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty."
+                        )
+                      )
                     )
                   ),
                   // server url
@@ -2818,10 +2817,10 @@ router.get(
                         div(
                           label(
                             { class: "form-label fw-bold" },
-                            req.__("Cordova builder") +
+                            req.__("Capacitor builder") +
                               a(
                                 {
-                                  href: "javascript:ajax_modal('/admin/help/Cordova Builder?')",
+                                  href: "javascript:ajax_modal('/admin/help/Capacitor Builder?')",
                                 },
                                 i({ class: "fas fa-question-circle ps-1" })
                               )
@@ -2849,9 +2848,8 @@ router.get(
                           { class: "col-sm-4" },
                           button(
                             {
-                              id: "pullCordovaBtnId",
                               type: "button",
-                              onClick: `pull_cordova_builder(this);`,
+                              onClick: `pull_capacitor_builder(this);`,
                               class: "btn btn-warning",
                             },
                             req.__("pull")
@@ -2859,7 +2857,7 @@ router.get(
                           span(
                             {
                               role: "button",
-                              onClick: "check_cordova_builder()",
+                              onClick: "check_capacitor_builder()",
                             },
                             span({ class: "ps-3" }, req.__("refresh")),
                             i({ class: "ps-2 fas fa-undo" })
@@ -3271,6 +3269,16 @@ router.post(
         error: req.__("Please enter a valid server URL."),
       });
     }
+    if (
+      (appVersion && !/^\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(appVersion)) ||
+      appVersion === "0.0.0"
+    ) {
+      return res.json({
+        error: req.__(
+          "Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty."
+        ),
+      });
+    }
     if (iOSPlatform && !provisioningProfile) {
       return res.json({
         error: req.__(
@@ -3349,36 +3357,37 @@ router.post(
     });
     const childOutputs = [];
     child.stdout.on("data", (data) => {
-      // console.log(data.toString());
-      if (data) childOutputs.push(data.toString());
+      const outMsg = data.toString();
+      getState().log(5, outMsg);
+      if (data) childOutputs.push(outMsg);
     });
     child.stderr.on("data", (data) => {
-      // console.log(data.toString());
-      childOutputs.push(data ? data.toString() : req.__("An error occurred"));
+      const errMsg = data ? data.toString() : req.__("An error occurred");
+      getState().log(5, errMsg);
+      childOutputs.push(errMsg);
     });
     child.on("exit", (exitCode, signal) => {
       const logFile = exitCode === 0 ? "logs.txt" : "error_logs.txt";
-      fs.writeFile(
-        path.join(buildDir, logFile),
-        childOutputs.join("\n"),
-        async (error) => {
-          if (error) {
-            console.log(`unable to write '${logFile}' to '${buildDir}'`);
-            console.log(error);
-          } else {
-            // no transaction, '/build-mobile-app/finished' filters for valid attributes
-            await File.set_xattr_of_existing_file(logFile, buildDir, req.user);
-          }
+      const exitMsg = childOutputs.join("\n");
+      fs.writeFile(path.join(buildDir, logFile), exitMsg, async (error) => {
+        if (error) {
+          console.log(`unable to write '${logFile}' to '${buildDir}'`);
+          console.log(error);
+        } else {
+          // no transaction, '/build-mobile-app/finished' filters for valid attributes
+          await File.set_xattr_of_existing_file(logFile, buildDir, req.user);
         }
-      );
+      });
     });
     child.on("error", (msg) => {
       const message = msg.message ? msg.message : msg.code;
       const stack = msg.stack ? msg.stack : "";
       const logFile = "error_logs.txt";
+      const errMsg = [message, stack].join("\n");
+      getState().log(5, msg);
       fs.writeFile(
         path.join(buildDir, "error_logs.txt"),
-        [message, stack].join("\n"),
+        errMsg,
         async (error) => {
           if (error) {
             console.log(`unable to write logFile to '${buildDir}'`);
@@ -3394,13 +3403,13 @@ router.post(
 );
 
 router.post(
-  "/mobile-app/pull-cordova-builder",
+  "/mobile-app/pull-capacitor-builder",
   isAdmin,
   error_catcher(async (req, res) => {
     const state = getState();
     const child = spawn(
       `${process.env.DOCKER_BIN ? `${process.env.DOCKER_BIN}/` : ""}docker`,
-      ["pull", "saltcorn/cordova-builder:latest"],
+      ["pull", `saltcorn/capacitor-builder:${state.scVersion}`],
       {
         stdio: ["ignore", "pipe", "pipe"],
         cwd: ".",
@@ -3415,11 +3424,11 @@ router.post(
     child.on("exit", (exitCode, signal) => {
       state.log(
         2,
-        `"pull cordova-builder exit with code: ${exitCode} and signal: ${signal}`
+        `"pull capacitor-builder exit with code: ${exitCode} and signal: ${signal}`
       );
     });
     child.on("error", (msg) => {
-      state.log(1, `pull cordova-builder error: ${msg}`);
+      state.log(1, `pull capacitor-builder error: ${msg}`);
     });
 
     res.json({});
@@ -3427,7 +3436,7 @@ router.post(
 );
 
 router.get(
-  "/mobile-app/check-cordova-builder",
+  "/mobile-app/check-capacitor-builder",
   isAdmin,
   error_catcher(async (req, res) => {
     const installed = await imageAvailable();

package/routes/api.js

@@ -484,6 +484,57 @@ router.post(
   })
 );
 
+/**
+ * Delete Table row by ID using POST
+ * @name delete/:tableName/:id
+ * @function
+ * @memberof module:routes/api~apiRouter
+ */
+router.post(
+  "/:tableName/delete/:id",
+  // in case of primary key different from id - id will be string "undefined"
+  error_catcher(async (req, res, next) => {
+    const { tableName, id } = req.params;
+    const table = Table.findOne({ name: tableName });
+    if (!table) {
+      getState().log(3, `API DELETE ${tableName} not found`);
+      res.status(404).json({ error: req.__("Not found") });
+      return;
+    }
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedWrite(req, user, table)) {
+          try {
+            if (id === "undefined") {
+              const pk_name = table.pk_name;
+              //const fields = table.getFields();
+              const row = req.body;
+              //readState(row, fields);
+              await table.deleteRows(
+                { [pk_name]: row[pk_name] },
+                user || req.user || { role_id: 100 }
+              );
+            } else
+              await table.deleteRows(
+                { id },
+                user || req.user || { role_id: 100 }
+              );
+            res.json({ success: true });
+          } catch (e) {
+            getState().log(2, `API DELETE ${table.name} error: ${e.message}`);
+            res.status(400).json({ error: e.message });
+          }
+        } else {
+          getState().log(3, `API DELETE ${table.name} not authorized`);
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
+);
+
 /**
  * Update Table row directed by ID using POST
  * POST api/<table>/id

package/routes/config.js

@@ -5,31 +5,9 @@
  */
 const Router = require("express-promise-router");
 
-const Field = require("@saltcorn/data/models/field");
-const File = require("@saltcorn/data/models/file");
-const Table = require("@saltcorn/data/models/table");
-const View = require("@saltcorn/data/models/view");
-const Form = require("@saltcorn/data/models/form");
-const { isAdmin, setTenant, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 
-const {
-  mkTable,
-  renderForm,
-  link,
-  post_btn,
-  post_delete_btn,
-} = require("@saltcorn/markup");
-const {
-  getConfig,
-  setConfig,
-  getAllConfigOrDefaults,
-  deleteConfig,
-  configTypes,
-  isFixedConfig,
-} = require("@saltcorn/data/models/config");
-const { table, tbody, tr, th, td, div } = require("@saltcorn/markup/tags");
-
 /**
  * @type {object}
  * @const
@@ -52,7 +30,43 @@ router.post(
   error_catcher(async (req, res) => {
     const { key } = req.params;
     await getState().deleteConfig(key);
-    req.flash("success", req.__(`Configuration key %s deleted`, key));
-    res.redirect(`/admin`);
+    if (req.xhr) res.json({ success: "ok" });
+    else {
+      req.flash("success", req.__(`Configuration key %s deleted`, key));
+      res.redirect(`/admin`);
+    }
+  })
+);
+
+router.post(
+  "/save",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const state = getState();
+
+    //TODO check this is a config key
+    const validKeyName = (k) =>
+      k !== "_csrf" && k !== "constructor" && k !== "__proto__";
+
+    for (const [k, v] of Object.entries(req.body)) {
+      if (!state.isFixedConfig(k) && typeof v !== "undefined" && validKeyName(k)) {
+        //TODO read value from type
+        await state.setConfig(k, v);
+      }
+    }
+
+    // checkboxes that are false are not sent in post body. Check here
+    const { boolcheck } = req.query;
+    const boolchecks =
+      typeof boolcheck === "undefined"
+        ? []
+        : Array.isArray(boolcheck)
+        ? boolcheck
+        : [boolcheck];
+    for (const k of boolchecks) {
+      if (typeof req.body[k] === "undefined" && validKeyName(k))
+        await state.setConfig(k, false);
+    }
+    res.json({ success: "ok" });
   })
 );

package/routes/eventlog.js

@@ -81,6 +81,31 @@ const logSettingsForm = async (req) => {
       input_type: "date",
       attributes: { minDate: new Date(), maxDate: hoursFuture(24 * 7 * 2) },
     },
+    {
+      input_type: "section_header",
+      label: req.__("Delete old workflow runs with status after days"),
+    },
+    {
+      name: "delete_finished_workflows_days",
+      label: req.__("Finished"),
+      type: "Integer",
+    },
+    {
+      name: "delete_error_workflows_days",
+      label: req.__("Error"),
+      type: "Integer",
+    },
+    {
+      name: "delete_waiting_workflows_days",
+      label: req.__("Waiting"),
+      type: "Integer",
+    },
+
+    {
+      name: "delete_running_workflows_days",
+      label: req.__("Running"),
+      type: "Integer",
+    },
     {
       input_type: "section_header",
       label: req.__("Which events should be logged?"),
@@ -143,6 +168,10 @@ router.get(
       "next_weekly_event",
       {}
     );
+    ["error", "finished", "running", "waiting"].forEach((k) => {
+      let cfgk = `delete_${k}_workflows_days`;
+      form.values[cfgk] = getState().getConfig(cfgk);
+    });
 
     send_events_page({
       res,
@@ -348,6 +377,13 @@ router.post(
           delete form.values[k];
         }
       }
+      for (const status of ["error", "finished", "running", "waiting"]) {
+        let k = `delete_${status}_workflows_days`;
+        if (form.values[k]) {
+          await getState().setConfig(k, form.values[k]);
+          delete form.values[k];
+        }
+      }
 
       await getState().setConfig("event_log_settings", form.values);
 
@@ -424,6 +460,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const ev = await EventLog.findOneWithUser(id);
+    const locale = getState().getConfig("default_locale", "en");
     send_events_page({
       res,
       req,
@@ -435,7 +472,10 @@ router.get(
           table(
             { class: "table eventlog" },
             tbody(
-              tr(th(req.__("When")), td(localeDateTime(ev.occur_at))),
+              tr(
+                th(req.__("When")),
+                td(localeDateTime(ev.occur_at, {}, locale))
+              ),
               tr(th(req.__("Type")), td(ev.event_type)),
               tr(th(req.__("Channel")), td(ev.channel)),
               tr(th(req.__("User")), td(ev.email))

package/routes/fields.js

@@ -301,6 +301,10 @@ const fieldFlow = (req) =>
       if (context.id) {
         const field = await Field.findOne({ id: context.id });
         try {
+          if (fldRow.label && field.label != fldRow.label) {
+            fldRow.name = Field.labelToName(fldRow.label);
+          }
+
           await field.update(fldRow);
         } catch (e) {
           return {
@@ -362,10 +366,12 @@ const fieldFlow = (req) =>
         name: req.__("Attributes"),
         contextField: "attributes",
         onlyWhen: (context) => {
-          if (context.calculated) return false;
+          const type = getState().types[context.type];
+          if (context.calculated && !type?.setTypeAttributesForCalculatedFields)
+            return false;
+
           if (context.type === "File") return true;
           if (new Field(context).is_fkey) return false;
-          const type = getState().types[context.type];
           if (!type) return false;
           const attrs = Field.getTypeAttributes(
             type.attributes,

package/routes/homepage.js

@@ -549,7 +549,14 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
-  const wrap = async (contents, homeCfg, title, description, no_menu) => {
+  const wrap = async (
+    contents,
+    homeCfg,
+    title,
+    description,
+    no_menu,
+    requestFluidLayout
+  ) => {
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
       res.sendWrap(
@@ -558,6 +565,7 @@ const get_config_response = async (role_id, res, req) => {
           description: description || "",
           bodyClass: "page_" + db.sqlsanitize(homeCfg),
           no_menu,
+          requestFluidLayout,
         },
         contents
       );
@@ -578,7 +586,8 @@ const get_config_response = async (role_id, res, req) => {
         homeCfg,
         db_page.title,
         db_page.description,
-        db_page.attributes?.no_menu
+        db_page.attributes?.no_menu,
+        db_page.attributes?.request_fluid_layout
       );
     else {
       const group = PageGroup.findOne({ name: homeCfg });
@@ -592,7 +601,8 @@ const get_config_response = async (role_id, res, req) => {
               homeCfg,
               eligible.title,
               eligible.description,
-              eligible.attributes?.no_menu
+              eligible.attributes?.no_menu,
+              eligible.attributes?.request_fluid_layout
             );
         } else wrap(req.__("%s has no eligible page", group.name), homeCfg);
       } else res.redirect(homeCfg);