@saltcorn/server 0.9.0-beta.1 → 0.9.0-beta.3

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.0-beta.1",
+  "version": "0.9.0-beta.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.9.0-beta.1",
-    "@saltcorn/builder": "0.9.0-beta.1",
-    "@saltcorn/data": "0.9.0-beta.1",
-    "@saltcorn/admin-models": "0.9.0-beta.1",
-    "@saltcorn/filemanager": "0.9.0-beta.1",
-    "@saltcorn/markup": "0.9.0-beta.1",
-    "@saltcorn/sbadmin2": "0.9.0-beta.1",
+    "@saltcorn/base-plugin": "0.9.0-beta.3",
+    "@saltcorn/builder": "0.9.0-beta.3",
+    "@saltcorn/data": "0.9.0-beta.3",
+    "@saltcorn/admin-models": "0.9.0-beta.3",
+    "@saltcorn/filemanager": "0.9.0-beta.3",
+    "@saltcorn/markup": "0.9.0-beta.3",
+    "@saltcorn/sbadmin2": "0.9.0-beta.3",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -45,6 +45,7 @@
     "node-fetch": "2.6.9",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
+    "npm-registry-fetch": "16.0.0",
     "passport": "^0.6.0",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
@@ -55,7 +56,7 @@
     "qrcode": "1.5.1",
     "resize-with-sharp-or-jimp": "0.1.6",
     "socket.io": "4.6.0",
-    "systeminformation": "^5.11.12",
+    "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
     "uuid": "^8.2.0",

package/public/saltcorn-builder.css

@@ -446,3 +446,7 @@ Copyright (c) 2017 Taha Paksu
   padding: 5px 9px;
   z-index: 1;
 }
+
+div.builder-config-field {
+  margin-top: 0.5rem;
+}

package/public/saltcorn-common.js

@@ -78,6 +78,15 @@ function apply_showif() {
       console.error(e);
     }
   });
+  $("[data-dyn-href]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const href = new Function(
+      `{${Object.keys(rec).join(",")}}`,
+      "return " + e.attr("data-dyn-href")
+    )(rec);
+    e.attr("href", href);
+  });
   $("[data-calc-options]").each(function (ix, element) {
     var e = $(element);
     var data = JSON.parse(decodeURIComponent(e.attr("data-calc-options")));
@@ -948,14 +957,25 @@ function emptyAlerts() {
   $("#toasts-area").html("");
 }
 
-function press_store_button(clicked) {
+function press_store_button(clicked, keepOld) {
   let btn = clicked;
   if ($(clicked).is("form")) btn = $(clicked).find("button[type=submit]");
-
+  if (keepOld) {
+    const oldText = $(btn).html();
+    $(btn).data("old-text", oldText);
+  }
   const width = $(btn).width();
   $(btn).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
 }
 
+function restore_old_button(btnId) {
+  const btn = $(`#${btnId}`);
+  const oldText = $(btn).data("old-text");
+  btn.html(oldText);
+  btn.css({ width: "" });
+  btn.removeData("old-text");
+}
+
 function common_done(res, viewname, isWeb = true) {
   const handle = (element, fn) => {
     if (Array.isArray(element)) for (const current of element) fn(current);
@@ -994,6 +1014,7 @@ function common_done(res, viewname, isWeb = true) {
       if (input.attr("type") === "checkbox")
         input.prop("checked", res.set_fields[k]);
       else input.val(res.set_fields[k]);
+      input.trigger("set_form_field");
     });
   }
   if (res.goto && !isWeb)

package/public/saltcorn.js

@@ -340,7 +340,20 @@ function ajax_modal(url, opts = {}) {
         $("body").css("overflow", "");
       });
     },
+    ...(opts.onError
+      ? {
+          error: opts.onError,
+        }
+      : {}),
+  });
+}
+
+function selectVersionError(res, btnId) {
+  notifyAlert({
+    type: "danger",
+    text: res.responseJSON?.error || "unknown error",
   });
+  restore_old_button(btnId);
 }
 
 function saveAndContinue(e, k) {
@@ -410,7 +423,8 @@ function updateMatchingRows(e, viewname) {
   }
 }
 
