@saltcorn/server 0.9.6-beta.9 → 0.9.7-rc.0

package/routes/admin.js

@@ -108,6 +108,7 @@ const stream = require("stream");
 const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
 const Docker = require("dockerode");
+const npmFetch = require("npm-registry-fetch");
 
 const router = new Router();
 module.exports = router;
@@ -1004,6 +1005,7 @@ router.get(
       "custom_ssl_certificate",
       false
     );
+    const rndid = `bs${Math.round(Math.random() * 100000)}`;
     let expiry = "";
     if (custom_ssl_certificate && X509Certificate) {
       const { validTo } = new X509Certificate(custom_ssl_certificate);
@@ -1062,7 +1064,8 @@ router.get(
                 " ",
                 req.__("Clear all"),
                 " »"
-              )
+              ),
+              hr()
             ),
           },
           {
@@ -1075,32 +1078,45 @@ router.get(
                   tr(
                     th(req.__("Saltcorn version")),
                     td(
-                      packagejson.version +
-                        (isRoot && can_update
-                          ? post_btn(
-                              "/admin/upgrade",
-                              req.__("Upgrade"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm",
-                                formClass: "d-inline",
-                              }
-                            )
-                          : isRoot && is_latest
-                          ? span(
-                              { class: "badge bg-primary ms-2" },
-                              req.__("Latest")
-                            ) +
-                            post_btn(
-                              "/admin/check-for-upgrade",
-                              req.__("Check for updates"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm px-1 py-0",
-                                formClass: "d-inline",
-                              }
-                            )
-                          : "")
+                      packagejson.version,
+                      isRoot && can_update
+                        ? post_btn(
+                            "/admin/upgrade",
+                            req.__("Upgrade"),
+                            req.csrfToken(),
+                            {
+                              btnClass: "btn-primary btn-sm",
+                              formClass: "d-inline",
+                            }
+                          )
+                        : isRoot && is_latest
+                        ? span(
+                            { class: "badge bg-primary ms-2" },
+                            req.__("Latest")
+                          ) +
+                          post_btn(
+                            "/admin/check-for-upgrade",
+                            req.__("Check updates"),
+                            req.csrfToken(),
+                            {
+                              btnClass: "btn-primary btn-sm px-1 py-0",
+                              formClass: "d-inline",
+                            }
+                          )
+                        : "",
+                      !git_commit &&
+                        a(
+                          {
+                            id: rndid,
+                            class: "btn btn-sm btn-secondary ms-1 px-1 py-0",
+                            onClick: "press_store_button(this, true)",
+                            href:
+                              `javascript:ajax_modal('/admin/install_dialog', ` +
+                              `{ onOpen: () => { restore_old_button('${rndid}'); }, ` +
+                              ` onError: (res) => { selectVersionError(res, '${rndid}') } });`,
+                          },
+                          req.__("Choose version")
+                        )
                     )
                   ),
                   git_commit &&
@@ -1222,6 +1238,137 @@ const pullCordovaBuilder = (req, res) => {
   });
 };
 
