@saltcorn/server 1.1.4-beta.3 → 1.1.4-beta.5

package/locales/en.json

@@ -1600,5 +1600,6 @@
 	"Login with %s": "Login with %s",
 	"Already have an account? Login!": "Already have an account? Login!",
 	"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"
+	"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"
 }

package/markup/expression_blurb.js

@@ -20,7 +20,7 @@ const toJsType = (type) =>
     Date: "Date class",
     String: "string",
     Color: "string",
-  }[type] || type);
+  })[type] || type;
 
 /**
  * @param {string} type
@@ -31,7 +31,9 @@ const toJsType = (type) =>
  */
 const expressionBlurb = (type, stored, table, req) => {
   const allFields = table.fields;
-  const fields = allFields.filter((f) => !f.calculated);
+  const fields = stored
+    ? allFields.filter((f) => !f.stored || f.expression === "__aggregation")
+    : allFields.filter((f) => !f.calculated);
   const funs = getState().functions;
   const funNames = Object.entries(funs)
     .filter(([k, v]) => !(!stored && v.isAsync))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.4-beta.3",
+  "version": "1.1.4-beta.5",
   "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.3",
-    "@saltcorn/builder": "1.1.4-beta.3",
-    "@saltcorn/data": "1.1.4-beta.3",
-    "@saltcorn/admin-models": "1.1.4-beta.3",
-    "@saltcorn/filemanager": "1.1.4-beta.3",
-    "@saltcorn/markup": "1.1.4-beta.3",
-    "@saltcorn/plugins-loader": "1.1.4-beta.3",
-    "@saltcorn/sbadmin2": "1.1.4-beta.3",
+    "@saltcorn/base-plugin": "1.1.4-beta.5",
+    "@saltcorn/builder": "1.1.4-beta.5",
+    "@saltcorn/data": "1.1.4-beta.5",
+    "@saltcorn/admin-models": "1.1.4-beta.5",
+    "@saltcorn/filemanager": "1.1.4-beta.5",
+    "@saltcorn/markup": "1.1.4-beta.5",
+    "@saltcorn/plugins-loader": "1.1.4-beta.5",
+    "@saltcorn/sbadmin2": "1.1.4-beta.5",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -1294,7 +1294,13 @@ function initialize_page() {
       });
     }
   });
-}
+
+  $('input[type="file"].file-has-existing').on("change", (e) => {
+    const $elem = $(e.target);
+    $elem.removeClass("file-has-existing");
+    $elem.parent().find("span.file-upload-exising").remove();
+  });
+} //initialize_page
 
 $(initialize_page);
 
@@ -1769,7 +1775,7 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
   }
 }
 
-function editAllowedAuthByRole(id, event) {  
+function editAllowedAuthByRole(id, event) {
   ajax_post_json(
     `/roleadmin/setrole_allowed_auth_methods/${id}`,
     {
@@ -2238,7 +2244,7 @@ function handle_identical_fields(event) {
         });
     } else if (tagName === "INPUT") {
       form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
-        input.value = newValue;
+        if (input.type !== "file") input.value = newValue;
       });
     }
   }

package/public/saltcorn.css

@@ -818,5 +818,15 @@ tr:hover span.add-tag {
 }
 
 #saltcorn-file-manager .filelist tr.selected td {
-  background-color: var(--bs-secondary-bg-subtle, var(--tblr-secondary-bg-subtle, gray));;
+  background-color: var(
+    --bs-secondary-bg-subtle,
+    var(--tblr-secondary-bg-subtle, gray)
+  );
+}
+
+input[type="file"].file-has-existing {
+  font-size: 0;
+}
+::file-selector-button {
+  font-size: initial;
 }

package/routes/common_lists.js

@@ -284,7 +284,7 @@ const tagsDropdown = (tags, altHeader, req) =>
         {
           class: "dropdown-item",
           // TODO check url why view for page, what do we need for page group
-          href: `tag`,
+          href: `/tag`,
         },
         req.__("Manage tags...")
       )
@@ -391,7 +391,7 @@ const viewsList = async (
                   filterOnTag ? `Tag:${filterOnTag.name}` : undefined,
                   req
                 ),
-                key: (r) => tagBadges(r),
+                key: (r) => (r.id ? tagBadges(r) : ""),
               },
             ]),
         {

package/routes/list.js

@@ -417,9 +417,7 @@ router.get(
                   pagination:true,
                   paginationMode:"remote",
                   paginationSize:20,
-                  clipboard:true,
-                  persistence:true, 
-                  persistenceID:"table_tab_${table.name}",
+                  clipboard:true,                 
                   movableColumns: true,
                   ajaxContentType:"json",
                   sortMode:"remote",

package/routes/tables.js

@@ -1902,7 +1902,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 +1912,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 },
   });
 
 /**

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)