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

package/routes/tables.js

@@ -1018,7 +1018,8 @@ router.get(
     // Table Data card
     const dataCard = div(
       { class: "d-flex text-center" },
-      div({ class: "mx-auto" }, h4(`${nrows}`), req.__("Rows")),
+      nrows !== null &&
+        div({ class: "mx-auto" }, h4(`${nrows}`), req.__("Rows")),
       div(
         { class: "mx-auto" },
         a(
@@ -1246,6 +1247,7 @@ router.post(
         res.redirect(`/table/new`);
       } else if (rest.provider_name && rest.provider_name !== "-") {
         const table = await Table.create(name, rest);
+        await getState().refresh_tables();
         res.redirect(`/table/provider-cfg/${table.id}`);
       } else {
         delete rest.provider_name;
@@ -1902,7 +1904,9 @@ router.post(
 const renameForm = (table_id, req) =>
   new Form({
     action: `/table/rename/${table_id}`,
-    labelCols: 3,
+    blurb: req.__(
+      "You may need to adjust view relations associated with this table after renaming it"
+    ),
     fields: [
       {
         name: "name",
@@ -1910,6 +1914,14 @@ const renameForm = (table_id, req) =>
         type: "String",
       },
     ],
+    additionalButtons: [
+      {
+        label: req.__("Cancel"),
+        class: "btn btn-danger",
+        onclick: "history.back()",
+      },
+    ],
+    values: { name: Table.findOne({ id: table_id })?.name },
   });
 
 /**
@@ -2352,6 +2364,7 @@ const get_provider_workflow = (table, req) => {
   workflow.onDone = async (ctx) => {
     const { table_id, ...configuration } = await oldOnDone(ctx);
     await table.update({ provider_cfg: configuration });
+    await getState().refresh_tables();
 
     return {
       redirect: `/table/${table.id}`,

package/routes/tag_entries.js

@@ -7,6 +7,7 @@ const {
   label,
   text,
 } = require("@saltcorn/markup/tags");
+const db = require("@saltcorn/data/db");
 
 const Tag = require("@saltcorn/data/models/tag");
 const TagEntry = require("@saltcorn/data/models/tag_entry");
@@ -192,7 +193,11 @@ router.post(
     const fieldName = idField(entitytype);
     const auth = checkEditPermission(entitytype, req.user);
     if (!auth) req.flash("error", "Not authorized");
-    else await tag.addEntry({ [fieldName]: +entityid });
+    else
+      await db.withTransaction(async () => {
+        await tag.addEntry({ [fieldName]: +entityid });
+      });
+
     let redirectTarget =
       req.query.on_done_redirect &&
       is_relative_url("/" + req.query.on_done_redirect)

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/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,