@saltcorn/server 0.9.2-rc.1 → 0.9.3-beta.0

package/locales/en.json

@@ -1285,5 +1285,6 @@
 	"Available themes": "Available themes",
 	"Install more themes »": "Install more themes »",
 	"Configure action": "Configure action",
-	"No changes detected, snapshot skipped": "No changes detected, snapshot skipped"
+	"No changes detected, snapshot skipped": "No changes detected, snapshot skipped",
+	"Cannot remove module: views %s depend on it": "Cannot remove module: views %s depend on it"
 }

package/markup/admin.js

@@ -52,7 +52,7 @@ const restore_backup = (csrf, inner, action = `/admin/restore`) =>
       class: "d-none",
       name: "file",
       type: "file",
-      accept: "application/zip,.zip",
+      accept: "application/zip,.zip,.sczip",
       onchange: "notifyAlert('Restoring backup...', true);this.form.submit();",
     })
   );

package/package.json

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

package/public/relation_helpers.js

@@ -0,0 +1,348 @@
+var relationHelpers = (() => {
+  // internal helper to build an object, structured for the picker
+  const buildLayers = (path, pathArr, result) => {
+    let currentLevel = result;
+    for (const relation of pathArr) {
+      if (relation.type === "Inbound") {
+        const existing = currentLevel.inboundKeys.find(
+          (key) => key.name === relation.key && key.table === relation.table
+        );
+        if (existing) {
+          currentLevel = existing;
+        } else {
+          const nextLevel = {
+            name: relation.key,
+            table: relation.table,
+            inboundKeys: [],
+            fkeys: [],
+          };
+          currentLevel.inboundKeys.push(nextLevel);
+          currentLevel = nextLevel;
+        }
+      } else if (relation.type === "Foreign") {
+        const existing = currentLevel.fkeys.find(
+          (key) => key.name === relation.key
+        );
+        if (existing) {
+          currentLevel = existing;
+        } else {
+          const nextLevel = {
+            name: relation.key,
+            table: relation.table,
+            inboundKeys: [],
+            fkeys: [],
+          };
+          currentLevel.fkeys.push(nextLevel);
+          currentLevel = nextLevel;
+        }
+      } else if (relation.type === "Independent") {
+        currentLevel.fkeys.push({
+          name: "None (no relation)",
+          table: relation.table,
+          inboundKeys: [],
+          fkeys: [],
+          relPath: path,
+        });
+      } else if (relation.type === "Own") {
+        currentLevel.fkeys.push({
+          name: "Same table",
+          table: "",
+          inboundKeys: [],
+          fkeys: [],
+          relPath: path,
+        });
+      }
+    }
+    currentLevel.relPath = path;
+  };
+
+  /**
+   * build an array of relation objects from a path string
+   * '.' stands for no relation
+   * '.table' stands for same table
+   * @param {*} path relation path string separated by '.', the first token is the source table
+   * @param {*} tableNameCache an object with table name as key and table object as value
+   * @returns
+   */
+  const parseRelationPath = (path, tableNameCache) => {
+    if (path === ".")
+      return [{ type: "Independent", table: "None (no relation)" }];
+    const tokens = path.split(".");
+    if (tokens.length === 2)
+      return [{ type: "Own", table: `${tokens[1]} (same table)` }];
+    else if (tokens.length >= 3) {
+      const result = [];
+      let currentTbl = tokens[1];
+      for (const relation of tokens.slice(2)) {
+        if (relation.indexOf("$") > 0) {
+          const [inboundTbl, inboundKey] = relation.split("$");
+          result.push({ type: "Inbound", table: inboundTbl, key: inboundKey });
+          currentTbl = inboundTbl;
+        } else {
+          const srcTbl = tableNameCache[currentTbl];
+          const fk = srcTbl.foreign_keys.find((fk) => fk.name === relation);
+          if (fk) {
+            const targetTbl = tableNameCache[fk.reftable_name];
+            result.push({
+              type: "Foreign",
+              table: targetTbl.name,
+              key: relation,
+            });
+            currentTbl = targetTbl.name;
+          }
+        }
+      }
+      return result;
+    }
+  };
+
+  /**
+   * build an array of relation objects from a legacy relation
+   * @param {string} type relation type (ChildList, Independent, Own, OneToOneShow, ParentShow)
+   * @param {string} rest rest of the legaccy relation
+   * @param {string} parentTbl source table
+   * @returns
+   */
+  const parseLegacyRelation = (type, rest, parentTbl) => {
+    switch (type) {
+      case "ChildList": {
+        const path = rest ? rest.split(".") : [];
+        if (path.length === 3) {
+          const [viewName, table, key] = path;
+          return [
+            {
+              type: "Inbound",
+              table,
+              key,
+            },
+          ];
+        } else if (path.length === 5) {
+          const [viewName, thrTbl, thrTblFkey, fromTbl, fromTblFkey] = path;
+          return [
+            {
+              type: "Inbound",
+              table: thrTbl,
+              key: thrTblFkey,
+            },
+            {
+              type: "Inbound",
+              table: fromTbl,
+              key: fromTblFkey,
+            },
+          ];
+        }
+        break;
+      }
+      case "Independent": {
+        return [{ type: "Independent", table: "None (no relation)" }];
+      }
+      case "Own": {
+        return [{ type: "Own", table: `${parentTbl} (same table)` }];
+      }
+      case "OneToOneShow": {
+        const tokens = rest ? rest.split(".") : [];
+        if (tokens.length !== 3) break;
+        const [viewname, relatedTbl, fkey] = tokens;
+        return [{ type: "Inbound", table: relatedTbl, key: fkey }];
+      }
+      case "ParentShow": {
+        const tokens = rest ? rest.split(".") : [];
+        if (tokens.length !== 3) break;
+        const [viewname, parentTbl, fkey] = tokens;
+        return [{ type: "Foreign", table: parentTbl, key: fkey }];
+      }
+    }
+    return [];
+  };
+
+  const ViewDisplayType = {
+    ROW_REQUIRED: "ROW_REQUIRED",
+    NO_ROW_LIMIT: "NO_ROW_LIMIT",
+    INVALID: "INVALID",
+  };
+
+  /**
+   * prepare the relations finder
+   * @param {object} tablesCache
+   * @param {object} allViews
+   * @param {number} maxDepth
+   */
+  const RelationsFinder = function (tablesCache, allViews, maxDepth) {
+    this.maxDepth = +maxDepth;
+    this.allViews = allViews;
+    const { tableIdCache, tableNameCache, fieldCache } = tablesCache;
+    this.tableIdCache = tableIdCache;
+    this.tableNameCache = tableNameCache;
+    this.fieldCache = fieldCache;
+  };
+
+  /**
+   * find relations between a source table and a subview
+   * @param {string} sourceTblName
+   * @param {string} subView
+   * @param {string[]} excluded
+   * @returns {object} {paths: string[], layers: object}
+   */
+  RelationsFinder.prototype.findRelations = function (
+    sourceTblName,
+    subView,
+    excluded
+  ) {
+    let paths = [];
+    const layers = { table: sourceTblName, inboundKeys: [], fkeys: [] };
+    try {
+      const view = this.allViews.find((v) => v.name === subView);
+      if (!view) throw new Error(`The view ${subView} does not exist`);
+      if (excluded?.find((e) => e === view.viewtemplate)) {
+        console.log(`view ${subView} is excluded`);
+        return { paths, layers };
+      }
+      switch (view.display_type) {
+        case ViewDisplayType.ROW_REQUIRED:
+          paths = this.singleRelationPaths(sourceTblName, subView, excluded);
+          break;
+        case ViewDisplayType.NO_ROW_LIMIT:
+          paths = this.multiRelationPaths(sourceTblName, subView, excluded);
+          break;
+        default:
+          throw new Error(
+            `view ${subView}: The displayType (${view.display_type}) is not valid`
+          );
+      }
+      for (const path of paths)
+        buildLayers(path, parseRelationPath(path, this.tableNameCache), layers);
+    } catch (error) {
+      console.log(error);
+    } finally {
+      return { paths, layers };
+    }
+  };
+
+  /**
+   * find relations between a source table and a subview with single row display (e.g. show)
+   * @param {string} sourceTblName
+   * @param {string} subView
+   * @param {string[]} excluded
+   * @returns
+   */
+  RelationsFinder.prototype.singleRelationPaths = function (
+    sourceTblName,
+    subView,
+    excluded
+  ) {
+    const result = [];
+    const subViewObj = this.allViews.find((v) => v.name === subView);
+    if (!subViewObj) throw new Error(`The view ${subView} does not exist`);
+    if (excluded?.find((e) => e === subViewObj.viewtemplate)) {
+      console.log(`view ${subView} is excluded`);
+      return result;
+    }
+    const sourceTbl = this.tableNameCache[sourceTblName];
+    if (!sourceTbl)
+      throw new Error(`The table ${sourceTblName} does not exist`);
+    // 1. parent relations
+    const parentRelations = sourceTbl.foreign_keys;
+    if (sourceTbl.id === subViewObj.table_id) result.push(`.${sourceTblName}`);
+    for (const relation of parentRelations) {
+      const targetTbl = this.tableNameCache[relation.reftable_name];
+      if (!targetTbl)
+        throw new Error(`The table ${relation.reftable_name} does not exist`);
+      if (targetTbl.id === subViewObj.table_id)
+        result.push(`.${sourceTblName}.${relation.name}`);
+    }
+    // 2. OneToOneShow
+    const uniqueFksToSrc = (this.fieldCache[sourceTblName] || []).filter(
+      (f) => f.is_unique
+    );
+    for (const relation of uniqueFksToSrc) {
+      const targetTbl = this.tableIdCache[relation.table_id];
+      if (!targetTbl)
+        throw new Error(`The table ${relation.table_id} does not exist`);
+      if (targetTbl.id === subViewObj.table_id)
+        result.push(`.${sourceTblName}.${targetTbl.name}$${relation.name}`);
+    }
+    // 3. inbound_self_relations
+    const srcFks = sourceTbl.foreign_keys;
+    for (const fkToSrc of uniqueFksToSrc) {
+      const refTable = this.tableIdCache[fkToSrc.table_id];
+      if (!refTable)
+        throw new Error(`The table ${fkToSrc.table_id} does not exist`);
+      const fromSrcToRef = srcFks.filter(
+        (field) => field.reftable_name === refTable.name
+      );
+      for (const toRef of fromSrcToRef) {
+        if (fkToSrc.reftable_name === sourceTblName)
+          result.push(`.${sourceTblName}.${toRef.name}.${fkToSrc.name}`);
+      }
+    }
+    return result;
+  };
+
+  /**
+   * find relations between a source table and a subview with multiple rows display (e.g. list)
+   * @param {string} sourceTblName
+   * @param {string} subView
+   * @param {string[]} excluded
+   * @returns
+   */
+  RelationsFinder.prototype.multiRelationPaths = function (
+    sourceTblName,
+    subView,
+    excluded
+  ) {
+    const result = ["."]; // none no relation
+    const subViewObj = this.allViews.find((v) => v.name === subView);
+    if (!subViewObj) throw new Error(`The view ${subView} does not exist`);
+    if (excluded?.find((e) => e === subViewObj.viewtemplate)) {
+      console.log(`view ${subView} is excluded`);
+      return result;
+    }
+    const sourceTbl = this.tableNameCache[sourceTblName];
+    if (!sourceTbl)
+      throw new Error(`The table ${sourceTblName} does not exist`);
+    const searcher = (current, path, level, visited) => {
+      if (level > this.maxDepth) return;
+      const visitedFkCopy = new Set(visited);
+      const fks = current.foreign_keys.filter((f) => !visitedFkCopy.has(f.id));
+      for (const fk of fks) {
+        visitedFkCopy.add(fk.id);
+        const target = this.tableNameCache[fk.reftable_name];
+        if (!target)
+          throw new Error(`The table ${fk.reftable_name} does not exist`);
+        const newPath = `${path}.${fk.name}`;
+        if (target.id === subViewObj.table_id) result.push(newPath);
+        searcher(target, newPath, level + 1, visitedFkCopy);
+      }
+
+      const visitedInboundCopy = new Set(visited);
+      const inbounds = (this.fieldCache[current.name] || []).filter(
+        (f) => !visitedInboundCopy.has(f.id)
+      );
+      for (const inbound of inbounds) {
+        visitedInboundCopy.add(inbound.id);
+        const target = this.tableIdCache[inbound.table_id];
+        if (!target)
+          throw new Error(`The table ${inbound.table_id} does not exist`);
+        const newPath = `${path}.${target.name}$${inbound.name}`;
+        if (target.id === subViewObj.table_id) result.push(newPath);
+        searcher(target, newPath, level + 1, visitedInboundCopy);
+      }
+    };
+    const path = `.${sourceTblName}`;
+    const visited = new Set();
+    searcher(sourceTbl, path, 0, visited);
+    return result;
+  };
+
+  return {
+    RelationsFinder: RelationsFinder,
+    ViewDisplayType: ViewDisplayType,
+    parseRelationPath: parseRelationPath,
+    parseLegacyRelation: parseLegacyRelation,
+  };
+})();
+
+// make the module available for jest with react
+if (typeof process !== "undefined" && process.env?.NODE_ENV === "test") {
+  module.exports = relationHelpers;
+}

