@saltcorn/server 1.1.4-beta.9 → 1.2.0-beta.0

package/locales/da.json

@@ -860,5 +860,61 @@
 	"Always show create view": "Vis altid opret visning",
 	"If off, only show create view if the query state is about the current user": "Hvis slukket, vis kun opret visning, hvis forespørgselstilstanden handler om den nuværende bruger.",
 	"The current theme has no user specific settings": "The current theme has no user specific settings",
-	"View '%s' was loaded": "View '%s' was loaded"
+	"View '%s' was loaded": "View '%s' was loaded",
+	"After delete": "After delete",
+	"Working directory": "Working directory",
+	"All tags": "All tags",
+	"Manage tags...": "Manage tags...",
+	"Triggers on table": "Triggers on table",
+	"Create trigger": "Create trigger",
+	"Create model": "Create model",
+	"Delete table": "Delete table",
+	"Delete table+views+triggers": "Delete table+views+triggers",
+	"Sync information": "Sync information",
+	"Sync information tracks the last modification or deletion timestamp so that the table data can be synchronized with the mobile app": "Sync information tracks the last modification or deletion timestamp so that the table data can be synchronized with the mobile app",
+	"Models": "Models",
+	"Row inclusion formula": "Row inclusion formula",
+	"Only include rows where this formula is true. ": "Only include rows where this formula is true. ",
+	"In scope:": "In scope:",
+	"Error message": "Error message",
+	"Error shown to user if uniqueness is violated": "Error shown to user if uniqueness is violated",
+	"Calculated field will be stored in Database": "Calculated field will be stored in Database",
+	"Protected": "Protected",
+	"Set role to access": "Set role to access",
+	"User must have this role or higher to update or create field values": "User must have this role or higher to update or create field values",
+	"The field that will be shown to the user when choosing a value": "The field that will be shown to the user when choosing a value",
+	"Include in full-text search": "Include in full-text search",
+	"On delete": "On delete",
+	"Prevent any deletion of parent rows": "Prevent any deletion of parent rows",
+	"If the parent row is deleted, automatically delete the child rows.": "If the parent row is deleted, automatically delete the child rows.",
+	"If the parent row is deleted, set key fields on child rows to null": "If the parent row is deleted, set key fields on child rows to null",
+	"If the parent row is deleted, do this to the child rows.": "If the parent row is deleted, do this to the child rows.",
+	"Installed theme": "Installed theme",
+	"Theme for role": "Theme for role",
+	"Set theme for each user role »": "Set theme for each user role »",
+	"Available themes": "Available themes",
+	"Install more themes »": "Install more themes »",
+	"The view name is part of the URL when it is shown alone.": "The view name is part of the URL when it is shown alone.",
+	"Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>": "Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>",
+	"Page description": "Page description",
+	"For search engines. Some view patterns accept interpolations.": "For search engines. Some view patterns accept interpolations.",
+	"No menu": "No menu",
+	"Omit the menu from this view": "Omit the menu from this view",
+	"Popup width": "Popup width",
+	"Popup min width": "Popup min width",
+	"Show an icon in the title bar to indicate when form data is being saved": "Show an icon in the title bar to indicate when form data is being saved",
+	"Link out?": "Link out?",
+	"Show a link to open popup contents in new tab": "Show a link to open popup contents in new tab",
+	"Search for...": "Search for...",
+	"Clean modules and restart": "Clean modules and restart",
+	"Mobile": "Mobile",
+	"Create new row": "Create new row",
+	"Locale identifier short code, e.g. en, zh, fr, ar etc. ": "Locale identifier short code, e.g. en, zh, fr, ar etc. ",
+	"Is this the default language in which the application is built?": "Is this the default language in which the application is built?",
+	"Translate with LLM": "Translate with LLM",
+	"Pagegroups": "Pagegroups",
+	"Registry editor": "Registry editor",
+	"Choose File": "Choose File",
+	"No file chosen": "No file chosen",
+	"Fixed and blocked fields": "Fixed and blocked fields"
 }

package/locales/en.json

@@ -1602,5 +1602,7 @@
 	"Translated %s strings. Click 'Translate with LLM' again to continue": "Translated %s strings. Click 'Translate with LLM' again to continue",
 	"Translate with LLM": "Translate with LLM",
 	"You may need to adjust view relations associated with this table after renaming it": "You may need to adjust view relations associated with this table after renaming it",
