@saltcorn/server 0.9.0-beta.10 → 0.9.0-beta.11

package/locales/en.json

@@ -1266,5 +1266,7 @@
 	"Initially open": "Initially open",
 	"Not a valid pack": "Not a valid pack",
 	"Pack file": "Pack file",
-	"Upload a pack file": "Upload a pack file"
+	"Upload a pack file": "Upload a pack file",
+	"No menu": "No menu",
+	"Omit the menu from this page": "Omit the menu from this page"
 }

package/package.json

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

package/public/saltcorn-common.js

@@ -128,10 +128,13 @@ function apply_showif() {
     const dynwhere = JSON.parse(
       decodeURIComponent(e.attr("data-fetch-options"))
     );
-    //console.log("dynwhere", dynwhere);
-    const qss = Object.entries(dynwhere.whereParsed).map(
-      ([k, v]) => `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}`
-    );
+    if (window._sc_loglevel > 4) console.log("dynwhere", dynwhere);
+    const kvToQs = ([k, v]) => {
+      return k === "or" && Array.isArray(v)
+        ? v.map((v1) => Object.entries(v1).map(kvToQs).join("&")).join("&")
+        : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}`;
+    };
+    const qss = Object.entries(dynwhere.whereParsed).map(kvToQs);
     if (dynwhere.dereference) {
       if (Array.isArray(dynwhere.dereference))
         qss.push(...dynwhere.dereference.map((d) => `dereference=${d}`));
@@ -205,6 +208,9 @@ function apply_showif() {
       });
       $.ajax(`/api/${dynwhere.table}?${qs}`).then((resp) => {
         if (resp.success) {
+          if (window._sc_loglevel > 4)
+            console.log("dynwhere fetch", qs, resp.success);
+
           activate(resp.success, qs);
           const cacheNow = e.prop("data-fetch-options-cache") || {};
           e.prop("data-fetch-options-cache", {

package/routes/actions.js

@@ -390,6 +390,16 @@ router.get(
       return;
     }
     const action = getState().actions[trigger.action];
+    // get table related to trigger
+    const table = trigger.table_id
+      ? Table.findOne({ id: trigger.table_id })
+      : null;
+
+    const subtitle = span(
+      { class: "ms-3" },
+      trigger.action,
+      table ? ` on ` + a({ href: `/table/${table.name}` }, table.name) : ""
+    );
     if (!action) {
       req.flash("warning", req.__("Action not found"));
       res.redirect(`/actions/`);
@@ -420,6 +430,7 @@ router.get(
           type: "card",
           titleAjaxIndicator: true,
           title: req.__("Configure trigger %s", trigger.name),
+          subtitle,
           contents: {
             widths: [8, 4],
             besides: [
@@ -465,10 +476,6 @@ router.get(
       req.flash("warning", req.__("Action not configurable"));
       res.redirect(`/actions/`);
     } else {
-      // get table related to trigger
-      const table = trigger.table_id
-        ? Table.findOne({ id: trigger.table_id })
-        : null;
       // get configuration fields
       const cfgFields = await getActionConfigFields(action, table);
       // create form
@@ -491,6 +498,7 @@ router.get(
           type: "card",
           titleAjaxIndicator: true,
           title: req.__("Configure trigger %s", trigger.name),
+          subtitle,
           contents: renderForm(form, req.csrfToken()),
         },
       });

package/routes/page.js

@@ -61,6 +61,7 @@ router.get(
           title,
           description: db_page.description,
           bodyClass: "page_" + db.sqlsanitize(pagename),
+          no_menu: db_page.attributes?.no_menu,
         } || `${pagename} page`,
         add_edit_bar({
           role,

package/routes/pageedit.js

@@ -92,6 +92,12 @@ const pagePropertiesForm = async (req, isNew) => {
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       },
+      {
+        name: "no_menu",
+        label: req.__("No menu"),
+        sublabel: req.__("Omit the menu from this page"),
+        type: "Bool",
+      },
     ],
   });
   return form;
@@ -315,6 +321,7 @@ router.get(
       const form = await pagePropertiesForm(req);
       form.hidden("id");
       form.values = page;
+      form.values.no_menu = page.attributes?.no_menu;
       res.sendWrap(
         req.__(`Page attributes`),
         wrap(renderForm(form, req.csrfToken()), false, req, page)
@@ -360,9 +367,9 @@ router.post(
         wrap(renderForm(form, req.csrfToken()), false, req)
       );
     } else {
-      const { id, columns, ...pageRow } = form.values;
+      const { id, columns, no_menu, ...pageRow } = form.values;
       pageRow.min_role = +pageRow.min_role;
-
+      pageRow.attributes = { no_menu };
       if (+id) {
         await Page.update(+id, pageRow);
         res.redirect(`/pageedit/`);

package/routes/viewedit.js

@@ -638,8 +638,8 @@ router.post(
         newcfg = {
           ...view.configuration,
           [step.contextField]: {
-            ...view.configuration?.[step.contextField],
-            ...context,
+            ...(view.configuration?.[step.contextField] || {}),
+            ...(context?.[step.contextField] || {}),
           },
         };
       else newcfg = { ...view.configuration, ...context };

package/tests/viewedit.test.js

@@ -396,7 +396,7 @@ describe("viewedit new Show", () => {
   it("delete new view", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
-    const id = (await View.findOne({ name: "mybook" })).id;
+    const id = View.findOne({ name: "mybook" }).id;
 
     await request(app)
       .post("/viewedit/delete/" + id)
@@ -404,6 +404,249 @@ describe("viewedit new Show", () => {
       .expect(toRedirect("/viewedit"));
   });
 });
+
+describe("viewedit new Edit", () => {
+  // create two edit views for 'books'
+  // the first has inputs for all books-fields
+  //   => 'Fixed and blocked fields (step 2 / max 3)' won't show up
+  // the second has no input for 'pages'
+  //   => 'Fixed and blocked fields (step 2 / max 3)' shows up
+  //       and the configration gets a fixed property
+  const colsWithoutPages = [
+    {
+      type: "Field",
+      fieldview: "edit",
+      field_name: "author",
+    },
+    {
+      type: "Field",
+      fieldview: "select",
+      field_name: "publisher",
+    },
+    {
+      type: "Action",
+      rndid: "f61f38",
+      minRole: 100,
+      action_name: "Save",
+      action_style: "btn-primary",
+    },
+  ];
+  const colsWithPages = [
+    {
+      type: "Field",
+      fieldview: "edit",
+      field_name: "pages",
+    },
+    ...colsWithoutPages,
+  ];
+
+  const layoutWithoutPages = {
+    above: [
+      {
+        type: "field",
+        fieldview: "edit",
+        field_name: "author",
+      },
+
+      {
+        type: "field",
+        fieldview: "select",
+        field_name: "publisher",
+      },
+      {
+        type: "action",
+        rndid: "f61f38",
+        minRole: 100,
+        action_name: "Save",
+        action_style: "btn-primary",
+      },
+    ],
+  };
+  const layoutWithPages = {
+    above: [
+      {
+        type: "field",
+        fieldview: "edit",
+        field_name: "pages",
+      },
+      ...layoutWithoutPages.above,
+    ],
+  };
+
+  it("submits new view", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/save")
+      .send("viewtemplate=Edit")
+      .send("table_name=books")
+      .send("name=edit_mybook")
+      .send("min_role=100")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit/config/edit_mybook"));
+    // edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/save")
+      .send("viewtemplate=Edit")
+      .send("table_name=books")
+      .send("name=edit_mybook_without_pages")
+      .send("min_role=100")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit/config/edit_mybook_without_pages"));
+  });
+
+  it("saves new view layout", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+    const app = await getApp({ disableCsrf: true });
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/config/edit_mybook")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook",
+            })
+          )
+      )
+      .send("stepName=Layout")
+      .send("columns=" + encodeURIComponent(JSON.stringify(colsWithPages)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layoutWithPages)))
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Edit options (step 3 / 3)"));
+    // edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/config/edit_mybook_without_pages")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook_without_pages",
+            })
+          )
+      )
+      .send("stepName=Layout")
+      .send("columns=" + encodeURIComponent(JSON.stringify(colsWithoutPages)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layoutWithoutPages)))
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Fixed and blocked fields (step 2 / max 3)"));
+  });
+
+  it("saves new view fixed fields", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+    const app = await getApp({ disableCsrf: true });
+    // only edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/config/edit_mybook_without_pages")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook_without_pages",
+              layout: layoutWithoutPages,
+              columns: colsWithoutPages,
+            })
+          )
+      )
+      .send("stepName=Fixed+and+blocked+fields")
+      .send("pages=2")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Edit options (step 3 / 3)"));
+  });
+
+  it("saves view when done", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+    const app = await getApp({ disableCsrf: true });
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/config/edit_mybook")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook",
+              layout: layoutWithPages,
+              columns: colsWithPages,
+            })
+          )
+      )
+      .send("stepName=Edit+options")
+      .send("destination_type=View")
+      .send("view_when_done=authorlist")
+      .send("auto_save=on")
+      .send("split_paste=on")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+    const viewWithPages = View.findOne({ name: "edit_mybook" });
+    expect(viewWithPages.configuration.layout).toEqual(layoutWithPages);
+    expect(viewWithPages.configuration.columns).toEqual(colsWithPages);
+    // edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/config/edit_mybook_without_pages")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook_without_pages",
+              layout: layoutWithoutPages,
+              columns: colsWithoutPages,
+              fixed: {
+                pages: 22,
+                _block_pages: false,
+              },
+            })
+          )
+      )
+      .send("stepName=Edit+options")
+      .send("destination_type=View")
+      .send("view_when_done=authorlist")
+      .send("auto_save=on")
+      .send("split_paste=on")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+
+    const viewWithoutPages = View.findOne({
+      name: "edit_mybook_without_pages",
+    });
+    expect(viewWithoutPages.configuration.fixed).toEqual({
+      pages: 22,
+      _block_pages: false,
+    });
+    expect(viewWithoutPages.configuration.layout).toEqual(layoutWithoutPages);
+    expect(viewWithoutPages.configuration.columns).toEqual(colsWithoutPages);
+  });
+
+  it("deletes new view", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    const idA = View.findOne({ name: "edit_mybook" }).id;
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/delete/" + idA)
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+    // edit_mybook_without_pages
+    const idB = View.findOne({ name: "edit_mybook_without_pages" }).id;
+    await request(app)
+      .post("/viewedit/delete/" + idB)
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+  });
+});
+
+describe("viewedit new Edit with fixed fields", () => {
+  it("submit new view", async () => {});
+});
+
 describe("Library", () => {
   it("should save new from builder", async () => {
     const loginCookie = await getAdminLoginCookie();

package/wrapper.js

@@ -187,7 +187,9 @@ const get_headers = (req, version_tag, description, extras = []) => {
     : [];
   const stdHeaders = [
     {
-      headerTag: `<script>var _sc_globalCsrf = "${req.csrfToken()}"; var _sc_version_tag = "${version_tag}";</script>`,
+      headerTag: `<script>var _sc_loglevel = ${
+        state.logLevel
+      }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}";</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },
@@ -309,6 +311,7 @@ module.exports = (version_tag) =>
       const alerts = getFlashes(req);
       const state = getState();
       const layout = state.getLayout(req.user);
+      const no_menu = opts.no_menu;
 
       if (req.xhr) {
         const renderToHtml = layout.renderBody
@@ -335,8 +338,8 @@ module.exports = (version_tag) =>
       res.send(
         layout.wrap({
           title,
-          brand: get_brand(state),
-          menu: get_menu(req),
+          brand: no_menu ? undefined : get_brand(state),
+          menu: no_menu ? undefined : get_menu(req),
           currentUrl,
           originalUrl: req.originalUrl,