@saltcorn/server 0.9.3 → 0.9.4-beta.0

package/auth/testhelp.js

@@ -29,24 +29,29 @@ const toRedirect = (loc) => (res) => {
 
 /**
  *
- * @param {number} txt
+ * @param {string|string[]} exp expected string or for arrrays at least one must be present
  * @param {number} expCode
  * @returns {void}
  * @throws {Error}
  */
 const toInclude =
-  (txt, expCode = 200) =>
+  (exp, expCode = 200) =>
   (res) => {
     if (res.statusCode !== expCode) {
       console.log(res.text);
       throw new Error(
-        `Expected status ${expCode} when lookinng for "${txt}", received ${res.statusCode}`
+        `Expected status ${expCode} when lookinng for "${exp}", received ${res.statusCode}`
       );
     }
-
-    if (!res.text.includes(txt)) {
+    const check = (txt) => res.text.includes(txt);
+    if (Array.isArray(exp)) {
+      if (!exp.some(check)) {
+        console.log(res.text);
+        throw new Error(`Expected text from [${exp.join(", ")}] not found`);
+      }
+    } else if (!check(exp)) {
       console.log(res.text);
-      throw new Error(`Expected text ${txt} not found`);
+      throw new Error(`Expected text ${exp} not found`);
     }
   };
 

package/locales/en.json

@@ -1344,5 +1344,7 @@
 	"Time of day": "Time of day",
 	"UTC timezone": "UTC timezone",
 	"Show if formula": "Show if formula",
-	"Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>.": "Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>."
+	"Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>.": "Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>.",
+	"Pagegroup": "Pagegroup",
+	"Pagegroup %s has no members": "Pagegroup %s has no members"
 }

package/locales/es.json

@@ -349,7 +349,7 @@
 	"Omit search form": "Omit search form",
 	"Do not display the search filter form": "No mostrar el formulario de filtro de búsqueda",
 	"Default search form values when first loaded": "Valores del formulario de búsqueda predeterminado cuando se carga por primera vez",
-	"Next":"Siguiente",
+	"Next": "Siguiente",
 	"Save": "Guardar",
 	"Calculated fields cannot have File type": "Los campos calculados no pueden tener tipo de archivo",
 	"Calculated fields cannot have Key type": "Los campos calculados no pueden tener tipo de clave",
@@ -502,7 +502,7 @@
 	"Restart server": "Reiniciar el servidor",
 	"Edit Plugin": "Editar complemento",
 	"Unknown authentication method %ss": "Método de autenticación desconocido %ss",
-	"Restart required for changes to take effect. Restart server from the <a href=\/admin\">Admin page</a>.": "Es necesario reiniciar para que los cambios surtan efecto. Reinicie el servidor desde la <a href=\/admin\">página de administración</a>.",
+	"Restart required for changes to take effect. Restart server from the <a href=/admin\">Admin page</a>.": "Es necesario reiniciar para que los cambios surtan efecto. Reinicie el servidor desde la <a href=/admin\">página de administración</a>.",
 	"Email with password reset link sent": "Correo electrónico con enlace para restablecer contraseña enviado",
 	"Link Style": "Estilo de enlace",
 	"Link size": "Tamaño del enlace",
@@ -1268,5 +1268,6 @@
 	"Pack file": "Empaquetar archivo",
 	"Upload a pack file": "Subir un archivo de paquete",
 	"No menu": "Sin menú",
-	"Omit the menu from this page": "Omitir el menú de esta página"
-}
+	"Omit the menu from this page": "Omitir el menú de esta página",
+	"%s has no eligible page": "%s has no eligible page"
+}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.3",
+  "version": "0.9.4-beta.0",
   "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.3",