-	"Error running workflow": "Error running workflow"
+	"Error running workflow": "Error running workflow",
+	"Choose File": "Choose File",
+	"No file chosen": "No file chosen"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.4-beta.9",
+  "version": "1.2.0-beta.0",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.4-beta.9",
-    "@saltcorn/builder": "1.1.4-beta.9",
-    "@saltcorn/data": "1.1.4-beta.9",
-    "@saltcorn/admin-models": "1.1.4-beta.9",
-    "@saltcorn/filemanager": "1.1.4-beta.9",
-    "@saltcorn/markup": "1.1.4-beta.9",
-    "@saltcorn/plugins-loader": "1.1.4-beta.9",
-    "@saltcorn/sbadmin2": "1.1.4-beta.9",
+    "@saltcorn/base-plugin": "1.2.0-beta.0",
+    "@saltcorn/builder": "1.2.0-beta.0",
+    "@saltcorn/data": "1.2.0-beta.0",
+    "@saltcorn/admin-models": "1.2.0-beta.0",
+    "@saltcorn/filemanager": "1.2.0-beta.0",
+    "@saltcorn/markup": "1.2.0-beta.0",
+    "@saltcorn/plugins-loader": "1.2.0-beta.0",
+    "@saltcorn/sbadmin2": "1.2.0-beta.0",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -736,6 +736,14 @@ function escapeHtml(text) {
   });
 }
 
+function unescapeHtml(str) {
+  if (!str || !str.replace) return str;
+  return str
+    .replaceAll("&lt;", "<")
+    .replaceAll("&gt;", ">")
+    .replaceAll("&amp;", "&");
+}
+
 function reload_on_init() {
   localStorage.setItem("reload_on_init", true);
 }
@@ -1018,7 +1026,8 @@ function initialize_page() {
       );
     }
   });