package/public/saltcorn-common.js

@@ -1101,6 +1101,10 @@ async function common_done(res, viewname, isWeb = true) {
       const f = new Function(`viewname, row, {${res.field_names}}`, s);
       const evalres = await f(viewname, res.row, res.row);
       if (evalres) await common_done(evalres, viewname, isWeb);
+    } else if (res.row) {
+      const f = new Function(`viewname, row`, s);
+      const evalres = await f(viewname, res.row);
+      if (evalres) await common_done(evalres, viewname, isWeb);
     } else {
       const f = new Function(`viewname`, s);
       const evalres = await f(viewname);
@@ -1138,16 +1142,25 @@ async function common_done(res, viewname, isWeb = true) {
     });
   }
   if (res.set_fields && viewname) {
-    Object.keys(res.set_fields).forEach((k) => {
-      const form = $(`form[data-viewname=${viewname}]`);
-      const input = form.find(
-        `input[name=${k}], textarea[name=${k}], select[name=${k}]`
+    const form = $(`form[data-viewname=${viewname}]`);
+    if (form.length === 0 && set_state_fields) {
+      // assume this is a filter
+      set_state_fields(
+        res.set_fields,
+        false
+        // $(`[data-sc-embed-viewname="${viewname}"]`)
       );
-      if (input.attr("type") === "checkbox")
-        input.prop("checked", res.set_fields[k]);
-      else input.val(res.set_fields[k]);
-      input.trigger("set_form_field");
-    });
+    } else {
+      Object.keys(res.set_fields).forEach((k) => {
+        const input = form.find(
+          `input[name=${k}], textarea[name=${k}], select[name=${k}]`
+        );
+        if (input.attr("type") === "checkbox")
+          input.prop("checked", res.set_fields[k]);
+        else input.val(res.set_fields[k]);
+        input.trigger("set_form_field");
+      });
+    }
   }
   if (res.goto && !isWeb)
     // TODO ch

package/public/saltcorn.js

@@ -37,12 +37,23 @@ function updateQueryStringParameter(uri1, key, value) {
   var re = new RegExp("([?&])" + key + "=.*?(&|$)", "i");
   var separator = uri.indexOf("?") !== -1 ? "&" : "?";
   if (uri.match(re)) {
-    return (
-      uri.replace(re, "$1" + key + "=" + encodeURIComponent(value) + "$2") +
-      hash
-    );
+    if (Array.isArray(value)) {
+      var rmuri = removeQueryStringParameter(uri, key);
+      return updateQueryStringParameter(rmuri, key, value);
+    } else
+      return (
+        uri.replace(re, "$1" + key + "=" + encodeURIComponent(value) + "$2") +
+        hash
+      );
   } else {
-    return uri + separator + key + "=" + encodeURIComponent(value) + hash;
+    if (Array.isArray(value))
+      return (
+        uri +
+        separator +
+        value.map((val) => key + "=" + encodeURIComponent(val)).join("&") +
+        hash
+      );
+    else return uri + separator + key + "=" + encodeURIComponent(value) + hash;
   }
 }
 

package/routes/homepage.js

@@ -87,7 +87,12 @@ const viewTable = (views, req) =>
       {
         label: req.__("Edit"),
         key: (r) =>
-          link(`/viewedit/edit/${encodeURIComponent(r.name)}`, req.__("Edit")),
+          r.singleton
+            ? ""
+            : link(
+                `/viewedit/edit/${encodeURIComponent(r.name)}`,
+                req.__("Edit")
+              ),
       },
     ],
     views

