@saltcorn/server 0.9.6-beta.2 → 0.9.6-beta.20

package/routes/actions.js

@@ -375,6 +375,7 @@ router.get(
 
     const form = await triggerForm(req, trigger);
     form.values = trigger;
+    form.onChange = `saveAndContinue(this)`;
     send_events_page({
       res,
       req,
@@ -383,6 +384,7 @@ router.get(
       contents: {
         type: "card",
         title: req.__("Edit trigger %s", id),
+        titleAjaxIndicator: true,
         contents: renderForm(form, req.csrfToken()),
       },
     });
@@ -464,6 +466,10 @@ router.post(
           ...form.values.configuration,
         };
       await Trigger.update(trigger.id, form.values); //{configuration: form.values});
+      if (req.xhr) {
+        res.json({ success: "ok" });
+        return;
+      }
       req.flash("success", req.__("Action information saved"));
       res.redirect(`/actions/`);
     }
@@ -881,3 +887,24 @@ router.get(
     }
   })
 );
+
+/**
+ * @name post/clone/:id
+ * @function
+ * @memberof module:routes/actions~actionsRouter
+ * @function
+ */
+router.post(
+  "/clone/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const trig = await Trigger.findOne({ id });
+    const newtrig = await trig.clone();
+    req.flash(
+      "success",
+      req.__("Trigger %s duplicated as %s", trig.name, newtrig.name)
+    );
+    res.redirect(`/actions`);
+  })
+);

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);
   })
 );
 /**

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 || []),
@@ -255,6 +263,7 @@ const fieldFlow = (req) =>
         expression = "__aggregation";
         attributes.agg_relation = context.agg_relation;
         attributes.agg_field = context.agg_field;
+        attributes.agg_order_by = context.agg_order_by;
         attributes.aggwhere = context.aggwhere;
         attributes.aggregate = context.aggregate;
         const [table, ref] = context.agg_relation.split(".");
@@ -435,46 +444,64 @@ const fieldFlow = (req) =>
 
           const { child_field_list, child_relations } =
             await table.get_child_relations(true);
-          const agg_field_opts = child_relations.map(
-            ({ table, key_field, through }) => {
-              const aggKey =
-                (through ? `${through.name}->` : "") +
-                `${table.name}.${key_field.name}`;
-              aggStatOptions[aggKey] = [
-                "Count",
-                "CountUnique",
-                "Avg",
-                "Sum",
-                "Max",
-                "Min",
-                "Array_Agg",
-              ];
-              table.fields.forEach((f) => {
-                if (f.type && f.type.name === "Date") {
-                  aggStatOptions[aggKey].push(`Latest ${f.name}`);
-                  aggStatOptions[aggKey].push(`Earliest ${f.name}`);
-                }
-              });
-              return {
-                name: `agg_field`,
-                label: req.__("On Field"),
-                type: "String",
-                required: true,
-                attributes: {
-                  options: table.fields
-                    .filter((f) => !f.calculated || f.stored)
-                    .map((f) => ({
-                      label: f.name,
-                      name: `${f.name}@${f.type_name}`,
-                    })),
-                },
-                showIf: {
-                  agg_relation: aggKey,
-                  expression_type: "Aggregation",
-                },
-              };
-            }
-          );
+          const agg_field_opts = [];
+          const agg_order_opts = [];
+          child_relations.forEach(({ table, key_field, through }) => {
+            const aggKey =
+              (through ? `${through.name}->` : "") +
+              `${table.name}.${key_field.name}`;
+            aggStatOptions[aggKey] = [
+              "Count",
+              "CountUnique",
+              "Avg",
+              "Sum",
+              "Max",
+              "Min",
+              "Array_Agg",
+            ];
+            table.fields.forEach((f) => {
+              if (f.type && f.type.name === "Date") {
+                aggStatOptions[aggKey].push(`Latest ${f.name}`);
+                aggStatOptions[aggKey].push(`Earliest ${f.name}`);
+              }
+            });
+            agg_field_opts.push({
+              name: `agg_field`,
+              label: req.__("On Field"),
+              type: "String",
+              required: true,
+              attributes: {
+                options: table.fields
+                  .filter((f) => !f.calculated || f.stored)
+                  .map((f) => ({
+                    label: f.name,
+                    name: `${f.name}@${f.type_name}`,
+                  })),
+              },
+              showIf: {
+                agg_relation: aggKey,
+                expression_type: "Aggregation",
+              },
+            });
+            agg_order_opts.push({
+              name: `agg_order_by`,
+              label: req.__("Order by"),
+              type: "String",
+              attributes: {
+                options: table.fields
+                  .filter((f) => !f.calculated || f.stored)
+                  .map((f) => ({
+                    label: f.name,
+                    name: f.name,
+                  })),
+              },
+              showIf: {
+                agg_relation: aggKey,
+                expression_type: "Aggregation",
+                aggregate: "Array_Agg",
+              },
+            });
+          });
           return new Form({
             fields: [
               {
@@ -520,6 +547,7 @@ const fieldFlow = (req) =>
                 required: false,
                 showIf: { expression_type: "Aggregation" },
               },
+              ...agg_order_opts,
               {
                 name: "model",
                 label: req.__("Model"),
@@ -1129,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;
@@ -1157,7 +1185,7 @@ router.post(
       else res.send(fv.run(result, req, { row, ...configuration }));
     } catch (e) {
       console.error("show-calculated error", e);
-      return res.status(400).send(`Error: ${e.message}`);
+      return res.status(200).send(``);
     }
   })
 );

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/index.js

@@ -36,6 +36,7 @@ const roleadmin = require("../auth/roleadmin");
 const tags = require("./tags");
 const tagentries = require("./tag_entries");
 const diagram = require("./diagram");
+const registry = require("./registry");
 const sync = require("./sync");
 
 module.exports =
@@ -78,5 +79,6 @@ module.exports =
     app.use("/tag", tags);
     app.use("/tag-entries", tagentries);
     app.use("/diagram", diagram);
+    app.use("/registry-editor", registry);
     app.use("/sync", sync);
   };