@saltcorn/server 0.9.4-beta.6 → 0.9.4-beta.8

package/locales/en.json

@@ -1348,5 +1348,11 @@
 	"Pagegroup": "Pagegroup",
 	"Pagegroup %s has no members": "Pagegroup %s has no members",
 	"Remove border": "Remove border",
-	"No lines between tables": "No lines between tables"
+	"No lines between tables": "No lines between tables",
+	"Use this to restrict your field to a list of options (separated by commas). For instance, enter <kbd class=\"fst-normal\">Red, Green, Blue</kbd> here if the permissible values are Red, Green and Blue. Leave blank if the string can hold any value.": "Use this to restrict your field to a list of options (separated by commas). For instance, enter <kbd class=\"fst-normal\">Red, Green, Blue</kbd> here if the permissible values are Red, Green and Blue. Leave blank if the string can hold any value.",
+	"Page description": "Page description",
+	"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>",
+	"For search engines. Some view patterns accept interpolations.": "For search engines. Some view patterns accept interpolations.",
+	"Files cache TTL (minutes)": "Files cache TTL (minutes)",
+	"Cache-control max-age for files.": "Cache-control max-age for files."
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4-beta.6",
+  "version": "0.9.4-beta.8",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.4-beta.6",
-    "@saltcorn/builder": "0.9.4-beta.6",
-    "@saltcorn/data": "0.9.4-beta.6",
-    "@saltcorn/admin-models": "0.9.4-beta.6",
-    "@saltcorn/filemanager": "0.9.4-beta.6",
-    "@saltcorn/markup": "0.9.4-beta.6",
-    "@saltcorn/sbadmin2": "0.9.4-beta.6",
+    "@saltcorn/base-plugin": "0.9.4-beta.8",
+    "@saltcorn/builder": "0.9.4-beta.8",
+    "@saltcorn/data": "0.9.4-beta.8",
+    "@saltcorn/admin-models": "0.9.4-beta.8",
+    "@saltcorn/filemanager": "0.9.4-beta.8",
+    "@saltcorn/markup": "0.9.4-beta.8",
+    "@saltcorn/sbadmin2": "0.9.4-beta.8",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-builder.css

@@ -54,16 +54,34 @@ div.builder-embed-view {
       rgba(0, 0, 0, 0) 100%
     );
 }
+
+.builder-left-enlarged div.toolbox-card.componets-and-library-accordion {
+  width: 13.35rem;
+  padding-right: 1rem;
+  margin-bottom: 1rem;
+}
+
 div.toolbox-card {
   width: 9.2rem;
   padding-right: 1rem;
   margin-bottom: 1rem;
 }