-    "@saltcorn/builder": "0.9.3",
-    "@saltcorn/data": "0.9.3",
-    "@saltcorn/admin-models": "0.9.3",
-    "@saltcorn/filemanager": "0.9.3",
-    "@saltcorn/markup": "0.9.3",
-    "@saltcorn/sbadmin2": "0.9.3",
+    "@saltcorn/base-plugin": "0.9.4-beta.0",
+    "@saltcorn/builder": "0.9.4-beta.0",
+    "@saltcorn/data": "0.9.4-beta.0",
+    "@saltcorn/admin-models": "0.9.4-beta.0",
+    "@saltcorn/filemanager": "0.9.4-beta.0",
+    "@saltcorn/markup": "0.9.4-beta.0",
+    "@saltcorn/sbadmin2": "0.9.4-beta.0",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -80,6 +80,7 @@ function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
     try {
+      if (e.prop("disabled")) return;
       let to_show = e.data("data-show-if-fun");
       if (!to_show) {
         to_show = new Function(
@@ -92,12 +93,12 @@ function apply_showif() {
         e.data("data-closest-form-ns", e.closest(".form-namespace"));
       if (to_show(e))
         e.show()
-          .find("input, textarea, button, select")
+          .find("input, textarea, button, select, [data-show-if]")
           .prop("disabled", e.attr("data-disabled") || false);
       else
         e.hide()
           .find(
-            "input:enabled, textarea:enabled, button:enabled, select:enabled"
+            "input:enabled, textarea:enabled, button:enabled, select:enabled, [data-show-if]:not([disabled])"
           )
           .prop("disabled", true);
     } catch (e) {
@@ -1504,3 +1505,17 @@ function disable_inactive_tab_inputs(id) {
     });
   }, 100);
 }
+
+function set_readonly_select(e) {
+  if (!e.target) return;
+  const $e = $(e.target);
+  if ($e.attr("type") !== "hidden") return;
+  const $disp = $e.prev();
+  const optionsS = decodeURIComponent(
+    $disp.attr("data-readonly-select-options")
+  );
+  if (!optionsS) return;
+  const options = JSON.parse(optionsS);
+  const option = options.find((o) => o.value == e.target.value);
+  if (option) $disp.val(option.label);
+}

package/routes/admin.js