package/routes/plugins.js

@@ -1243,6 +1243,7 @@ router.post(
     }
     await load_plugins.loadAndSaveNewPlugin(plugin, forceReInstall);
     const plugin_module = getState().plugins[name];
+    await sleep(1000); // Allow other workers to load this plugin
     await getState().refresh_views();
 
     if (plugin_module && plugin_module.configuration_workflow) {
@@ -1254,7 +1255,6 @@ router.post(
           plugin_db.name
         )
       );
-      await sleep(1000); // Allow other workers to load this plugin
       res.redirect(`/plugins/configure/${plugin_db.name}`);
     } else {
       req.flash("success", req.__(`Module %s installed`, plugin.name));

package/tests/clientjs.test.js

@@ -47,6 +47,29 @@ test("updateQueryStringParameter", () => {
       "AK"
     )
   ).toBe("/foo?publisher.publisher->name=AK");
+  expect(updateQueryStringParameter("/foo", "_or_field", ["baz", "bar"])).toBe(
+    "/foo?_or_field=baz&_or_field=bar"
+  );
+  expect(
+    updateQueryStringParameter("/foo?_or_field=zoo", "_or_field", [
+      "baz",
+      "bar",
+    ])
+  ).toBe("/foo?_or_field=baz&_or_field=bar");
+  expect(
+    updateQueryStringParameter(
+      "/foo?_or_field=baz&_or_field=bar",
+      "_or_field",
+      ["baz"]
+    )
+  ).toBe("/foo?&_or_field=baz"); //or no ampersand
+  expect(
+    updateQueryStringParameter(
+      "/foo?_or_field=baz&_or_field=bar",
+      "_or_field",
+      []
+    )
+  ).toBe("/foo?&"); //or no ampersand / question mark
 });
 //publisher.publisher->name
 test("updateQueryStringParameter hash", () => {

package/tests/sync.test.js

@@ -193,7 +193,7 @@ describe("load remote insert/updates", () => {
         .post("/table")
         .set("Cookie", loginCookie)
         .send(`name=${encodeURIComponent("Table with capitals")}`)
-        .expect(toRedirect("/table/16"));
+        .expect(toRedirect("/table/26"));
       // add a field
       await request(app)
         .post("/field/")
@@ -202,17 +202,17 @@ describe("load remote insert/updates", () => {
         .send("label=StringField")
         .send("type=String")
         .send(
-          `contextEnc=${encodeURIComponent(JSON.stringify({ table_id: 16 }))}`
+          `contextEnc=${encodeURIComponent(JSON.stringify({ table_id: 26 }))}`
         )
         .set("Cookie", loginCookie)
         .expect(toInclude("options"));
       // init sync_info table
       await request(app)
         .post("/table")
-        .send("id=16")
+        .send("id=26")
         .send("has_sync_info=on")
         .set("Cookie", loginCookie)
-        .expect(toRedirect("/table/16"));
+        .expect(toRedirect("/table/26"));
       const dbTime = await db.time();
 
       // call load changes

package/tests/table.test.js

@@ -39,7 +39,7 @@ describe("Table Endpoints", () => {
       .post("/table/")
       .send("name=mypostedtable")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/table/16"));
+      .expect(toRedirect("/table/26"));
     await request(app)
       .get("/table/10")
       .set("Cookie", loginCookie)
@@ -155,7 +155,7 @@ Pencil, 0.5,2, t`;
       .set("Cookie", loginCookie)
       .field("name", "expenses")
       .attach("file", Buffer.from(csv, "utf-8"))
-      .expect(toRedirect("/table/17"));
+      .expect(toRedirect("/table/27"));
   });
   it("should upload csv to existing table", async () => {
     const csv = `author,Pages

package/tests/view.test.js

@@ -17,9 +17,6 @@ const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 
 const { plugin_with_routes } = require("@saltcorn/data/tests/mocks");
-const {
-  prepareArtistsAlbumRelation,
-} = require("@saltcorn/data/tests/common_helpers");
 
 afterAll(db.close);
 beforeAll(async () => {
@@ -523,7 +520,7 @@ describe("inbound relations", () => {
 
     await request(app)
       .get(
-        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/blog_posts_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj)
         )}`
       )
@@ -535,7 +532,7 @@ describe("inbound relations", () => {
     queryObj.srcId = 2;
     await request(app)
       .get(
-        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/blog_posts_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj)
         )}`
       )
@@ -547,7 +544,7 @@ describe("inbound relations", () => {
     queryObj.srcId = 3;
     await request(app)
       .get(
-        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/blog_posts_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj)
         )}`
       )
@@ -567,7 +564,7 @@ describe("inbound relations", () => {
     const loginCookie = await getAdminLoginCookie();
     await request(app)
       .get(
-        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/blog_posts_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj)
         )}`
       )
@@ -579,7 +576,7 @@ describe("inbound relations", () => {
     queryObj.srcId = 2;
     await request(app)
       .get(
-        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/blog_posts_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj)
         )}`
       )
@@ -591,10 +588,6 @@ describe("inbound relations", () => {
 });
 
 describe("many to many relations", () => {
-  beforeAll(async () => {
-    await prepareArtistsAlbumRelation();
-  });
-
   it("artist_plays_on_album", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
@@ -621,7 +614,7 @@ describe("many to many relations", () => {
     };
     await request(app)
       .get(
-        `/view/albums_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/albums_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj_1)
         )}`
       )
@@ -635,7 +628,7 @@ describe("many to many relations", () => {
     };
     await request(app)
       .get(
-        `/view/albums_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/albums_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj_2)
         )}`
       )
@@ -655,7 +648,7 @@ describe("many to many relations", () => {
     };
     await request(app)
       .get(
-        `/view/fan_club_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/fan_club_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj_1)
         )}`
       )
@@ -672,7 +665,7 @@ describe("many to many relations", () => {
     };
     await request(app)
       .get(
-        `/view/fan_club_feed?_inbound_relation_path_=${encodeURIComponent(
+        `/view/fan_club_feed?_relation_path_=${encodeURIComponent(
           JSON.stringify(queryObj_2)
         )}`
       )
@@ -683,3 +676,52 @@ describe("many to many relations", () => {
       .expect(toInclude("fan club official"));
   });
 });
+
+describe("legacy relations with relation path", () => {
+  it("Independent feed", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+
+    const queryObj = {
+      relation: ".",
+      srcId: 1,
+    };
+    await request(app)
+      .get(
+        `/view/fan_club_feed?_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("crazy fan club"))
+      .expect(toInclude("another club"))
+      .expect(toInclude("fan club"))
+      .expect(toInclude("fan club official"));
+  });
+
+  it("Independent feed as subview", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/show_pressing_job_with_new_indenpendent_relation_path?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("crazy fan club"))
+      .expect(toInclude("another club"))
+      .expect(toInclude("fan club"))
+      .expect(toInclude("fan club official"));
+  });
+
+  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)
+      .expect(toInclude("album A"));
+    await request(app)
+      .get("/view/show_album_with_subview_new_relation_path?id=2")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("album B"));
+  });
+});

package/wrapper.js

@@ -195,6 +195,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },
     { script: `/static_assets/${version_tag}/saltcorn.js` },
     { script: `/static_assets/${version_tag}/dayjs.min.js` },
+    { script: `/static_assets/${version_tag}/relation_helpers.js` },
   ];
   let from_cfg = [];
   if (state.getConfig("page_custom_css", ""))