@saltcorn/server 0.9.4-beta.11 → 0.9.4-beta.12

package/locales/en.json

@@ -1365,5 +1365,6 @@
 	"Random allocation": "Random allocation",
 	"Serve a random page, ignoring the eligible formula. Within a session, reloads will always deliver the same page. This is a basic requirement for A/B testing.": "Serve a random page, ignoring the eligible formula. Within a session, reloads will always deliver the same page. This is a basic requirement for A/B testing.",
 	"Pagegroup %s not found": "Pagegroup %s not found",
-	"Create trigger": "Create trigger"
+	"Create trigger": "Create trigger",
+	"Omit the menu from this view": "Omit the menu from this view"
 }

package/markup/admin.js

@@ -95,23 +95,27 @@ const add_edit_bar = ({
   const singleton = view?.viewtemplateObj?.singleton;
 
   const bar = div(
-    { class: "alert alert-light d-print-none admin-edit-bar" },
-    title,
-    what && span({ class: "ms-1 me-2 badge bg-primary" }, what),
-    !singleton &&
-      a(
-        { class: "ms-2", href: url },
-        "Edit ",
-        i({ class: "fas fa-edit" })
-      ),
-    cfgUrl && !singleton
-      ? a(
-          { class: "ms-1 me-3", href: cfgUrl },
-          "Configure ",
-          i({ class: "fas fa-cog" })
-        )
-      : "",
-    !singleton && viewSpec
+    { class: "card p-1 mt-1 mb-3 d-print-none admin-edit-bar" },
+    div(
+      { class: "card-body p-1" },
+      i({ class: "fas fa-user-cog me-1" }),
+      what && span({ class: "ms-1 me-2 badge bg-secondary" }, what),
+      title,
+      !singleton &&
+        a(
+          { class: "ms-2", href: url },
+          "Edit ",
+          i({ class: "fas fa-edit" })
+        ),
+      cfgUrl && !singleton
+        ? a(
+            { class: "ms-1 me-3", href: cfgUrl },
+            "Configure ",
+            i({ class: "fas fa-cog" })
+          )
+        : "",
+      !singleton && viewSpec
+    )
   );
 
   if (contents.above) {
@@ -232,7 +236,7 @@ const send_infoarch_page = (args) => {
             { text: "Multitenancy", href: "/tenant/settings" },
           ]
         : []),
-      { text: "Pagegroups", href: "/page_group/settings"},
+      { text: "Pagegroups", href: "/page_group/settings" },
       { text: "Tags", href: "/tag" },
       { text: "Diagram", href: "/diagram" },
     ],

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4-beta.11",
+  "version": "0.9.4-beta.12",
   "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.11",
-    "@saltcorn/builder": "0.9.4-beta.11",
-    "@saltcorn/data": "0.9.4-beta.11",
-    "@saltcorn/admin-models": "0.9.4-beta.11",
-    "@saltcorn/filemanager": "0.9.4-beta.11",
-    "@saltcorn/markup": "0.9.4-beta.11",
-    "@saltcorn/sbadmin2": "0.9.4-beta.11",
+    "@saltcorn/base-plugin": "0.9.4-beta.12",
+    "@saltcorn/builder": "0.9.4-beta.12",
+    "@saltcorn/data": "0.9.4-beta.12",
+    "@saltcorn/admin-models": "0.9.4-beta.12",
+    "@saltcorn/filemanager": "0.9.4-beta.12",
+    "@saltcorn/markup": "0.9.4-beta.12",
+    "@saltcorn/sbadmin2": "0.9.4-beta.12",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -55,6 +55,7 @@
     "pluralize": "^8.0.0",
     "qrcode": "1.5.1",
     "resize-with-sharp-or-jimp": "0.1.7",
+    "semver": "^7.6.0",
     "socket.io": "4.6.0",
     "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",

package/routes/admin.js

@@ -2427,6 +2427,7 @@ router.post(
       await PageGroup.delete({});
     }
     if (form.values.pages) {
+      await db.deleteWhere("_sc_tag_entries", { not: { page_id: null } });
       await db.deleteWhere("_sc_pages");
     }
     if (form.values.views) {

package/routes/homepage.js

@@ -24,6 +24,7 @@ const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
 const { get_base_url, sendHtmlFile, getEligiblePage } = require("./utils.js");
+const semver = require("semver");
 
 /**
  * Tables List
@@ -519,8 +520,8 @@ const no_views_logged_in = async (req, res) => {
     const latest =
       isRoot && (await get_latest_npm_version("@saltcorn/cli", 500));
     const can_update =
-      packagejson.version !== latest &&
       latest &&
+      semver.gt(latest, packagejson.version) &&
       !process.env.SALTCORN_DISABLE_UPGRADE;
     if (latest && can_update && isRoot)
       req.flash(

package/routes/tag_entries.js

@@ -30,7 +30,12 @@ const buildFields = (entryType, formOptions, req) => {
       div(
         { class: "col-sm-10" },
         select(
-          { name: "ids", class: "form-control form-select", multiple: true },
+          {
+            name: "ids",
+            class: "form-control form-select",
+            multiple: true,
+            size: 20,
+          },
           list.map((entry) => {
             return option({ value: entry.id, label: entry.name });
           })

package/routes/view.js

@@ -79,6 +79,7 @@ router.get(
     if ((title || "").includes("{{")) {
       title = await view.interpolate_title_string(title, query);
     }
+    title = { title };
     if (isModal && view.attributes?.popup_width)
       res.set(
         "SaltcornModalWidth",
@@ -102,7 +103,10 @@ router.get(
       if ((description || "").includes("{{")) {
         description = await view.interpolate_title_string(description, query);
       }
-      title = { title, description };
+      title.description = description;
+    }
+    if (view.attributes?.no_menu) {
+      title.no_menu = true;
     }
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();

package/routes/viewedit.js

@@ -217,6 +217,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         ),
       }),
       new Field({
+        // legacy
         name: "default_render_page",
         label: req.__("Show on page"),
         sublabel: req.__(
@@ -243,6 +244,14 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         },
         showIf: { viewtemplate: hasTable },
       }),
+      new Field({
+        name: "no_menu",
+        label: req.__("No menu"),
+        sublabel: req.__("Omit the menu from this view"),
+        tab: "View settings",
+        parent_field: "attributes",
+        type: "Bool",
+      }),
       new Field({
         name: "popup_title",
         label: req.__("Title"),