-function applyViewConfig(e, url, k) {
+function applyViewConfig(e, url, k, event) {
+  if (event && event.target && event.target.id === "myEditor_icon") return;
   var form = $(e).closest("form");
   var form_data = form.serializeArray();
   const cfg = {};

package/routes/admin.js

@@ -1545,7 +1545,7 @@ router.get(
                 input({
                   type: "hidden",
                   name: "entryPointType",
-                  value: "view",
+                  value: builderSettings.entryPointType || "view",
                   id: "entryPointTypeID",
                 }),
                 div(
@@ -1578,7 +1578,8 @@ router.get(
                           div(
                             {
                               class: `nav-link ${
-                                !builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                                !builderSettings.entryPointType ||
+                                builderSettings.entryPointType === "view"
                                   ? "active"
                                   : ""
                               }`,
@@ -1613,7 +1614,8 @@ router.get(
                               ? "d-none"
                               : ""
                           }`,
-                          ...(!builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                          ...(!builderSettings.entryPointType ||
+                          builderSettings.entryPointType === "view"
                             ? { name: "entryPoint" }
                             : {}),
                           id: "viewInputID",
@@ -1636,7 +1638,8 @@ router.get(
                       select(
                         {
                           class: `form-select ${
-                            !builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                            !builderSettings.entryPointType ||
+                            builderSettings.entryPointType === "view"
                               ? "d-none"
                               : ""
                           }`,

package/routes/menu.js

@@ -44,7 +44,7 @@ const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
   const roles = await User.get_roles();
-  const tables = await Table.find({});
+  const tables = await Table.find_with_external({});
   const dynTableOptions = tables.map((t) => t.name);
   const dynOrderFieldOptions = {},
     dynSectionFieldOptions = {};

package/routes/plugins.js

@@ -7,13 +7,7 @@
 
 const Router = require("express-promise-router");
 const { isAdmin, error_catcher } = require("./utils.js");
-const {
-  mkTable,
-  renderForm,
-  link,
-  post_btn,
-  post_delete_btn,
-} = require("@saltcorn/markup");
+const { renderForm, link, post_btn } = require("@saltcorn/markup");
 const {
   getState,
   restart_tenant,
@@ -26,7 +20,6 @@ const { fetch_available_packs } = require("@saltcorn/admin-models/models/pack");
 const {
   upgrade_all_tenants_plugins,
 } = require("@saltcorn/admin-models/models/tenant");
-const { getConfig, setConfig } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 const {
   plugin_types_info_card,
@@ -37,7 +30,6 @@ const {
 const load_plugins = require("../load_plugins");
 const {
   h5,
-  nbsp,
   a,
   div,
   span,
@@ -50,7 +42,11 @@ const {
   th,
   td,
   p,
-  strong,
+  form,
+  select,
+  option,
+  input,
+  label,
   text,
 } = require("@saltcorn/markup/tags");
 const { search_bar } = require("@saltcorn/markup/helpers");
@@ -58,8 +54,9 @@ const fs = require("fs");
 const path = require("path");
 const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const { flash_restart } = require("../markup/admin.js");
-const { sleep } = require("@saltcorn/data/utils");
+const { sleep, removeNonWordChars } = require("@saltcorn/data/utils");
 const { loadAllPlugins } = require("../load_plugins");
+const npmFetch = require("npm-registry-fetch");
 
 /**
  * @type {object}
@@ -177,6 +174,7 @@ const get_store_items = async () => {
       has_theme: plugin.has_theme,
       has_auth: plugin.has_auth,
       unsafe: plugin.unsafe,
+      source: plugin.source,
     }))
     .filter((p) => !p.unsafe || isRoot || tenants_unsafe_plugins);
   const local_logins = installed_plugins
@@ -290,15 +288,19 @@ const store_item_html = (req) => (item) => ({
     div(
       !item.installed &&
         item.plugin &&
-        post_btn(
-          `/plugins/install/${encodeURIComponent(item.name)}`,
-          req.__("Install"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            onClick: "press_store_button(this)",
-          }
+        div(
+          { class: "me-2 d-inline" },
+          post_btn(
+            `/plugins/install/${encodeURIComponent(item.name)}`,
+            req.__("Install"),
+            req.csrfToken(),
+            {
+              klass: "store-install",
+              small: true,
+              onClick: "press_store_button(this)",
+              formClass: "d-inline",
+            }
+          )
         ),
       !item.installed &&
         item.pack &&
@@ -526,8 +528,12 @@ const plugin_store_html = (items, req) => {
         contents: div(
           { class: "d-flex justify-content-between" },
           storeNavPills(req),
-          div(search_bar("q", req.query.q || "",
-              { placeHolder: req.__("Search for..."), stateField: "q" })),
+          div(
+            search_bar("q", req.query.q || "", {
+              placeHolder: req.__("Search for..."),
+              stateField: "q",
+            })
+          ),
           div(store_actions_dropdown(req))
         ),
       },
@@ -558,6 +564,105 @@ router.get(
   })
 );
 
+router.get(
+  "/versions_dialog/:name",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const withoutOrg = name.replace(/^@saltcorn\//, "");
+    const plugin = await Plugin.store_by_name(decodeURIComponent(withoutOrg));
+    if (!plugin) {
+      getState().log(
+        2,
+        `GET /versions_dialog${withoutOrg}: '${withoutOrg}' not found`
+      );
+      return res
+        .status(404)
+        .json({ error: req.__("Module '%s' not found", withoutOrg) });
+    } else {
+      try {
+        const pkgInfo = await npmFetch.json(
+          `https://registry.npmjs.org/${plugin.location}`
+        );
+        if (!pkgInfo?.versions)
+          throw new Error(req.__("Unable to fetch versions"));
+        res.set("Page-Title", req.__("%s versions", text(withoutOrg)));
+        const versions = Object.keys(pkgInfo.versions);
+        if (versions.length === 0) throw new Error(req.__("No versions found"));
+        let selected = null;
+        if (getState().plugins[plugin.name]) {
+          const mod = await load_plugins.requirePlugin(plugin);
+          if (mod) selected = mod.version;
+        }
+        if (!selected) selected = versions[versions.length - 1];
+        return res.send(
+          form(
+            {
+              action: `/plugins/install/${encodeURIComponent(name)}`,
+              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 /versions_dialog${withoutOrg}: ${
+            error.message || "unknown error"
+          }`
+        );
+        return res
+          .status(500)
+          .json({ error: error.message || "unknown error" });
+      }
+    }
+  })
+);
+
 /**
  * @name get/configure/:name
  * @function
@@ -810,7 +915,12 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-    const plugin_db = await Plugin.findOne({ name });
+    let plugin_db = await Plugin.findOne({ name });
+    if (!plugin_db) {
+      req.flash("warning", req.__("Module not found"));
+      res.redirect("/plugins");
+      return;
+    }
     const mod = await load_plugins.requirePlugin(plugin_db);
     const store_items = await get_store_items();
     const store_item = store_items.find((item) => item.name === name);
@@ -821,27 +931,49 @@ router.get(
       update_permitted &&
       (await get_latest_npm_version(plugin_db.location, 1000));
     const can_update = update_permitted && latest && mod.version !== latest;
+    const can_select_version = update_permitted && plugin_db.source === "npm";
     let pkgjson;
     if (mod.location && fs.existsSync(path.join(mod.location, "package.json")))
       pkgjson = require(path.join(mod.location, "package.json"));
-
-    if (!plugin_db) {
-      req.flash("warning", req.__("Module not found"));
-      res.redirect("/plugins");
-      return;
-    }
+    const domId = `${removeNonWordChars(mod.name)}_store_version_btn`;
     const infoTable = table(
       tbody(
         tr(th(req.__("Package name")), td(mod.name)),
-        tr(th(req.__("Package version")), td(mod.version)),
+        tr(
+          th(req.__("Package version")),
+          td(
+            span(
+              { style: "display: inline-block; min-width: 2.9rem;" },
+              mod.version
+            ),
+            can_select_version
+              ? a(
+                  {
+                    id: domId,
+                    class: "store-install btn btn-sm btn-primary ms-2",
+                    onClick: "press_store_button(this, true)",
+                    href: `javascript:ajax_modal('/plugins/versions_dialog/${encodeURIComponent(
+                      encodeURIComponent(plugin_db.name)
+                    )}', { onOpen: () => { restore_old_button('${domId}'); }, onError: (res) => { selectVersionError(res, '${domId}') } });`,
+                  },
+                  req.__("install a different version")
+                )
+              : ""
+          )
+        ),
         tr(
           th(req.__("Latest version")),
           td(
-            latest || "",
+            span(
+              { style: "display: inline-block; min-width: 2.9rem;" },
+              latest || ""
+            ),
             can_update
               ? a(
                   {
-                    href: `/plugins/upgrade-plugin/${plugin_db.name}`,
+                    href: `/plugins/upgrade-plugin/${encodeURIComponent(
+                      plugin_db.name
+                    )}`,
                     class: "btn btn-primary btn-sm ms-2",
                   },
                   req.__("Upgrade")
@@ -979,7 +1111,7 @@ router.get(
     await plugin.upgrade_version((p, f) => load_plugins.loadPlugin(p, f));
     req.flash("success", req.__(`Module up-to-date`));
 
-    res.redirect(`/plugins/info/${plugin.name}`);
+    res.redirect(`/plugins/info/${encodeURIComponent(plugin.name)}`);
   })
 );
 
@@ -1068,11 +1200,25 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
+    const { version } = req.body;
     const tenants_unsafe_plugins = getRootState().getConfig(
       "tenants_unsafe_plugins",
       false
     );
-    const plugin = await Plugin.store_by_name(decodeURIComponent(name));
+    // when a version is specified, either update the db row or use the plugin from the store
+    // when no version is specified, allways use the plugin from the store
+    let plugin = null;
+    if (version) {
+      plugin = await Plugin.findOne({ name: name });
+      if (plugin) plugin.version = version;
+    }
+    if (!plugin) {
+      plugin = await Plugin.store_by_name(decodeURIComponent(name));
+      if (plugin) {
+        delete plugin.id;
+        if (version) plugin.version = version;
+      }
+    }
     if (!plugin) {
       req.flash(
         "error",
@@ -1081,6 +1227,11 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
+    let forceReInstall =
+      version !== undefined ||
+      (plugin.source === "npm" && plugin.version === "latest");
+    if (version) plugin.version = version;
+
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
     if (!isRoot && plugin.unsafe && !tenants_unsafe_plugins) {
       req.flash(
@@ -1090,8 +1241,7 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
-    delete plugin.id;
-    await load_plugins.loadAndSaveNewPlugin(plugin);
+    await load_plugins.loadAndSaveNewPlugin(plugin, forceReInstall);
     const plugin_module = getState().plugins[name];
     if (plugin_module && plugin_module.configuration_workflow) {
       const plugin_db = await Plugin.findOne({ name });

package/routes/tables.js

@@ -163,7 +163,7 @@ const tableForm = async (table, req) => {
             {
               label: req.__("Version history"),
               sublabel: req.__(
-                "Version history allows to track table data changes"
+                "Track table data changes over time"
               ),
               name: "versioned",
               type: "Bool",
@@ -235,7 +235,8 @@ router.get(
                         name: "provider_name",
                         input_type: "select",
                         options: [
-                          req.__("Database table"),
+                          // Due to packages/saltcorn-markup/helpers.ts#L45 (select_options replaces label if o.value === "")
+                          {label:req.__("Database table"), value:'-'},
                           ...table_provider_names,
                         ],
                         required: true,
@@ -1066,7 +1067,7 @@ router.post(
         res.redirect(`/table/new`);
       } else if (
         rest.provider_name &&
-        rest.provider_name !== "Database table"
+        rest.provider_name !== "-"
       ) {
         const table = await Table.create(name, rest);
         res.redirect(`/table/provider-cfg/${table.id}`);

package/routes/viewedit.js

@@ -147,6 +147,10 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         sublabel: req.__(
           "The view pattern sets the foundation of how the view relates to the table and the behaviour of the view"
         ),
+        help: {
+          topic: "View patterns",
+          context: {},
+        },
         options: Object.keys(getState().viewtemplates),
         attributes: {
           explainers: mapObjectValues(
@@ -209,7 +213,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
       }),
       {
         name: "popup_width",
-        label: req.__("Column width"),
+        label: req.__("Popup width"),
         type: "Integer",
         tab: "Popup settings",
         parent_field: "attributes",
@@ -232,6 +236,9 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         label: req.__("Save indicator"),
         type: "Bool",
         parent_field: "attributes",
+        sublabel: req.__(
+          "Show an icon in the title bar to indicate when form data is being saved"
+        ),
         tab: "Popup settings",
       },
       {