@saltcorn/server 1.1.0-beta.10 → 1.1.0-beta.12

package/public/saltcorn-common.js

@@ -727,6 +727,22 @@ function doMobileTransforms() {
     ],
   };
 
+  // change /plugins or plugins to sc_plugins
+  // capacitor reserves the plugins prefix for cordova plugins
+  const normalisePluginsPrefix = (path) => {
+    if (path.startsWith("/plugins/") || path.startsWith("plugins/"))
+      return path.replace(/\/?plugins\//, "sc_plugins/");
+    return path;
+  };
+  $("link").each(function () {
+    const path = $(this).attr("href");
+    if (path) $(this).attr("href", normalisePluginsPrefix(path));
+  });
+  $("script").each(function () {
+    const path = $(this).attr("src");
+    if (path) $(this).attr("src", normalisePluginsPrefix(path));
+  });
+
   $("a").each(function () {
     let path = $(this).attr("href") || "";
     if (path.startsWith("http")) {
@@ -1140,11 +1156,13 @@ function initialize_page() {
       }
     }
   }
+
   setTimeout(() => {
     $("#toasts-area")
       .find(".show[rendered='server-side'][type='success']")
       .removeClass("show");
   }, 5000);
+
   $(".lazy-accoordion").on("show.bs.collapse", function (e) {
     const $e = $(e.target).find("[data-sc-view-source]");
     if ($.trim($e.html()) == "") {

package/public/saltcorn.css

@@ -607,4 +607,10 @@ button.monospace-copy-btn {
 
 i[class^="unicode-"], i[class*=" unicode-"] {
   font-style: normal;
+}
+
+.tabulator.table-dark:not(.thead-light) .tabulator-footer, .tabulator.table-dark:not(.thead-light) .tabulator-footer .tabulator-col {
+  background-color: #212529;
+  border-color: #32383e;
+  color: #fff;
 }

package/public/saltcorn.js

@@ -890,9 +890,9 @@ function build_mobile_app(button) {
 
   if (
     params.useDocker &&
-    !window.cordovaBuilderAvailable &&
+    !window.capacitorBuilderAvailable &&
     !confirm(
-      "Docker is selected but the Cordova builder seems not to be installed. " +
+      "Docker is selected but the Capacitor builder seems not to be installed. " +
         "Do you really want to continue?"
     )
   ) {
@@ -935,11 +935,11 @@ function build_mobile_app(button) {
   });
 }
 
-function pull_cordova_builder() {
-  ajax_post("/admin/mobile-app/pull-cordova-builder", {
+function pull_capacitor_builder() {
+  ajax_post("/admin/mobile-app/pull-capacitor-builder", {
     success: () => {
       notifyAlert(
-        "Pulling the the cordova-builder. " +
+        "Pulling the the capacitor-builder. " +
           "To see the progress, open the logs viewer with the System logging verbosity set to 'All'."
       );
     },
@@ -989,12 +989,12 @@ function check_xcodebuild() {
   });
 }
 
-function check_cordova_builder() {
-  $.ajax("/admin/mobile-app/check-cordova-builder", {
+function check_capacitor_builder() {
+  $.ajax("/admin/mobile-app/check-capacitor-builder", {
     type: "GET",
     success: function (res) {
-      window.cordovaBuilderAvailable = !!res.installed;
-      if (window.cordovaBuilderAvailable) {
+      window.capacitorBuilderAvailable = !!res.installed;
+      if (window.capacitorBuilderAvailable) {
         $("#dockerBuilderStatusId").html(
           `<span>
             installed<i class="ps-2 fas fa-check text-success"></i>
@@ -1088,7 +1088,7 @@ function toggle_tbl_sync() {
 function toggle_android_platform() {
   if ($("#androidCheckboxId")[0].checked === true) {
     $("#dockerCheckboxId").attr("hidden", false);
-    $("#dockerCheckboxId").attr("checked", window.cordovaBuilderAvailable);
+    $("#dockerCheckboxId").attr("checked", window.capacitorBuilderAvailable);
     $("#dockerLabelId").removeClass("d-none");
   } else {
     $("#dockerCheckboxId").attr("hidden", true);

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,
@@ -988,39 +985,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
  */
@@ -1291,10 +1255,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);
@@ -1550,9 +1518,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");
@@ -1997,9 +1965,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"]) {
@@ -2028,7 +1996,7 @@ const buildDialogScript = (cordovaBuilderAvailable, isSbadmin2) =>
 
 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) {
@@ -2824,10 +2792,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" })
                               )
@@ -2855,9 +2823,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")
@@ -2865,7 +2832,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" })
@@ -3355,36 +3322,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}'`);
@@ -3400,13 +3368,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: ".",
@@ -3421,11 +3389,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({});
@@ -3433,7 +3401,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/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/list.js

@@ -268,6 +268,7 @@ router.get(
       clipboard: false,
       cellClick: "__delete_tabulator_row",
     });
+    const isDark = getState().getLightDarkMode(req.user) === "dark";
     res.sendWrap(
       {
         title: req.__(`%s data table`, table.name),
@@ -297,6 +298,13 @@ router.get(
           {
             css: `/static_assets/${db.connectObj.version_tag}/flatpickr.min.css`,
           },
+          ...(isDark
+            ? [
+                {
+                  css: `/static_assets/${db.connectObj.version_tag}/flatpickr-dark.css`,
+                },
+              ]
+            : []),
         ],
       },
       {
@@ -431,7 +439,7 @@ router.get(
               div({
                 id: "jsGrid",
                 class:
-                  getState().getLightDarkMode() === "dark"
+                  getState().getLightDarkMode(req.user) === "dark"
                     ? "table-dark"
                     : undefined,
               })

package/routes/registry.js

@@ -7,6 +7,7 @@ const {
   domReady,
   a,
   div,
+  h4,
   i,
   text,
   button,
@@ -40,6 +41,7 @@ const {
   install_pack,
 } = require("@saltcorn/admin-models/models/pack");
 const Trigger = require("@saltcorn/data/models/trigger");
+const { getState } = require("@saltcorn/data/db/state");
 /**
  * @type {object}
  * @const
@@ -79,7 +81,17 @@ router.get(
       {},
       { orderBy: "name", nocase: true }
     );
-    let tables, views, pages, triggers;
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
+    const all_configs_obj = await getState().getAllConfigOrDefaults();
+    const all_configs = Object.entries(all_configs_obj)
+      .map(([name, v]) => ({
+        ...v,
+        name,
+      }))
+      .filter((c) => isRoot || !c.root_only);
+
+    let tables, views, pages, triggers, configs;
     if (q) {
       const qlower = q.toLowerCase();
       const includesQ = (s) => s.toLowerCase().includes(qlower);
@@ -100,11 +112,13 @@ router.get(
         const pack = await trigger_pack(t);
         return includesQ(JSON.stringify(pack));
       });
+      configs = all_configs.filter((c) => includesQ(JSON.stringify(c)));
     } else {
       tables = all_tables;
       views = all_views;
       pages = all_pages;
       triggers = all_triggers;
+      configs = all_configs;
     }
     const li_link = (etype1, ename1) =>
       li(
@@ -124,7 +138,7 @@ router.get(
         action: `/registry-editor?etype=${etype}&ename=${encodeURIComponent(
           ename
         )}${qlink}`,
-
+        formStyle: "vert",
         values: { regval: JSON.stringify(jsonVal, null, 2) },
         fields: [
           {
@@ -177,6 +191,14 @@ router.get(
         const ppack = await page_pack(all_pages.find((v) => v.name === ename));
         edContents = renderForm(mkForm(ppack), req.csrfToken());
         break;
+      case "config":
+        const config = all_configs.find((t) => t.name === ename);
+        edContents =
+          h4(config.label) +
+          (config.blurb || "") +
+          (config.sublabel || "") +
+          renderForm(mkForm(config.value), req.csrfToken());
+        break;
       case "trigger":
         const trigger = all_triggers.find((t) => t.name === ename);
         const trpack = await trigger_pack(trigger);
@@ -282,6 +304,16 @@ router.get(
                       triggers.map((t) => li_link("trigger", t.name))
                     )
                   )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "CONFIG" }, //
+                    summary("Configuration"),
+                    ul(
+                      { class: "ps-3" },
+                      configs.map((t) => li_link("config", t.name))
+                    )
+                  )
                 )
               )
             ),
@@ -309,7 +341,14 @@ router.post(
     const qlink = q ? `&q=${encodeURIComponent(q)}` : "";
 
     const entVal = JSON.parse(req.body.regval);
-    let pack = { plugins: [], tables: [], views: [], pages: [], triggers: [] };
+    let pack = {
+      plugins: [],
+      tables: [],
+      views: [],
+      pages: [],
+      triggers: [],
+      config: {},
+    };
 
     switch (etype) {
       case "table":
@@ -324,6 +363,9 @@ router.post(
       case "trigger":
         pack.triggers = [entVal];
         break;
+      case "config":
+        pack.config[ename] = entVal;
+        break;
     }
     await install_pack(pack);
     res.redirect(

package/routes/tenant.js

@@ -493,6 +493,7 @@ const tenant_settings_form = (req) =>
       "tenant_template",
       "tenant_baseurl",
       "tenant_create_unauth_redirect",
+      "tenant_inherit_cfgs",
       { section_header: req.__("Tenant application capabilities") },
       "tenants_install_git",
       "tenants_set_npm_modules",

package/serve.js

@@ -121,7 +121,11 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   if (getState().getConfig("log_sql", false)) db.set_sql_logging();
   if (db.is_it_multi_tenant()) {
     const tenants = await getAllTenants();
-    await init_multi_tenant(loadAllPlugins, disableMigrate, tenants);
+    await init_multi_tenant(
+      async () => await loadAllPlugins(true),
+      disableMigrate,
+      tenants
+    );
   }
   eachTenant(async () => {
     const state = getState();

package/wrapper.js

@@ -194,7 +194,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
       }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}"${
         locale ? `, _sc_locale = "${locale}"` : ""
       }, _sc_lightmode = ${JSON.stringify(
-        state.getLightDarkMode(req.user)
+        state.getLightDarkMode?.(req.user) || "light"
       )};</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },