@saltcorn/server 0.9.4-beta.5 → 0.9.4-beta.7

package/locales/en.json

@@ -1348,5 +1348,9 @@
 	"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."
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4-beta.5",
+  "version": "0.9.4-beta.7",
   "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.5",
-    "@saltcorn/builder": "0.9.4-beta.5",
-    "@saltcorn/data": "0.9.4-beta.5",
-    "@saltcorn/admin-models": "0.9.4-beta.5",
-    "@saltcorn/filemanager": "0.9.4-beta.5",
-    "@saltcorn/markup": "0.9.4-beta.5",
-    "@saltcorn/sbadmin2": "0.9.4-beta.5",
+    "@saltcorn/base-plugin": "0.9.4-beta.7",
+    "@saltcorn/builder": "0.9.4-beta.7",
+    "@saltcorn/data": "0.9.4-beta.7",
+    "@saltcorn/admin-models": "0.9.4-beta.7",
+    "@saltcorn/filemanager": "0.9.4-beta.7",
+    "@saltcorn/markup": "0.9.4-beta.7",
+    "@saltcorn/sbadmin2": "0.9.4-beta.7",
     "@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/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/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 () => {