@saltcorn/server 1.1.4-beta.10 → 1.1.4-beta.11

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",
+                            }
+                          )
                       ),
                   },
                 ],
@@ -431,10 +454,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 +484,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);
+    }
+  });
+});