@@ -1476,27 +1476,22 @@ router.get(
 );
 const buildDialogScript = () => {
   return `<script>
-  function swapEntryInputs(activeTab, activeInput, disabledTab, disabledInput) {
-    activeTab.addClass("active");
-    activeInput.removeClass("d-none");
-    activeInput.addClass("d-block");
-    activeInput.attr("name", "entryPoint");
-    disabledTab.removeClass("active");
-    disabledInput.removeClass("d-block");
-    disabledInput.addClass("d-none");
-    disabledInput.removeAttr("name");
-  }
-  
   function showEntrySelect(type) {
-    const viewNavLin = $("#viewNavLinkID");
-    const pageNavLink = $("#pageNavLinkID");
-    const viewInp = $("#viewInputID");
-    const pageInp = $("#pageInputID");
-    if (type === "page") {
-      swapEntryInputs(pageNavLink, pageInp, viewNavLin, viewInp);
-    }
-    else if (type === "view") {
-      swapEntryInputs(viewNavLin, viewInp, pageNavLink, pageInp);
+    for( const currentType of ["view", "page", "pagegroup"]) {
+      const tab = $('#' + currentType + 'NavLinkID');
+      const input = $('#' + currentType + 'InputID');
+      if (currentType === type) {
+        tab.addClass("active");
+        input.removeClass("d-none");
+        input.addClass("d-block");
+        input.attr("name", "entryPoint");
+      }
+      else {
+        tab.removeClass("active");
+        input.removeClass("d-block");
+        input.addClass("d-none");
+        input.removeAttr("name");
+      }
     }
     $("#entryPointTypeID").attr("value", type);
   }
@@ -1526,6 +1521,7 @@ router.get(
   error_catcher(async (req, res) => {
     const views = await View.find();
     const pages = await Page.find();
+    const pageGroups = await PageGroup.find();
     const images = (await File.find({ mime_super: "image" })).filter((image) =>
       image.filename?.endsWith(".png")
     );
@@ -1622,6 +1618,23 @@ router.get(
                               id: "pageNavLinkID",
                             },
                             req.__("Page")
+                          ),
+                          li(
+                            {
+                              class: "nav-item",
+                              onClick: "showEntrySelect('pagegroup')",
+                            },
+                            div(
+                              {
+                                class: `nav-link ${
+                                  builderSettings.entryPointType === "pagegroup"
+                                    ? "active"
+                                    : ""
+                                }`,
+                                id: "pagegroupNavLinkID",
+                              },
+                              req.__("Pagegroup")
+                            )
                           )
                         )
                       ),
@@ -1629,7 +1642,8 @@ router.get(
                       select(
                         {
                           class: `form-select ${
-                            builderSettings.entryPointType === "page"
+                            builderSettings.entryPointType === "page" ||
+                            builderSettings.entryPointType === "pagegroup"
                               ? "d-none"
                               : ""
                           }`,
@@ -1658,7 +1672,8 @@ router.get(
                         {
                           class: `form-select ${
                             !builderSettings.entryPointType ||
-                            builderSettings.entryPointType === "view"
+                            builderSettings.entryPointType === "view" ||
+                            builderSettings.entryPointType === "pagegroup"
                               ? "d-none"
                               : ""
                           }`,
@@ -1680,6 +1695,36 @@ router.get(
                             )
                           )
                           .join("")
+                      ),
+                      // select entry-pagegroup
+                      select(
+                        {
+                          class: `form-select ${
+                            !builderSettings.entryPointType ||
+                            builderSettings.entryPointType === "view" ||
+                            builderSettings.entryPointType === "page"
+                              ? "d-none"
+                              : ""
+                          }`,
+                          ...(builderSettings.entryPointType === "pagegroup"
+                            ? { name: "entryPoint" }
+                            : {}),
+                          id: "pagegroupInputID",
+                        },
+                        pageGroups
+                          .map((group) =>
+                            option(
+                              {
+                                value: group.name,
+                                selected:
+                                  builderSettings.entryPointType ===
+                                    "pagegroup" &&
+                                  builderSettings.entryPoint === group.name,
+                              },
+                              group.name
+                            )
+                          )
+                          .join("")
                       )
                     ),
                     div(
@@ -2252,7 +2297,7 @@ router.post(
       "-e",
       entryPoint,
       "-t",
-      entryPointType,
+      entryPointType === "pagegroup" ? "page" : entryPointType,
       "-c",
       buildDir,
       "-b",

package/routes/homepage.js

@@ -12,6 +12,7 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const Page = require("@saltcorn/data/models/page");
+const PageGroup = require("@saltcorn/data/models/page_group");
 const Plugin = require("@saltcorn/data/models/plugin");
 const { link, mkTable } = require("@saltcorn/markup");
 const { div, a, p, i, h5, span } = require("@saltcorn/markup/tags");
@@ -22,7 +23,7 @@ const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
-const { get_base_url, sendHtmlFile } = require("./utils.js");
+const { get_base_url, sendHtmlFile, getEligiblePage } = require("./utils.js");
 
 /**
  * Tables List
@@ -545,6 +546,18 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
+  const wrap = async (contents, homeCfg, title, description) => {
+    if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
+    else
+      res.sendWrap(
+        {
+          title: title || "",
+          description: description || "",
+          bodyClass: "page_" + db.sqlsanitize(homeCfg),
+        },
+        contents
+      );
+  };
   const modernCfg = getState().getConfig("home_page_by_role", false);
   // predefined roles
   const legacy_role = { 100: "public", 80: "user", 40: "staff", 1: "admin" }[
@@ -554,21 +567,30 @@ const get_config_response = async (role_id, res, req) => {
   if (typeof homeCfg !== "string")
     homeCfg = getState().getConfig(legacy_role + "_home");
   if (homeCfg) {
-    const db_page = await Page.findOne({ name: homeCfg });
-
-    if (db_page) {
-      const contents = await db_page.run(req.query, { res, req });
-      if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
-      else
-        res.sendWrap(
-          {
-            title: db_page.title,
-            description: db_page.description,
-            bodyClass: "page_" + db.sqlsanitize(homeCfg),
-          },
-          contents
-        );
-    } else res.redirect(homeCfg);
+    const db_page = Page.findOne({ name: homeCfg });
+    if (db_page)
+      wrap(
+        await db_page.run(req.query, { res, req }),
+        homeCfg,
+        db_page.title,
+        db_page.description
+      );
+    else {
+      const group = PageGroup.findOne({ name: homeCfg });
+      if (group) {
+        const eligible = await getEligiblePage(group, req, res);
+        if (typeof eligible === "string") wrap(eligible);
+        else if (eligible) {
+          if (!eligible.isReload)
+            wrap(
+              await eligible.run(req.query, { res, req }),
+              homeCfg,
+              eligible.title,
+              eligible.description
+            );
+        } else wrap(req.__("%s has no eligible page", group.name), homeCfg);
+      } else res.redirect(homeCfg);
+    }
     return true;
   }
 };

package/routes/page.js

@@ -5,21 +5,20 @@
  */
 
 const Router = require("express-promise-router");
-const { UAParser } = require("ua-parser-js");
 
 const Page = require("@saltcorn/data/models/page");
 const PageGroup = require("@saltcorn/data/models/page_group");
 const Trigger = require("@saltcorn/data/models/trigger");
-const { getState, features } = require("@saltcorn/data/db/state");
+const { getState } = require("@saltcorn/data/db/state");
 const {
   error_catcher,
   scan_for_page_title,
   isAdmin,
   sendHtmlFile,
+  getEligiblePage,
 } = require("../routes/utils.js");
 const { isTest } = require("@saltcorn/data/utils");
 const { add_edit_bar } = require("../markup/admin.js");
-const { script, domReady } = require("@saltcorn/markup/tags");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
 const db = require("@saltcorn/data/db");
@@ -77,74 +76,41 @@ const runPage = async (page, req, res, tic) => {
       );
   } else {
     getState().log(2, `Page ${page.name} not authorized`);
-    res.status(404).sendWrap(` page`, req.__("Page %s not found", page.name));
+    res
+      .status(404)
+      .sendWrap(
+        req.__("Internal Error"),
+        req.__("Page %s not found", page.name)
+      );
   }
 };
 
-const uaDevice = (req) => {
-  const uaParser = new UAParser(req.headers["user-agent"]);
-  const device = uaParser.getDevice();
-  if (!device.type) return "web";
-  else return device.type;
-};
-
-const screenInfoFromCfg = (req) => {
-  const device = uaDevice(req);
-  const uaScreenInfos = getState().getConfig("user_agent_screen_infos", {});
-  return { device, ...uaScreenInfos[device] };
-};
-
 const runPageGroup = async (pageGroup, req, res, tic) => {
   const role = req.user && req.user.id ? req.user.role_id : 100;
   if (role <= pageGroup.min_role) {
-    if (pageGroup.members.length === 0) {
-      getState().log(2, `Pagegroup ${pageGroup.name} has no members`);
+    const eligible = await getEligiblePage(pageGroup, req, res);
+    if (typeof eligible === "string") {
+      getState().log(2, eligible);
+      res.status(400).sendWrap(req.__("Internal Error"), eligible);
+    } else if (eligible) {
+      if (!eligible.isReload) await runPage(eligible, req, res, tic);
+    } else {
+      getState().log(2, `Pagegroup ${pageGroup.name} has no eligible page`);
       res
-        .status(400)
+        .status(404)
         .sendWrap(
-          ` page`,
-          req.__("Pagegroup %s has no members", pageGroup.name)
-        );
-    } else {
-      let screenInfos = null;
-      if (req.cookies["_sc_screen_info_"]) {
-        screenInfos = JSON.parse(req.cookies["_sc_screen_info_"]);
-        screenInfos.device = uaDevice(req);
-      } else {
-        const strategy = getState().getConfig(
-          "missing_screen_info_strategy",
-          "guess_from_user_agent"
+          req.__("Internal Error"),
+          req.__("%s has no eligible page", pageGroup.name)
         );
-        if (strategy === "guess_from_user_agent")
-          screenInfos = screenInfoFromCfg(req);
-        else if (strategy === "reload" && req.query.is_reload !== "true") {
-          return res.sendWrap(
-            script(
-              domReady(`
-                setScreenInfoCookie();
-                window.location = updateQueryStringParameter(window.location.href, "is_reload", true);`)
-            )
-          );
-        }
-      }
-      const eligiblePage = await pageGroup.getEligiblePage(
-        screenInfos,
-        req.user ? req.user : { role_id: features.public_user_role },
-        req.getLocale()
-      );
-      if (eligiblePage) await runPage(eligiblePage, req, res, tic);
-      else {
-        getState().log(2, `Pagegroup ${pageGroup.name} has no eligible page`);
-        res
-          .status(404)
-          .sendWrap(` page`, req.__("%s has no eligible page", pageGroup.name));
-      }
     }
   } else {
     getState().log(2, `Pagegroup ${pageGroup.name} not authorized`);
     res
       .status(404)
-      .sendWrap(` page`, req.__("Pagegroup %s not found", pageGroup.name));
+      .sendWrap(
+        req.__("Internal Error"),
+        req.__("Pagegroup %s not found", pageGroup.name)
+      );
   }
 };
 
@@ -164,7 +130,10 @@ router.get(
         getState().log(2, `Page ${pagename} not found or not authorized`);
         res
           .status(404)
-          .sendWrap(`${pagename} page`, req.__("Page %s not found", pagename));
+          .sendWrap(
+            req.__("Internal Error"),
+            req.__("Page %s not found", pagename)
+          );
       }
     }
   })

package/routes/pageedit.js

@@ -242,12 +242,14 @@ const pageBuilderData = async (req, context) => {
 /**
  * Root pages configuration Form
  * Allows to configure root page for each role
- * @param {object[]} pages list of pages
- * @param {object[]} roles - list of roles
- * @param {object} req - request
+ * Groups are listed under the pages (perhaps we need something to switch between input-selects)
+ * @param {Page[]} pages list of pages
+ * @param {PageGroup[]} pageGroups list of page groups
+ * @param {Row[]} roles - list of roles
+ * @param {any} req - request
  * @returns {Form} return Form
  */
-const getRootPageForm = (pages, roles, req) => {
+const getRootPageForm = (pages, pageGroups, roles, req) => {
   const form = new Form({
     action: "/pageedit/set_root_page",
     noSubmitButton: true,
@@ -261,7 +263,14 @@ const getRootPageForm = (pages, roles, req) => {
           name: r.role,
           label: r.role,
           input_type: "select",
-          options: ["", ...pages.map((p) => p.name)],
+          options: [
+            "",
+            ...pages.map((p) => p.name),
+            ...pageGroups.map((g) => ({
+              label: `${g.name} (group)`,
+              value: g.name,
+            })),
+          ],
         })
     ),
   });
@@ -338,7 +347,7 @@ router.get(
           title: req.__("Root pages"),
           titleAjaxIndicator: true,
           contents: renderForm(
-            getRootPageForm(pages, roles, req),
+            getRootPageForm(pages, pageGroups, roles, req),
             req.csrfToken()
           ),
         },
@@ -704,8 +713,9 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const pages = await Page.find({}, { orderBy: "name" });
+    const pageGroups = await PageGroup.find({}, { orderBy: "name" });
     const roles = await User.get_roles();
-    const form = await getRootPageForm(pages, roles, req);
+    const form = getRootPageForm(pages, pageGroups, roles, req);
     const valres = form.validate(req.body);
     if (valres.success) {
       const home_page_by_role =

package/routes/utils.js

@@ -10,9 +10,10 @@ const {
   getState,
   getTenant,
   get_other_domain_tenant,
+  features,
 } = require("@saltcorn/data/db/state");
 const { get_base_url } = require("@saltcorn/data/models/config");
-const { input } = require("@saltcorn/markup/tags");
+const { input, script, domReady } = require("@saltcorn/markup/tags");
 const session = require("express-session");
 const cookieSession = require("cookie-session");
 const is = require("contractis/is");
@@ -28,6 +29,7 @@ const {
   flash_restart,
 } = require("../markup/admin.js");
 const path = require("path");
+const { UAParser } = require("ua-parser-js");
 
 const get_sys_info = async () => {
   const disks = await si.fsSize();
@@ -416,6 +418,12 @@ const sendHtmlFile = async (req, res, file) => {
   }
 };
 
+/**
+ * set the minimum role for a model (Page, View, ...)
+ * @param {any} req
+ * @param {any} res
+ * @param {any} model
+ */
 const setRole = async (req, res, model) => {
   const { id } = req.params;
   const role = req.body.role;
@@ -433,6 +441,70 @@ const setRole = async (req, res, model) => {
   } else res.json({ okay: true, responseText: message });
 };
 
+/**
+ * internal helper to get the device type from user agent
+ * @param {any} req
+ * @returns device type as string
+ */
+const uaDevice = (req) => {
+  const uaParser = new UAParser(req.headers["user-agent"]);
+  const device = uaParser.getDevice();
+  if (!device.type) return "web";
+  else return device.type;
+};
+
+/**
+ * internal helper to get the device specific screen info from config
+ * @param {any} req
+ * @returns object with device type and screen info
+ */
+const screenInfoFromCfg = (req) => {
+  const device = uaDevice(req);
+  const uaScreenInfos = getState().getConfig("user_agent_screen_infos", {});
+  return { device, ...uaScreenInfos[device] };
+};
+
+/**
+ * get the eligible page for pagegroup with respect to the screen infos
+ * @param {PageGroup} pageGroup
+ * @param {any} req
+ * @param {any} res
+ * @returns eligible page an error message or an object with reload flag
+ */
+const getEligiblePage = async (pageGroup, req, res) => {
+  if (pageGroup.members.length === 0)
+    return req.__("Pagegroup %s has no members", pageGroup.name);
+  else {
+    let screenInfos = null;
+    if (req.cookies["_sc_screen_info_"]) {
+      screenInfos = JSON.parse(req.cookies["_sc_screen_info_"]);
+      screenInfos.device = uaDevice(req);
+    } else {
+      const strategy = getState().getConfig(
+        "missing_screen_info_strategy",
+        "guess_from_user_agent"
+      );
+      if (strategy === "guess_from_user_agent")
+        screenInfos = screenInfoFromCfg(req);
+      else if (strategy === "reload" && req.query.is_reload !== "true") {
+        res.sendWrap(
+          script(
+            domReady(`
+            setScreenInfoCookie();
+            window.location = updateQueryStringParameter(window.location.href, "is_reload", true);`)
+          )
+        );
+        return { isReload: true };
+      }
+    }
+    return await pageGroup.getEligiblePage(
+      screenInfos,
+      req.user ? req.user : { role_id: features.public_user_role },
+      req.getLocale()
+    );
+  }
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -451,4 +523,5 @@ module.exports = {
   admin_config_route,
   sendHtmlFile,
   setRole,
+  getEligiblePage,
 };

package/tests/fields.test.js

@@ -419,9 +419,10 @@ describe("Fieldview config", () => {
         field_name: "pages",
         fieldview: "progress_bar",
       })
+      .expect(toInclude(`<div class="form-group"><div class="form-check">`))
       .expect(
         toInclude(
-          `<div class="form-group"><div><label for="inputmax">max</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="max" name="max" id="inputmax" step="1" required></div></div><div class="form-group"><div><label for="inputbar_color">Bar color</label></div><div><input type="color" class="form-control  item-menu" data-fieldname="bar_color" name="bar_color" id="inputbar_color"></div></div><div class="form-group"><div><label for="inputbg_color">Background color</label></div><div><input type="color" class="form-control  item-menu" data-fieldname="bg_color" name="bg_color" id="inputbg_color"></div></div><div class="form-group"><div><label for="inputpx_height">Height in px</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="px_height" name="px_height" id="inputpx_height" step="1"></div></div>`
+          `<div><label for="inputpx_height">Height in px</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="px_height" name="px_height" id="inputpx_height" step="1"></div>`
         )
       );
   });

package/tests/view.test.js

@@ -135,7 +135,7 @@ describe("view with routes", () => {
 describe("render view on page", () => {
   it("should show edit", async () => {
     const view = await View.findOne({ name: "authorshow" });
-    View.update({ default_render_page: "a_page" }, view.id);
+    await View.update({ default_render_page: "a_page" }, view.id);
     const app = await getApp({ disableCsrf: true });
     await request(app)
       .get("/view/authorshow?id=1")
@@ -151,7 +151,7 @@ describe("render view with slug", () => {
     const slugOpts = await table.slug_options();
     const slugOpt = slugOpts.find((so) => so.label === "/:id");
     expect(!!slugOpt).toBe(true);
-    View.update({ default_render_page: null, slug: slugOpt }, view.id);
+    await View.update({ default_render_page: null, slug: slugOpt }, view.id);
     const app = await getApp({ disableCsrf: true });
     await request(app)
       .get("/view/authorlist")
@@ -171,7 +171,7 @@ describe("render view with slug", () => {
     const slugOpts = await table.slug_options();
     const slugOpt = slugOpts.find((so) => so.label === "/slugify-author");
     expect(!!slugOpt).toBe(true);
-    View.update({ default_render_page: null, slug: slugOpt }, view.id);
+    await View.update({ default_render_page: null, slug: slugOpt }, view.id);
     const app = await getApp({ disableCsrf: true });
     await request(app)
       .get("/view/authorlist")
@@ -868,6 +868,63 @@ describe("relation path to query and state", () => {
   });
 });
 
+describe("edit-in-edit with relation path and legacy", () => {
+  it("edit-in-edit with relation path one layer", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/edit_department_with_edit_in_edit_legacy?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("add_repeater"));
+
+    // TODO post
+  });
+
+  it("edit-in-edit with relation path two layer", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/edit_cover_with_edit_artist_on_album_rel_path?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("add_repeater"));
+
+    // TODO post
+  });
+
+  it("edit-in-edit legacy one layer", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/edit_department_with_edit_in_edit_legacy?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("add_repeater"));
+
+    // TODO post
+  });
+
+  it("edit-in-edit with relation path two layer", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/edit_cover_with_edit_artist_on_album_rel_path?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("add_repeater"));
+
+    // TODO post
+  });
+
+  it("edit-in-edit legacy two layer", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/edit_cover_with_edit_artist_on_album_legacy?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("add_repeater"));
+
+    // TODO post
+  });
+});
+
 describe("legacy relations with relation path", () => {
   it("Independent feed", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -905,7 +962,6 @@ describe("legacy relations with relation path", () => {
   it("Own same table subview", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
-
     await request(app)
       .get("/view/show_album_with_subview_new_relation_path?id=1")
       .set("Cookie", loginCookie)
@@ -915,4 +971,17 @@ describe("legacy relations with relation path", () => {
       .set("Cookie", loginCookie)
       .expect(toInclude("album B"));
   });
+
+  it("edit-view with show-subview same table", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/authoredit_with_show")
+      .set("Cookie", loginCookie)
+      .expect(toSucceed);
+    await request(app)
+      .get("/view/authoredit_with_show?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude(["Herman Melville", "agi"]));
+  });
 });