+/*
+ * fetch available saltcorn versions and show a dialog to select one
+ */
+router.get(
+  "/install_dialog",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    try {
+      const pkgInfo = await npmFetch.json(
+        "https://registry.npmjs.org/@saltcorn/cli"
+      );
+      if (!pkgInfo?.versions)
+        throw new Error(req.__("Unable to fetch versions"));
+      const versions = Object.keys(pkgInfo.versions);
+      if (versions.length === 0) throw new Error(req.__("No versions found"));
+      res.set("Page-Title", req.__("%s versions", "Saltcorn"));
+      let selected = packagejson.version;
+      res.send(
+        form(
+          {
+            action: `/admin/install`,
+            method: "post",
+          },
+          input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+          div(
+            { class: "form-group" },
+            label(
+              {
+                for: "version_select",
+                class: "form-label fw-bold",
+              },
+              req.__("Version")
+            ),
+            select(
+              {
+                id: "version_select",
+                class: "form-control form-select",
+                name: "version",
+              },
+              versions.map((version) =>
+                option({
+                  id: `${version}_opt`,
+                  value: version,
+                  label: version,
+                  selected: version === selected,
+                })
+              )
+            )
+          ),
+          div(
+            { class: "d-flex justify-content-end" },
+            button(
+              {
+                type: "button",
+                class: "btn btn-secondary me-2",
+                "data-bs-dismiss": "modal",
+              },
+              req.__("Close")
+            ),
+            button(
+              {
+                type: "submit",
+                class: "btn btn-primary",
+                onClick: "press_store_button(this)",
+              },
+              req.__("Install")
+            )
+          )
+        )
+      );
+    } catch (error) {
+      getState().log(
+        2,
+        `GET /install_dialog: ${error.message || "unknown error"}`
+      );
+      return res.status(500).json({ error: error.message || "unknown error" });
+    }
+  })
+);
+
+const doInstall = async (req, res, version, runPull) => {
+  if (db.getTenantSchema() !== db.connectObj.default_schema) {
+    req.flash("error", req.__("Not possible for tenant"));
+    res.redirect("/admin");
+  } else {
+    res.write(
+      version === "latest"
+        ? req.__("Starting upgrade, please wait...\n")
+        : req.__("Installing %s, please wait...\n", version)
+    );
+    const child = spawn(
+      "npm",
+      ["install", "-g", `@saltcorn/cli@${version}`, "--unsafe"],
+      {
+        stdio: ["ignore", "pipe", "pipe"],
+      }
+    );
+    child.stdout.on("data", (data) => {
+      res.write(data);
+    });
+    child.stderr?.on("data", (data) => {
+      res.write(data);
+    });
+    child.on("exit", async function (code, signal) {
+      if (code === 0 && runPull) {
+        res.write(req.__("Pulling the cordova-builder docker image...") + "\n");
+        const pullCode = await pullCordovaBuilder(req, res);
+        res.write(req.__("Pull done with code %s", pullCode) + "\n");
+      }
+      res.end(
+        version === "latest"
+          ? req.__(
+              `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+            )
+          : req.__(
+              `Install done with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+            )
+      );
+      setTimeout(() => {
+        getState().processSend("RestartServer");
+        process.exit(0);
+      }, 100);
+    });
+  }
+};
+
+router.post("/install", isAdmin, async (req, res) => {
+  const { version } = req.body;
+  await doInstall(req, res, version, false);
+});
+
 /**
  * Do Upgrade
  * @name post/upgrade
@@ -1232,43 +1379,7 @@ router.post(
   "/upgrade",
   isAdmin,
   error_catcher(async (req, res) => {
-    if (db.getTenantSchema() !== db.connectObj.default_schema) {
-      req.flash("error", req.__("Not possible for tenant"));
-      res.redirect("/admin");
-    } else {
-      res.write(req.__("Starting upgrade, please wait...\n"));
-      const child = spawn(
-        "npm",
-        ["install", "-g", "@saltcorn/cli@latest", "--unsafe"],
-        {
-          stdio: ["ignore", "pipe", "pipe"],
-        }
-      );
-      child.stdout.on("data", (data) => {
-        res.write(data);
-      });
-      child.stderr?.on("data", (data) => {
-        res.write(data);
-      });
-      child.on("exit", async function (code, signal) {
-        if (code === 0) {
-          res.write(
-            req.__("Pulling the cordova-builder docker image...") + "\n"
-          );
-          const pullCode = await pullCordovaBuilder(req, res);
-          res.write(req.__("Pull done with code %s", pullCode) + "\n");
-        }
-        res.end(
-          req.__(
-            `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
-          )
-        );
-        setTimeout(() => {
-          getState().processSend("RestartServer");
-          process.exit(0);
-        }, 100);
-      });
-    }
+    await doInstall(req, res, "latest", true);
   })
 );
 /**
@@ -1740,8 +1851,11 @@ router.get(
                     div({ class: "col-sm-4 fw-bold" }, req.__("Platform")),
                     div(
                       {
-                        class:
-                          "col-sm-1 fw-bold d-flex justify-content-center d-none",
+                        class: `col-sm-1 fw-bold d-flex justify-content-center ${
+                          builderSettings.androidPlatform !== "on"
+                            ? "d-none"
+                            : ""
+                        }`,
                         id: "dockerLabelId",
                       },
                       req.__("docker")

package/routes/api.js

@@ -260,6 +260,12 @@ router.get(
     );
     if (!table) {
       getState().log(3, `API get ${tableName} table not found`);
+      getState().log(
+        6,
+        `API get failure additonal info: URL=${req.originalUrl}${
+          getState().getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+        }`
+      );
       res.status(404).json({ error: req.__("Not found") });
       return;
     }

package/routes/common_lists.js

@@ -304,6 +304,18 @@ const viewsList = async (
             ? `set_state_field('_sortby', 'name', this)`
             : undefined,
         },
+        {
+          label: "",
+          key: (r) =>
+            r.id && r.viewtemplateObj?.configuration_workflow
+              ? link(
+                  `/viewedit/config/${encodeURIComponent(
+                    r.name
+                  )}${on_done_redirect_str}`,
+                  req.__("Configure")
+                )
+              : "",
+        },
         ...(tagId
           ? []
           : [
@@ -340,18 +352,6 @@ const viewsList = async (
               ? editViewRoleForm(row, roles, req, on_done_redirect_str)
               : "admin",
         },
-        {
-          label: "",
-          key: (r) =>
-            r.id && r.viewtemplateObj?.configuration_workflow
-              ? link(
-                  `/viewedit/config/${encodeURIComponent(
-                    r.name
-                  )}${on_done_redirect_str}`,
-                  req.__("Configure")
-                )
-              : "",
-        },
         !tagId
           ? {
               label: "",
@@ -428,13 +428,6 @@ const page_dropdown = (page, req) =>
       },
       '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
     ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/pageedit/edit-properties/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit properties")
-    ),
     post_dropdown_item(
       `/pageedit/add-to-menu/${page.id}`,
       '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
@@ -507,6 +500,22 @@ const getPageList = async (
         label: req.__("Name"),
         key: (r) => link(`/page/${encodeURIComponent(r.name)}`, r.name),
       },
+      {
+        label: "",
+        key: (r) =>
+          link(
+            `/pageedit/edit/${encodeURIComponent(r.name)}`,
+            req.__("Configure")
+          ),
+      },
+      {
+        label: "",
+        key: (r) =>
+          link(
+            `/pageedit/edit-properties/${encodeURIComponent(r.name)}`,
+            req.__("Edit")
+          ),
+      },
       ...(tagId
         ? []
         : [
@@ -522,11 +531,7 @@ const getPageList = async (
         label: req.__("Role to access"),
         key: (row) => editPageRoleForm(row, roles, req),
       },
-      {
-        label: req.__("Edit"),
-        key: (r) =>
-          link(`/pageedit/edit/${encodeURIComponent(r.name)}`, req.__("Edit")),
-      },
+
       !tagId
         ? {
             label: "",
@@ -600,6 +605,11 @@ const trigger_dropdown = (trigger, req, on_done_redirect_str = "") =>
       },
       '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
     ),
+    post_dropdown_item(
+      `/actions/clone/${trigger.id}`,
+      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
+      req
+    ),
     div({ class: "dropdown-divider" }),
 
     post_dropdown_item(
@@ -634,6 +644,14 @@ const getTriggerList = async (
   return mkTable(
     [
       { label: req.__("Name"), key: "name" },
+      {
+        label: req.__("Test run"),
+        key: (r) => link(`/actions/testrun/${r.id}`, req.__("Test run")),
+      },
+      {
+        label: req.__("Configure"),
+        key: (r) => link(`/actions/configure/${r.id}`, req.__("Configure")),
+      },
       ...(tagId
         ? []
         : [
@@ -667,14 +685,6 @@ const getTriggerList = async (
             ? a({ href: `/table/${r.table_name}` }, r.table_name)
             : r.channel,
       },
-      {
-        label: req.__("Test run"),
-        key: (r) => link(`/actions/testrun/${r.id}`, req.__("Test run")),
-      },
-      {
-        label: req.__("Configure"),
-        key: (r) => link(`/actions/configure/${r.id}`, req.__("Configure")),
-      },
       !tagId
         ? {
             label: "",

package/routes/fields.js

@@ -84,6 +84,10 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         sublabel: req.__("Name of the field"),
         type: "String",
         attributes: { autofocus: true },
+        help: {
+          topic: "Field label",
+          context: {},
+        },
         validator(s) {
           if (!s || s === "") return req.__("Missing label");
           if (!id && existing_names.includes(Field.labelToName(s)))
@@ -104,6 +108,10 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
           "The type determines the kind of data that can be stored in the field"
         ),
         input_type: "select",
+        help: {
+          topic: "Field types",
+          context: {},
+        },
         options: isPrimary
           ? primaryTypes
           : getState().type_names.concat(fkey_opts || []),
@@ -1149,7 +1157,7 @@ router.post(
           const jf = table.getField(ref);
           const jtable = Table.findOne(jf.reftable_name);
           const jrow = await jtable.getRow(
-            { [jtable.pk_name]: row[ref] },
+            { [jtable.pk_name]: row[ref]?.[jtable.pk_name] || row[ref] },
             { forUser: req.user, forPublic: !req.user }
           );
           row[ref] = jrow;

package/routes/homepage.js

@@ -459,8 +459,10 @@ const welcome_page = async (req) => {
           viewCard(views, req),
           pageCard(pages, req),
         ],
+        class: "welcome-page-row1",
       },
       {
+        class: "welcome-page-row2",
         besides: [
           {
             type: "card",

package/routes/menu.js

@@ -15,6 +15,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
+const PageGroup = require("@saltcorn/data/models/page_group");
 const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
@@ -43,6 +44,10 @@ module.exports = router;
 const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
+  const pageGroups = await PageGroup.find(
+    {},
+    { orderBy: "name", nocase: true }
+  );
   const roles = await User.get_roles();
   const tables = await Table.find_with_external({});
   const dynTableOptions = tables.map((t) => t.name);
@@ -101,6 +106,7 @@ const menuForm = async (req) => {
         options: [
           "View",
           "Page",
+          "Page Group",
           "Link",
           "Header",
           "Dynamic",
@@ -141,6 +147,14 @@ const menuForm = async (req) => {
         attributes: { options: views.map((r) => r.select_option) },
         showIf: { type: "View" },
       },
+      {
+        name: "page_group",
+        label: req.__("Page group"),
+        input_type: "select",
+        class: "item-menu",
+        options: pageGroups.map((r) => r.name),
+        showIf: { type: "Page Group" },
+      },
       {
         name: "action_name",
         label: req.__("Action"),
@@ -194,6 +208,14 @@ const menuForm = async (req) => {
         required: true,
         showIf: { type: "Dynamic" },
       },
+      {
+        name: "dyn_tooltip_fml",
+        label: req.__("Tooltip formula"),
+        class: "item-menu",
+        type: "String",
+        required: false,
+        showIf: { type: "Dynamic" },
+      },
       {
         name: "dyn_url_fml",
         label: req.__("URL formula"),
@@ -223,6 +245,7 @@ const menuForm = async (req) => {
           type: [
             "View",
             "Page",
+            "Page Group",
             "Link",
             "Header",
             "Dynamic",
@@ -238,13 +261,34 @@ const menuForm = async (req) => {
         attributes: {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
-        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
+        showIf: {
+          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+        },
       },
       {
         name: "icon",
         class: "item-menu",
         input_type: "hidden",
       },
+      {
+        name: "tooltip",
+        label: req.__("Tooltip"),
+        class: "item-menu",
+        input_type: "text",
+        required: false,
+        showIf: {
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Search",
+            "Action",
+          ],
+        },
+      },
       {
         name: "min_role",
         label: req.__("Minimum role"),
@@ -258,6 +302,18 @@ const menuForm = async (req) => {
         type: "Bool",
         class: "item-menu",
         required: false,
+        default: false,
+      },
+      {
+        name: "mobile_item_html",
+        label: req.__("Mobile HTML"),
+        sublabel: req.__(
+          "HTML for the item in the bottom navigation bar. Currently, only supported by the metronic theme."
+        ),
+        type: "String",
+        class: "item-menu",
+        input_type: "textarea",
+        showIf: { disable_on_mobile: false, location: "Mobile Bottom" },
       },
       {
         name: "target_blank",
@@ -265,7 +321,7 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
+        showIf: { type: ["View", "Page", "Page Group", "Link"] },
       },
       {
         name: "in_modal",
@@ -273,7 +329,7 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
+        showIf: { type: ["View", "Page", "Page Group", "Link"] },
       },
       {
         name: "style",
@@ -283,7 +339,15 @@ const menuForm = async (req) => {
         type: "String",
         required: true,
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Action",
+          ],
         },
         attributes: {
           options: [
@@ -310,6 +374,7 @@ const menuForm = async (req) => {
           type: [
             "View",
             "Page",
+            "Page Group",
             "Link",
             "Header",
             "Dynamic",