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

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

@@ -312,7 +312,10 @@ router.get(
         const translatedIds = JSON.parse(
           await fs.readFile(path.join(syncDir, "translated-ids.json"))
         );
-        res.json({ finished: true, translatedIds });
+        const uniqueConflicts = JSON.parse(
+          await fs.readFile(path.join(syncDir, "unique-conflicts.json"))
+        );
+        res.json({ finished: true, translatedIds, uniqueConflicts });
       } else if (entries.indexOf("error.json") >= 0) {
         const error = JSON.parse(
           await fs.readFile(path.join(syncDir, "error.json"))

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",
       },
       {
@@ -625,6 +632,19 @@ router.post(
 
     const view = await View.findOne({ name });
     const configFlow = await view.get_config_flow(req);
+    configFlow.onStepSuccess = async (step, context) => {
+      let newcfg;
+      if (step.contextField)
+        newcfg = {
+          ...view.configuration,
+          [step.contextField]: {
+            ...view.configuration?.[step.contextField],
+            ...context,
+          },
+        };
+      else newcfg = { ...view.configuration, ...context };
+      await View.update({ configuration: newcfg }, view.id);
+    };
     const wfres = await configFlow.run(req.body, req);
 
     let table;

package/tests/admin.test.js

@@ -568,11 +568,11 @@ describe("tags", () => {
       .post("/tag")
       .set("Cookie", loginCookie)
       .send("name=MyNewTestTag")
-      .expect(toRedirect("/tag/1?show_list=tables"));
+      .expect(toRedirect("/tag/2?show_list=tables"));
   });
 
   itShouldIncludeTextForAdmin("/tag", "MyNewTestTag");
-  itShouldIncludeTextForAdmin("/tag/1", "MyNewTestTag");
+  itShouldIncludeTextForAdmin("/tag/2", "MyNewTestTag");
   itShouldIncludeTextForAdmin("/tag-entries/add/tables/1", "Add entries");
   itShouldIncludeTextForAdmin("/tag-entries/add/pages/1", "Add entries");
   itShouldIncludeTextForAdmin("/tag-entries/add/views/1", "Add entries");

package/tests/sync.test.js

@@ -5,11 +5,15 @@ const {
   getAdminLoginCookie,
   resetToFixtures,
   respondJsonWith,
+  toRedirect,
+  toInclude,
+  toSucceed,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const { sleep } = require("@saltcorn/data/tests/mocks");
 
 const Table = require("@saltcorn/data/models/table");
+const TableConstraint = require("@saltcorn/data/models/table_constraints");
 const Field = require("@saltcorn/data/models/field");
 const User = require("@saltcorn/data/models/user");
 
@@ -181,6 +185,52 @@ describe("load remote insert/updates", () => {
       }
     });
 
+    it("sync table with capitals", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      // create table
+      await request(app)
+        .post("/table")
+        .set("Cookie", loginCookie)
+        .send(`name=${encodeURIComponent("Table with capitals")}`)
+        .expect(toRedirect("/table/16"));
+      // add a field
+      await request(app)
+        .post("/field/")
+        .send("stepName=Basic properties")
+        .send("name=string_field")
+        .send("label=StringField")
+        .send("type=String")
+        .send(
+          `contextEnc=${encodeURIComponent(JSON.stringify({ table_id: 16 }))}`
+        )
+        .set("Cookie", loginCookie)
+        .expect(toInclude("options"));
+      // init sync_info table
+      await request(app)
+        .post("/table")
+        .send("id=16")
+        .send("has_sync_info=on")
+        .set("Cookie", loginCookie)
+        .expect(toRedirect("/table/16"));
+      const dbTime = await db.time();
+
+      // call load changes
+      await request(app)
+        .post("/sync/load_changes")
+        .set("Cookie", loginCookie)
+        .send({
+          loadUntil: (await db.time()).valueOf(),
+          syncInfos: {
+            "Table with capitals": {
+              maxLoadedId: 0,
+              syncFrom: dbTime.valueOf(),
+            },
+          },
+        })
+        .expect(toSucceed());
+    });
+
     it("load sync not authorized", async () => {
       const app = await getApp({ disableCsrf: true });
       const loginCookie = await getUserLoginCookie();
@@ -300,8 +350,9 @@ describe("Upload changes", () => {
         .get(`/sync/upload_finished?dir_name=${encodeURIComponent(syncDir)}`)
         .set("Cookie", loginCookie);
       expect(resp.status).toBe(200);
-      const { finished, translatedIds, error } = resp._body;
-      if (finished) return translatedIds ? translatedIds : error;
+      const { finished, translatedIds, uniqueConflicts, error } = resp._body;
+      if (finished)
+        return translatedIds ? { translatedIds, uniqueConflicts } : error;
       await sleep(1000);
     }
     return null;
@@ -352,7 +403,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       expect(translatedIds).toEqual({
@@ -365,6 +416,89 @@ describe("Upload changes", () => {
       });
     });
 
+    it("handles inserts with TableConstraint conflicts", async () => {
+      const books = Table.findOne({ name: "books" });
+      const oldCount = await books.countRows();
+      // unique constraint for author + pages
+      const constraint = await TableConstraint.create({
+        table: books,
+        type: "Unique",
+        configuration: {
+          fields: ["author", "pages"],
+        },
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        books: {
+          inserts: [
+            {
+              author: "Herman Melville",
+              pages: 967,
+              publisher: 1,
+            },
+            {
+              author: "Leo Tolstoy",
+              pages: "728",
+              publisher: 2,
+            },
+          ],
+        },
+      });
+
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const { uniqueConflicts } = await getResult(app, loginCookie, syncDir);
+      await constraint.delete();
+      await cleanSyncDir(app, loginCookie, syncDir);
+      expect(uniqueConflicts).toBeDefined();
+      expect(uniqueConflicts).toEqual({
+        books: [
+          { id: 1, author: "Herman Melville", pages: 967, publisher: null },
+          { id: 2, author: "Leo Tolstoy", pages: 728, publisher: 1 },
+        ],
+      });
+      const newCount = await books.countRows();
+      expect(newCount).toBe(oldCount);
+    });
+
+    it("denies updates with TableConstraint conflicts", async () => {
+      const books = Table.findOne({ name: "books" });
+      const oldCount = await books.countRows();
+      // unique constraint for author + pages
+      const constraint = await TableConstraint.create({
+        table: books,
+        type: "Unique",
+        configuration: {
+          fields: ["author", "pages"],
+        },
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        books: {
+          updates: [
+            {
+              id: 2,
+              author: "Herman Melville",
+              pages: 967,
+            },
+          ],
+        },
+      });
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const error = await getResult(app, loginCookie, syncDir);
+      await constraint.delete();
+      await cleanSyncDir(app, loginCookie, syncDir);
+      expect(error).toBeDefined();
+      expect(error).toEqual({
+        message: "Duplicate value for unique field: author_pages",
+      });
+    });
+
     it("update with translation", async () => {
       const app = await getApp({ disableCsrf: true });
       const loginCookie = await getAdminLoginCookie();
@@ -389,7 +523,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       expect(translatedIds).toEqual({
@@ -427,7 +561,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       const afterDelete = await books.getRows();
@@ -471,7 +605,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       const afterDelete = await books.getRows();