-  $("[data-inline-edit-dest-url]").click(function () {
+  $("[data-inline-edit-dest-url]").click(function (event) {
+    event.stopPropagation();
     var url = $(this).attr("data-inline-edit-dest-url");
     var current =
       $(this).attr("data-inline-edit-current") ||
@@ -1042,7 +1051,7 @@ function initialize_page() {
           })
         );
         $(this).replaceWith(
-          `<form method="post" action="/field/save-click-edit" onsubmit="inline_ajax_submit_with_fielddata(event, '${opts}')"        
+          `<form method="post" action="/field/save-click-edit" onclick="event.stopPropagation()" onsubmit="inline_ajax_submit_with_fielddata(event, '${opts}')"        
       <input type="hidden" name="_csrf" value="${_sc_globalCsrf}">
       <input type="hidden" name="_fielddata" value="${fielddata}">
       <div class="input-group">
@@ -1124,7 +1133,8 @@ function initialize_page() {
     } else if (is_key) {
       const [tblName, target] = type.replace("Key:", "").split(".");
       doAjaxOptionsFetch(tblName, target);
-    } else
+    } else {
+      const parent = $(this).parent();
       $(this).replaceWith(
         `<form method="post" action="${url}" ${
           ajax
@@ -1154,17 +1164,18 @@ function initialize_page() {
                   : "any"
               }"`
             : ""
-        } name="${key}" ${
-          type === "Bool"
-            ? current
-              ? "checked"
-              : ""
-            : `value="${escapeHtml(current)}"`
-        }>
+        } name="${key}" ${type === "Bool" ? (current ? "checked" : "") : ``}>
       <button type="submit" class="btn btn-sm btn-primary">OK</button>
-      <button onclick="cancel_inline_edit(event, '${opts}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
+      <button onclick="cancel_inline_edit(event, '${opts.replaceAll("'", "\\'")}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
       </form>`
       );
+      if (type !== "Bool") {
+        const newVal = $(this).attr("data-inline-edit-unescape")
+          ? unescapeHtml(current)
+          : current;
+        parent.find(`[name="${key}"]`).val(newVal);
+      }
+    }
   });
   if (!isNode) {
     doMobileTransforms();

package/public/saltcorn.js

@@ -215,6 +215,7 @@ function pjax_to(href, e) {
         $dest.html(res);
         if (localizer.length) localizer.attr("data-sc-local-state", href);
         initialize_page();
+        document.dispatchEvent(new Event("pjax-loaded"));
       },
       error: function (res) {
         if (!checkNetworkError(res))
@@ -722,9 +723,15 @@ function checkNetworkError(e) {
 }
 
 function ajax_post_btn(e, reload_on_done, reload_delay) {
-  var form = $(e).closest("form");
-  var url = form.attr("action");
-  var form_data = form.serialize();
+  let form_data = "";
+  let url;
+  if (typeof e === "string") url = e;
+  else if (e) {
+    var form = $(e).closest("form");
+    url = form.attr("action");
+    form_data = form.serialize();
+  }
+
   $.ajax(url, {
     type: "POST",
     headers: {

package/routes/admin.js

@@ -360,7 +360,16 @@ router.get(
  */
 router.get(
   "/help/:topic",
-  isAdmin,
+  isAdminOrHasConfigMinRole([
+    "min_role_edit_tables",
+    "min_role_inspect_tables",
+    "min_role_edit_views",
+    "min_role_edit_pages",
+    "min_role_edit_triggers",
+    "min_role_edit_search",
+    "min_role_edit_menu",
+    "min_role_edit_files",
+  ]),
   error_catcher(async (req, res) => {
     const { topic } = req.params;
     const { markup } = await get_help_markup(topic, req.query, req);
@@ -846,12 +855,12 @@ router.post(
         is_relative_url("/" + req.query.on_done_redirect)
         ? `/${req.query.on_done_redirect}`
         : type == "codepage"
-        ? `/admin/edit-codepage/${name}`
-        : type === "trigger"
-        ? `/actions`
-        : /^[a-z]+$/g.test(type)
-        ? `/${type}edit`
-        : "/"
+          ? `/admin/edit-codepage/${name}`
+          : type === "trigger"
+            ? `/actions`
+            : /^[a-z]+$/g.test(type)
+              ? `/${type}edit`
+              : "/"
     );
   })
 );
@@ -1352,20 +1361,20 @@ router.get(
                             }
                           )
                         : 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",
-                            }
-                          )
-                        : "",
+                          ? 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",
+                              }
+                            )
+                          : "",
                       isRoot &&
                         !git_commit &&
                         a(
@@ -2134,9 +2143,8 @@ router.get(
     const filename = `${moment(start).format("YYYYMMDDHHmm")}.html`;
     await File.new_folder("configuration_checks");
     const go = async () => {
-      const { passes, errors, pass, warnings } = await runConfigurationCheck(
-        req
-      );
+      const { passes, errors, pass, warnings } =
+        await runConfigurationCheck(req);
       const end = new Date();
       const secs = Math.round((end.getTime() - start.getTime()) / 1000);
 
@@ -3413,8 +3421,8 @@ router.get(
       mode === "prepare"
         ? "_prepare_step"
         : mode === "finish"
-        ? "_finish_step"
-        : "";
+          ? "_finish_step"
+          : "";
     res.json({
       finished: await checkFiles(out_dir_name, [
         `logs${stepDesc}.txt`,
@@ -3489,8 +3497,8 @@ router.get(
       mode === "prepare"
         ? "_prepare_step"
         : mode === "finish"
-        ? "_finish_step"
-        : "";
+          ? "_finish_step"
+          : "";
     const resultMsg = files.find(
       (file) => file.filename === `logs${stepDesc}.txt`
     )

package/routes/fields.js

@@ -307,12 +307,7 @@ const fieldFlow = (req) =>
       try {
         await db.withTransaction(async () => {
           if (context.id) {
-            const field = await Field.findOne({ id: context.id });
-
-            if (fldRow.label && field.label != fldRow.label) {
-              fldRow.name = Field.labelToName(fldRow.label);
-            }
-
+            const field = await Field.findOne({ id: context.id });          
             await field.update(fldRow);
             Trigger.emitEvent(
               "AppChange",

package/routes/infoarch.js

@@ -19,13 +19,19 @@ const {
   upload_language_pack,
 } = require("../markup/admin.js");
 const { getState } = require("@saltcorn/data/db/state");
-const { div, a, i, text, button } = require("@saltcorn/markup/tags");
-const { mkTable, renderForm, post_delete_btn } = require("@saltcorn/markup");
+const { span, div, a, i, text, button } = require("@saltcorn/markup/tags");
+const {
+  mkTable,
+  renderForm,
+  post_delete_btn,
+  post_btn,
+} = require("@saltcorn/markup");
 const Form = require("@saltcorn/data/models/form");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
 const { stringify } = require("csv-stringify");
 const csvtojson = require("csvtojson");
 const { hasLLM, translate } = require("@saltcorn/data/translate");
+const { escapeHtml } = require("@saltcorn/data/utils");
 
 /**
  * @type {object}
@@ -365,18 +371,35 @@ router.get(
                 [
                   {
                     label: req.__("In default language"),
-                    key: "in_default",
+                    key: (r) => escapeHtml(r.in_default),
                   },
                   {
                     label: req.__("In %s", form.values.name),
                     key: (r) =>
-                      div(
-                        {
-                          "data-inline-edit-dest-url": `/site-structure/localizer/save-string/${lang}/${encodeURIComponent(
-                            r.in_default
-                          )}`,
-                        },
-                        r.translated
+                      span(
+                        div(
+                          {
+                            "data-inline-edit-dest-url": `/site-structure/localizer/save-string/${lang}/${encodeURIComponent(
+                              r.in_default
+                            )}`,
+                            "data-inline-edit-unescape": "true",
+                            class: "d-inline",
+                          },
+                          escapeHtml(r.translated)
+                        ),
+                        r.in_default !== r.translated &&
+                          post_btn(
+                            `/site-structure/localizer/delete-string/${lang}/${encodeURIComponent(
+                              r.in_default
+                            )}`,
+                            "",
+                            req.csrfToken(),
+                            {
+                              icon: "fas fa-trash-alt",
+                              btnClass: "btn-sm btn-xs btn-link link-danger",
+                              formClass: "d-inline",
+                            }
+                          )
                       ),
                   },
                 ],
@@ -415,6 +438,7 @@ router.post(
     let count = 0;
     for (const defstring of getState().getStringsForI18n()) {
       const cfgStrings = getState().getConfigCopy("localizer_strings", {});
+      if (!cfgStrings[lang]) cfgStrings[lang] = {};
       if (
         cfgStrings[lang][defstring] &&
         cfgStrings[lang][defstring] !== defstring
@@ -431,10 +455,12 @@ router.post(
       req.flash(
         "success",
         req.__(
-          `Translated %s strings. Click 'Translate with LLM' again to continue`, count
+          `Translated %s strings. Click 'Translate with LLM' again to continue`,
+          count
         )
       );
-    else req.flash("success", req.__(`Finished translating %s strings.`, count));
+    else
+      req.flash("success", req.__(`Finished translating %s strings.`, count));
     res.redirect(`/site-structure/localizer/edit/${lang}`);
   })
 );
@@ -459,9 +485,28 @@ router.post(
       return;
     }
     const cfgStrings = getState().getConfigCopy("localizer_strings");
-    if (cfgStrings[lang])
-      cfgStrings[lang][defstring] = text((req.body || {}).value);
-    else cfgStrings[lang] = { [defstring]: text((req.body || {}).value) };
+    if (cfgStrings[lang]) cfgStrings[lang][defstring] = (req.body || {}).value;
+    else cfgStrings[lang] = { [defstring]: (req.body || {}).value };
+    await getState().setConfig("localizer_strings", cfgStrings);
+    res.redirect(`/site-structure/localizer/edit/${lang}`);
+  })
+);
+
+router.post(
+  "/localizer/delete-string/:lang/:defstring",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { lang, defstring } = req.params;
+    if (
+      lang === "__proto__" ||
+      defstring === "__proto__" ||
+      lang === "constructor"
+    ) {
+      res.redirect(`/`);
+      return;
+    }
+    const cfgStrings = getState().getConfigCopy("localizer_strings");
+    if (cfgStrings[lang]) delete cfgStrings[lang][defstring];
     await getState().setConfig("localizer_strings", cfgStrings);
     res.redirect(`/site-structure/localizer/edit/${lang}`);
   })

package/routes/menu.js

@@ -413,7 +413,7 @@ const menuForm = async (req) => {
         //default: "Standard",
         attributes: {
           inline: true,
-          options: "Standard, Mobile Bottom, Secondary Menu",
+          options: ["Standard", "Mobile Bottom", "Secondary Menu"],
         },
       },
     ],

package/routes/plugins.js

@@ -102,7 +102,7 @@ const pluginForm = (req, plugin) => {
         name: "source",
         type: getState().types.String,
         required: true,
-        attributes: { options: "npm,local,github,git" },
+        attributes: { options: ["npm", "local", "github", "git"] },
         sublabel: req.__(
           "Source of module for install. Few options:" +
             "npm - download from npm repository," +

package/routes/registry.js

@@ -374,6 +374,23 @@ router.post(
     await db.withTransaction(async () => {
       await install_pack(pack);
     });
+    switch (etype) {
+      case "table":
+        await getState().refresh_tables();
+        break;
+      case "view":
+        await getState().refresh_views();
+        break;
+      case "page":
+        await getState().refresh_pages();
+        break;
+      case "trigger":
+        await getState().refresh_triggers();
+        break;
+      case "config":
+        await getState().refresh_config();
+        break;
+    }
     res.redirect(
       `/registry-editor?etype=${etype}&ename=${encodeURIComponent(
         ename

package/tests/menu.test.js

@@ -0,0 +1,122 @@
+const request = require("supertest");
+const getApp = require("../app");
+const {
+  getAdminLoginCookie,
+  toInclude,
+  succeedJsonWith,
+  toSucceed,
+  toNotInclude,
+  resetToFixtures,
+} = require("../auth/testhelp");
+const { save_menu_items } = require("@saltcorn/data/models/config");
+
+const db = require("@saltcorn/data/db");
+const Page = require("@saltcorn/data/models/page");
+
+beforeAll(async () => {
+  await resetToFixtures();
+});
+afterAll(db.close);
+
+const createPagesIssue2952 = async () => {
+  await Page.create({
+    name: "test",
+    title: "myTitle",
+    description: "desc",
+    min_role: 100,
+    layout: {
+      above: [
+        {
+          type: "blank",
+          block: false,
+          contents: "test",
+          textStyle: "",
+        },
+      ],
+    },
+    fixed_states: {},
+  });
+  await Page.create({
+    name: "test-second",
+    title: "myTitle",
+    description: "desc",
+    min_role: 100,
+    layout: {
+      above: [
+        {
+          type: "blank",
+          block: false,
+          contents: "test-second",
+          textStyle: "",
+        },
+      ],
+    },
+    fixed_states: {},
+  });
+
+  await save_menu_items([
+    {
+      text: "test",
+      href: "",
+      icon: "undefined",
+      target: "_self",
+      title: "",
+      type: "Page",
+      label: "test",
+      style: "",
+      tooltip: "",
+      in_modal: false,
+      location: "Standard",
+      max_role: "1",
+      min_role: "1",
+      pagename: "test",
+      target_blank: false,
+      disable_on_mobile: false,
+      children: undefined,
+    },
+    {
+      text: "test-second",
+      href: "",
+      icon: "undefined",
+      target: "_self",
+      title: "",
+      type: "Page",
+      label: "test-second",
+      style: "",
+      tooltip: "",
+      in_modal: false,
+      location: "Standard",
+      max_role: "1",
+      min_role: "1",
+      pagename: "test-second",
+      target_blank: false,
+      disable_on_mobile: false,
+      children: undefined,
+    },
+  ]);
+};
+
+describe("Menu tests", () => {
+  it("highlights active menu item", async () => {
+    await createPagesIssue2952();
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    {
+      const res = await request(app)
+        .get("/page/test")
+        .set("Cookie", loginCookie);
+      const matches = res.text.match(/class="nav-item active"/g);
+      expect(matches).toBeTruthy();
+      expect(matches?.length).toBe(1);
+    }
+    {
+      const res = await request(app)
+        .get("/page/test-second")
+        .set("Cookie", loginCookie);
+      expect(true).toBe(true);
+      const matches = res.text.match(/class="nav-item active"/g);
+      expect(matches).toBeTruthy();
+      expect(matches?.length).toBe(1);
+    }
+  });
+});