-div.wrap-builder-elem {
+
+.builder-left-enlarged div.wrap-builder-elem {
+  width: 33%;
+  height: 4rem;
+  position: relative;
+}
+.builder-left-shrunk div.wrap-builder-elem {
   width: 50%;
   height: 4rem;
   position: relative;
 }
+
+.builder-left-enlarged div.toolbox-card div.wrap-builder-elem:nth-child(2) {
+  border-right: 1px solid #bcbcbc;
+}
+
 div.toolbox-card div.wrap-builder-elem:nth-child(1) {
   border-right: 1px solid #bcbcbc;
 }

package/public/saltcorn.js

@@ -687,7 +687,7 @@ function make_unique_field(
   );
 }
 function test_formula(tablename, stored) {
-  var formula = $("input[name=expression]").val();
+  var formula = $("input[name=expression],textarea[name=expression]").val();
   ajax_post(`/field/test-formula`, {
     data: { formula, tablename, stored },
     success: (data) => {

package/routes/fields.js

@@ -479,6 +479,8 @@ const fieldFlow = (req) =>
                 // todo sublabel
                 type: "String",
                 class: "validate-expression",
+                fieldview: "textarea",
+                attributes: { rows: 2 },
                 validator: expressionValidator,
                 showIf: { expression_type: "JavaScript expression" },
               }),
@@ -978,7 +980,7 @@ router.post(
             const reftable = Table.findOne({ name: field.reftable_name });
             if (!oldRow[ref]) break;
             if (role > reftable.min_role_read) {
-              res.status(401).send("");
+              res.status401.send("");
               return;
             }
             const q = { [reftable.pk_name]: oldRow[ref] };
@@ -991,7 +993,14 @@ router.post(
         }
         if (oldRow) {
           const value = oldRow[kpath[kpath.length - 1]];
-          res.send(value);
+          //TODO run fieldview
+          res.send(
+            typeof value === "string"
+              ? value
+              : value?.toString
+              ? value.toString()
+              : `${value}`
+          );
           return;
         }
       }

package/routes/files.js

@@ -205,7 +205,8 @@ router.get(
     ) {
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 100 ? "public" : "private";
-      res.set("Cache-Control", `${cacheability}, max-age=86400`);
+      const maxAge = getState().getConfig("files_cache_maxage", 86400);
+      res.set("Cache-Control", `${cacheability}, max-age=${maxAge}`);
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else res.sendFile(file.location);
     } else {
@@ -565,6 +566,7 @@ const files_settings_form = async (req) => {
     field_names: [
       "min_role_upload",
       "file_accept_filter_default",
+      "files_cache_maxage",
       "file_upload_debug",
       "file_upload_limit",
       "file_upload_timeout",

package/routes/list.js

@@ -161,6 +161,11 @@ const typeToGridType = (t, field) => {
     jsgField.formatterParams = {
       inputFormat: "iso",
     };
+
+    if (field.attributes?.day_only) {
+      jsgField.editorParams = { dayOnly: true };
+      jsgField.formatter = "__isoDateFormatter";
+    }
   } else if (t.name === "Color") {
     jsgField.editor = "__colorEditor";
     jsgField.formatter = "__colorFormatter";

package/routes/tables.js

@@ -59,6 +59,7 @@ const { tablesList, viewsList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
+  comparingCaseInsensitive,
 } = require("@saltcorn/data/utils");
 const { EOL } = require("os");
 
@@ -714,6 +715,7 @@ router.get(
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
+    triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
@@ -785,7 +787,16 @@ router.get(
         triggers.length
           ? req.__("Table triggers: ") +
             triggers
-              .map((t) => link(`/actions/configure/${t.id}`, t.name))
+              .map((t) =>
+                link(
+                  `/actions/configure/${
+                    t.id
+                  }?on_done_redirect=${encodeURIComponent(
+                    `table/${table.name}`
+                  )}`,
+                  t.name
+                )
+              )
               .join(", ") +
             "<br>"
           : "",

package/routes/view.js

@@ -74,8 +74,9 @@ router.get(
     let title =
       isModal && view.attributes?.popup_title
         ? view.attributes?.popup_title
-        : scan_for_page_title(contents0, view.name);
-    if (isModal && (title || "").includes("{{")) {
+        : view.attributes?.page_title ||
+          scan_for_page_title(contents0, view.name); //legacy
+    if ((title || "").includes("{{")) {
       title = await view.interpolate_title_string(title, query);
     }
     if (isModal && view.attributes?.popup_width)
@@ -89,6 +90,13 @@ router.get(
       res.set("SaltcornModalSaveIndicator", `true`);
     if (isModal && view.attributes?.popup_link_out)
       res.set("SaltcornModalLinkOut", `true`);
+    if (view.attributes?.page_description) {
+      let description = view.attributes?.page_description;
+      if ((description || "").includes("{{")) {
+        description = await view.interpolate_title_string(description, query);
+      }
+      title = { title, description };
+    }
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
     if (!isTest())

package/routes/viewedit.js

@@ -182,6 +182,26 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         required: true,
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       }),
+      new Field({
+        name: "page_title",
+        label: req.__("Page title"),
+        type: "String",
+        parent_field: "attributes",
+        tab: "View settings",
+        sublabel: req.__(
+          "Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>"
+        ),
+      }),
+      new Field({
+        name: "page_description",
+        label: req.__("Page description"),
+        type: "String",
+        parent_field: "attributes",
+        tab: "View settings",
+        sublabel: req.__(
+          "For search engines. Some view patterns accept interpolations."
+        ),
+      }),
       new Field({
         name: "default_render_page",
         label: req.__("Show on page"),

package/tests/viewedit.test.js

@@ -360,27 +360,6 @@ describe("viewedit new Show", () => {
       .send("columns=" + encodeURIComponent(JSON.stringify(columns)))
       .send("layout=" + encodeURIComponent(JSON.stringify(layout)))
       .set("Cookie", loginCookie)
-      .expect(toInclude("Set page title"));
-  });
-  it("save new view page title", async () => {
-    const loginCookie = await getAdminLoginCookie();
-    const table = Table.findOne({ name: "books" });
-
-    const ctx = encodeURIComponent(
-      JSON.stringify({
-        table_id: table.id,
-        viewname: "mybook",
-        layout,
-        columns,
-      })
-    );
-
-    const app = await getApp({ disableCsrf: true });
-    await request(app)
-      .post("/viewedit/config/mybook")
-      .send("contextEnc=" + ctx)
-      .send("stepName=Set+page+title")
-      .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit"));
   });
   it("should show new view", async () => {