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

package/routes/view.js

@@ -77,13 +77,20 @@ router.get(
     const isModal = req.headers?.saltcornmodalrequest;
 
     const contents0 = await view.run_possibly_on_page(query, req, res);
+    const __ = (s) =>
+      state.i18n.__({ phrase: s, locale: req.getLocale() }) || s;
     let title =
       isModal && view.attributes?.popup_title
-        ? view.attributes?.popup_title
-        : view.attributes?.page_title ||
+        ? __(view.attributes?.popup_title)
+        : __(view.attributes?.page_title) ||
           scan_for_page_title(contents0, view.name); //legacy
     if ((title || "").includes("{{")) {
-      title = await view.interpolate_title_string(title, query);
+      try {
+        title = await view.interpolate_title_string(title, query);
+      } catch (e) {
+        console.error(e);
+        title = e?.message || e;
+      }
     }
     title = { title };
     if (isModal && view.attributes?.popup_width)

package/serve.js

@@ -168,7 +168,11 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   // switch on sql logging
   if (sql_log) db.set_sql_logging(); // dont override cli flag
   // migrate database
-  if (!disableMigrate) await migrate(db.connectObj.default_schema, true);
+  if (!disableMigrate)
+    await db.runWithTenant(
+      db.connectObj.default_schema,
+      async () => await migrate(db.connectObj.default_schema, true)
+    );
   // load all plugins
   await loadAllPlugins(true);
   // switch on sql logging - but it was initiated before???

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);
+    }
+  });
+});

package/wrapper.js

@@ -324,10 +324,13 @@ const get_headers = (req, version_tag, description, extras = []) => {
  * @param state
  * @returns {{name: *, logo: (string|undefined)}}
  */
-const get_brand = (state) => {
+const get_brand = (state, req) => {
   const logo_id = state.getConfig("site_logo_id", "");
+  const locale = req.getLocale();
+  const __ = (s) => state.i18n.__({ phrase: s, locale }) || s;
+  const name = __(state.getConfig("site_name", "Saltcorn"));
   return {
-    name: state.getConfig("site_name"),
+    name,
     logo: logo_id && logo_id !== "0" ? `/files/serve/${logo_id}` : undefined,
   };
 };
@@ -352,7 +355,7 @@ module.exports = (version_tag) =>
             form,
             authLinks,
             afterForm: html.length === 1 ? html[0] : html.join(""),
-            brand: get_brand(state),
+            brand: get_brand(state, req),
             menu: get_menu(req),
             alerts: getFlashes(req),
             headers: get_headers(req, version_tag),
@@ -382,7 +385,7 @@ module.exports = (version_tag) =>
         res.send(
           layout.wrap({
             title,
-            brand: get_brand(state),
+            brand: get_brand(state, req),
             menu: get_menu(req),
             currentUrl,
             originalUrl: req.originalUrl,
@@ -436,7 +439,7 @@ module.exports = (version_tag) =>
       res.send(
         layout.wrap({
           title,
-          brand: no_menu ? undefined : get_brand(state),
+          brand: no_menu ? undefined : get_brand(state, req),
           menu: no_menu ? undefined : get_menu(req),
           currentUrl,
           originalUrl: req.originalUrl,