@antelopejs/dms 0.3.7 → 0.4.0

package/dist/test/unit/interfaces/dms-base/table-view-route-param-filter-defaults.test.js

@@ -0,0 +1,254 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const interface_api_1 = require("@antelopejs/interface-api");
+const interface_core_1 = require("@antelopejs/interface-core");
+const interface_data_api_1 = require("@antelopejs/interface-data-api");
+const metadata_1 = require("@antelopejs/interface-data-api/metadata");
+const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
+const chai_1 = require("chai");
+const pageImpl = __importStar(require("../../../../implementations/dms/page"));
+const permissionsImpl = __importStar(require("../../../../implementations/dms/permissions"));
+const realtimeImpl = __importStar(require("../../../../implementations/dms/realtime"));
+const constants_1 = require("@antelopejs/interface-dms/constants");
+const pageInterface = __importStar(require("@antelopejs/interface-dms/page"));
+const page_1 = require("@antelopejs/interface-dms/page");
+const registry_1 = require("@antelopejs/interface-dms/page/registry");
+const permissionsInterface = __importStar(require("@antelopejs/interface-dms/permissions"));
+const realtimeInterface = __importStar(require("@antelopejs/interface-dms/realtime"));
+const default_types_1 = require("@antelopejs/interface-dms/base/data-types/default-types");
+const table_view_1 = require("@antelopejs/interface-dms/base/table-view");
+const TABLE = "route-param-filter-documents";
+const LOCATION = "/api/route-param-filter-defaults";
+function settle() {
+    return new Promise((resolve) => setImmediate(resolve));
+}
+let Document = class Document extends interface_database_decorators_1.Table {
+};
+__decorate([
+    (0, interface_database_decorators_1.Field)("string"),
+    __metadata("design:type", String)
+], Document.prototype, "name", void 0);
+__decorate([
+    (0, interface_database_decorators_1.Field)("string"),
+    __metadata("design:type", String)
+], Document.prototype, "_instance", void 0);
+Document = __decorate([
+    (0, interface_database_decorators_1.RegisterTable)(TABLE, constants_1.CORE_SCHEMA_NAME)
+], Document);
+class DocumentModel extends (0, interface_database_decorators_1.BasicDataModel)(Document, TABLE) {
+}
+let DocumentAPI = class DocumentAPI extends (0, interface_data_api_1.DataController)(Document, { new: table_view_1.TableViewRoutes.New, edit: table_view_1.TableViewRoutes.Edit }, (0, interface_api_1.Controller)(LOCATION)) {
+};
+__decorate([
+    (0, metadata_1.ModelReference)(),
+    (0, interface_database_decorators_1.Model)(DocumentModel),
+    __metadata("design:type", DocumentModel)
+], DocumentAPI.prototype, "model", void 0);
+__decorate([
+    (0, table_view_1.Column)({ name: "Name", type: new default_types_1.DefaultDataTypes.StringType() }),
+    (0, metadata_1.Access)(metadata_1.AccessMode.ReadWrite),
+    __metadata("design:type", String)
+], DocumentAPI.prototype, "name", void 0);
+DocumentAPI = __decorate([
+    (0, interface_data_api_1.RegisterDataController)()
+], DocumentAPI);
+const ROUTE_FILTER = { id: { field: "_instance" } };
+const QUERY_FILTER = { status: { field: "status" } };
+const detailTable = (0, table_view_1.TableView)(DocumentAPI, {
+    formContainer: { type: "page" },
+    routeParamFilters: ROUTE_FILTER,
+    queryParamFilters: QUERY_FILTER,
+    realtime: false,
+});
+const namedParamTable = (0, table_view_1.TableView)(DocumentAPI, {
+    formContainer: { type: "page" },
+    routeParamFilters: { workspace: { field: "_instance" } },
+    realtime: false,
+});
+const deepTable = (0, table_view_1.TableView)(DocumentAPI, {
+    formContainer: { type: "page" },
+    routeParamFilters: ROUTE_FILTER,
+    realtime: false,
+});
+const topLevelTable = (0, table_view_1.TableView)(DocumentAPI, {
+    formContainer: { type: "page" },
+    routeParamFilters: ROUTE_FILTER,
+    realtime: false,
+});
+const unfilteredTable = (0, table_view_1.TableView)(DocumentAPI, {
+    formContainer: { type: "page" },
+    realtime: false,
+});
+const drawerTable = (0, table_view_1.TableView)(DocumentAPI, {
+    formContainer: { type: "drawer" },
+    routeParamFilters: ROUTE_FILTER,
+    realtime: false,
+});
+let DetailPage = class DetailPage extends (0, page_1.RootPageController)("rpf-detail", {
+    displayName: "Detail of a workspace",
+    urlSlug: "rpf-detail/:id",
+}) {
+    static rows = detailTable;
+};
+DetailPage = __decorate([
+    (0, page_1.RegisterPage)()
+], DetailPage);
+let NamedParamPage = class NamedParamPage extends (0, page_1.RootPageController)("rpf-named", {
+    displayName: "Detail with a placeholder of its own name",
+    urlSlug: "rpf-named/:workspace",
+}) {
+    static rows = namedParamTable;
+};
+NamedParamPage = __decorate([
+    (0, page_1.RegisterPage)()
+], NamedParamPage);
+let DeepPage = class DeepPage extends (0, page_1.RootPageController)("rpf-deep", {
+    displayName: "Page repeating its own placeholder",
+    urlSlug: "rpf-deep/:id/sub/:id",
+}) {
+    static rows = deepTable;
+};
+DeepPage = __decorate([
+    (0, page_1.RegisterPage)()
+], DeepPage);
+let TopLevelPage = class TopLevelPage extends (0, page_1.RootPageController)("rpf-top", {
+    displayName: "Page without a route parameter",
+}) {
+    static rows = topLevelTable;
+};
+TopLevelPage = __decorate([
+    (0, page_1.RegisterPage)()
+], TopLevelPage);
+let UnfilteredPage = class UnfilteredPage extends (0, page_1.RootPageController)("rpf-unfiltered", {
+    displayName: "Table view without URL filters",
+}) {
+    static rows = unfilteredTable;
+};
+UnfilteredPage = __decorate([
+    (0, page_1.RegisterPage)()
+], UnfilteredPage);
+let DrawerPage = class DrawerPage extends (0, page_1.RootPageController)("rpf-drawer", {
+    displayName: "Drawer form container",
+    urlSlug: "rpf-drawer/:id",
+}) {
+    static rows = drawerTable;
+};
+DrawerPage = __decorate([
+    (0, page_1.RegisterPage)()
+], DrawerPage);
+const pages = [
+    DetailPage,
+    NamedParamPage,
+    DeepPage,
+    TopLevelPage,
+    UnfilteredPage,
+    DrawerPage,
+];
+async function formPageOptions(formPageFullId) {
+    const form = registry_1.pageMetadataByFullId.get(formPageFullId)?.components.form;
+    if (!form)
+        throw new Error(`No form page registered as ${formPageFullId}`);
+    return (await form.serialize()).options;
+}
+async function formComponents(table) {
+    return (await table.serialize()).options?.formComponents;
+}
+describe("[unit] interfaces/dms-base — route param filter form defaults", () => {
+    before(async () => {
+        (0, interface_core_1.ImplementInterface)(permissionsInterface, permissionsImpl);
+        (0, interface_core_1.ImplementInterface)(realtimeInterface, realtimeImpl);
+        (0, interface_core_1.ImplementInterface)(pageInterface, pageImpl);
+        await settle();
+    });
+    after(() => {
+        for (const page of pages) {
+            const { pageInfo } = (0, interface_core_1.GetMetadata)(page, page_1.PageMetadata);
+            if (pageInfo)
+                pageInterface.internal.RegisterPage.unregister(pageInfo);
+        }
+    });
+    it("numbers the page parameter on an edit route repeating its name", async () => {
+        const edit = await formPageOptions("rpf-detail.rows.edit");
+        (0, chai_1.expect)(edit?.submitDefaults).to.deep.equal({
+            status: "{{query.status}}",
+            _instance: "{{params.id:1}}",
+        });
+        (0, chai_1.expect)(edit?.submitUrl).to.equal(`${LOCATION}/edit?id={{params.id}}`);
+    });
+    it("keeps the bare name on a new route carrying the name once", async () => {
+        (0, chai_1.expect)((await formPageOptions("rpf-detail.rows.new"))?.submitDefaults).to.deep.equal({
+            status: "{{query.status}}",
+            _instance: "{{params.id}}",
+        });
+    });
+    it("gives the view form no defaults", async () => {
+        (0, chai_1.expect)((await formPageOptions("rpf-detail.rows.view"))?.submitDefaults).to.equal(undefined);
+    });
+    it("keeps the bare name when the page parameter is not named id", async () => {
+        (0, chai_1.expect)((await formPageOptions("rpf-named.rows.edit"))?.submitDefaults).to.deep.equal({ _instance: "{{params.workspace}}" });
+    });
+    it("numbers the last occurrence of a name the page slug repeats", async () => {
+        (0, chai_1.expect)((await formPageOptions("rpf-deep.rows.new"))?.submitDefaults).to.deep.equal({ _instance: "{{params.id:2}}" });
+        (0, chai_1.expect)((await formPageOptions("rpf-deep.rows.edit"))?.submitDefaults).to.deep.equal({ _instance: "{{params.id:2}}" });
+    });
+    it("leaves the forms of a page without route parameter as they were", async () => {
+        for (const kind of ["new", "edit"]) {
+            (0, chai_1.expect)((await formPageOptions(`rpf-top.rows.${kind}`))?.submitDefaults).to.deep.equal({ _instance: "{{params.id}}" });
+        }
+        const unfiltered = await formPageOptions("rpf-unfiltered.rows.edit");
+        (0, chai_1.expect)(unfiltered?.submitDefaults).to.equal(undefined);
+    });
+    it("keeps the bare name on the forms the table view embeds", async () => {
+        const embedded = await formComponents(drawerTable);
+        (0, chai_1.expect)(embedded?.edit?.options?.submitDefaults).to.deep.equal({
+            _instance: "{{params.id}}",
+        });
+        (0, chai_1.expect)((await formComponents(detailTable))?.edit?.options?.submitDefaults).to.deep.equal({
+            status: "{{query.status}}",
+            _instance: "{{params.id}}",
+        });
+    });
+});
+//# sourceMappingURL=table-view-route-param-filter-defaults.test.js.map

package/dist/test/unit/interfaces/dms-base/table-view-route-param-filter-defaults.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"table-view-route-param-filter-defaults.test.js","sourceRoot":"","sources":["../../../../../src/test/unit/interfaces/dms-base/table-view-route-param-filter-defaults.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6DAAuD;AACvD,+DAA6E;AAC7E,uEAGwC;AACxC,sEAIiD;AACjD,6FAMmD;AACnD,+BAA8B;AAC9B,+EAAiE;AACjE,6FAA+E;AAC/E,uFAAyE;AACzE,mEAAuE;AACvE,8EAAgE;AAChE,yDAIwC;AACxC,sEAA+E;AAC/E,4FAA8E;AAC9E,sFAAwE;AACxE,2FAA2F;AAE3F,0EAImD;AAGnD,MAAM,KAAK,GAAG,8BAA8B,CAAC;AAC7C,MAAM,QAAQ,GAAG,kCAAkC,CAAC;AAEpD,SAAS,MAAM;IACb,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;AACzD,CAAC;AAKD,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,qCAAK;CAG3B,CAAA;AAF0B;IAAxB,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sCAAsB;AACb;IAAxB,IAAA,qCAAK,EAAC,QAAQ,CAAC;;2CAA2B;AAFvC,QAAQ;IADb,IAAA,6CAAa,EAAC,KAAK,EAAE,4BAAgB,CAAC;GACjC,QAAQ,CAGb;AAED,MAAM,aAAc,SAAQ,IAAA,8CAAc,EAAC,QAAQ,EAAE,KAAK,CAAC;CAAG;AAG9D,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,mCAAc,EACtC,QAAQ,EACR,EAAE,GAAG,EAAE,4BAAe,CAAC,GAAG,EAAE,IAAI,EAAE,4BAAe,CAAC,IAAI,EAAE,EACxD,IAAA,0BAAU,EAAC,QAAQ,CAAC,CACrB;CAOA,CAAA;AAJS;IAFP,IAAA,yBAAc,GAAE;IAChB,IAAA,qCAAK,EAAC,aAAa,CAAC;8BACN,aAAa;0CAAC;AAGrB;IAFP,IAAA,mBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,gCAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;IACjE,IAAA,iBAAM,EAAC,qBAAU,CAAC,SAAS,CAAC;;yCACR;AAVjB,WAAW;IADhB,IAAA,2CAAsB,GAAE;GACnB,WAAW,CAWhB;AAED,MAAM,YAAY,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC;AACpD,MAAM,YAAY,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;AAErD,MAAM,WAAW,GAAG,IAAA,sBAAS,EAAC,WAAW,EAAE;IACzC,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC/B,iBAAiB,EAAE,YAAY;IAC/B,iBAAiB,EAAE,YAAY;IAC/B,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,IAAA,sBAAS,EAAC,WAAW,EAAE;IAC7C,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC/B,iBAAiB,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;IACxD,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,WAAW,EAAE;IACvC,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC/B,iBAAiB,EAAE,YAAY;IAC/B,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,WAAW,EAAE;IAC3C,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC/B,iBAAiB,EAAE,YAAY;IAC/B,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,IAAA,sBAAS,EAAC,WAAW,EAAE;IAC7C,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC/B,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,IAAA,sBAAS,EAAC,WAAW,EAAE;IACzC,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACjC,iBAAiB,EAAE,YAAY;IAC/B,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC;AAGH,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,yBAAkB,EAAC,YAAY,EAAE;IACxD,WAAW,EAAE,uBAAuB;IACpC,OAAO,EAAE,gBAAgB;CAC1B,CAAC;IACA,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;;AAJtB,UAAU;IADf,IAAA,mBAAY,GAAE;GACT,UAAU,CAKf;AAGD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,IAAA,yBAAkB,EAAC,WAAW,EAAE;IAC3D,WAAW,EAAE,2CAA2C;IACxD,OAAO,EAAE,sBAAsB;CAChC,CAAC;IACA,MAAM,CAAC,IAAI,GAAG,eAAe,CAAC;;AAJ1B,cAAc;IADnB,IAAA,mBAAY,GAAE;GACT,cAAc,CAKnB;AAKD,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,IAAA,yBAAkB,EAAC,UAAU,EAAE;IACpD,WAAW,EAAE,oCAAoC;IACjD,OAAO,EAAE,sBAAsB;CAChC,CAAC;IACA,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;;AAJpB,QAAQ;IADb,IAAA,mBAAY,GAAE;GACT,QAAQ,CAKb;AAGD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAA,yBAAkB,EAAC,SAAS,EAAE;IACvD,WAAW,EAAE,gCAAgC;CAC9C,CAAC;IACA,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC;;AAHxB,YAAY;IADjB,IAAA,mBAAY,GAAE;GACT,YAAY,CAIjB;AAGD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,IAAA,yBAAkB,EAAC,gBAAgB,EAAE;IAChE,WAAW,EAAE,gCAAgC;CAC9C,CAAC;IACA,MAAM,CAAC,IAAI,GAAG,eAAe,CAAC;;AAH1B,cAAc;IADnB,IAAA,mBAAY,GAAE;GACT,cAAc,CAInB;AAGD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,yBAAkB,EAAC,YAAY,EAAE;IACxD,WAAW,EAAE,uBAAuB;IACpC,OAAO,EAAE,gBAAgB;CAC1B,CAAC;IACA,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;;AAJtB,UAAU;IADf,IAAA,mBAAY,GAAE;GACT,UAAU,CAKf;AAED,MAAM,KAAK,GAAG;IACZ,UAAU;IACV,cAAc;IACd,QAAQ;IACR,YAAY;IACZ,cAAc;IACd,UAAU;CACX,CAAC;AAEF,KAAK,UAAU,eAAe,CAC5B,cAAsB;IAEtB,MAAM,IAAI,GAAG,+BAAoB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC;IACvE,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,cAAc,EAAE,CAAC,CAAC;IAC3E,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,OAA0C,CAAC;AAC7E,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,KAAyB;IAEzB,OAAO,CAAC,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC;AAC3D,CAAC;AAED,QAAQ,CAAC,+DAA+D,EAAE,GAAG,EAAE;IAC7E,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,IAAA,mCAAkB,EAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;QAC1D,IAAA,mCAAkB,EAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QACpD,IAAA,mCAAkB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,MAAM,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,GAAG,EAAE;QACT,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,4BAAW,EAAC,IAAI,EAAE,mBAAY,CAAC,CAAC;YACrD,IAAI,QAAQ;gBAAE,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzE,CAAC;IACH,CAAC,CAAC,CAAC;IAIH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,sBAAsB,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACzC,MAAM,EAAE,kBAAkB;YAC1B,SAAS,EAAE,iBAAiB;SAC7B,CAAC,CAAC;QACH,IAAA,aAAM,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,QAAQ,wBAAwB,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAGH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,IAAA,aAAM,EACJ,CAAC,MAAM,eAAe,CAAC,qBAAqB,CAAC,CAAC,EAAE,cAAc,CAC/D,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACd,MAAM,EAAE,kBAAkB;YAC1B,SAAS,EAAE,eAAe;SAC3B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QAC/C,IAAA,aAAM,EACJ,CAAC,MAAM,eAAe,CAAC,sBAAsB,CAAC,CAAC,EAAE,cAAc,CAChE,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,IAAA,aAAM,EACJ,CAAC,MAAM,eAAe,CAAC,qBAAqB,CAAC,CAAC,EAAE,cAAc,CAC/D,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,IAAA,aAAM,EACJ,CAAC,MAAM,eAAe,CAAC,mBAAmB,CAAC,CAAC,EAAE,cAAc,CAC7D,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAClD,IAAA,aAAM,EACJ,CAAC,MAAM,eAAe,CAAC,oBAAoB,CAAC,CAAC,EAAE,cAAc,CAC9D,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;YACnC,IAAA,aAAM,EACJ,CAAC,MAAM,eAAe,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,EAAE,cAAc,CAChE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,0BAA0B,CAAC,CAAC;QACrE,IAAA,aAAM,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAIH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC;QACnD,IAAA,aAAM,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YAC5D,SAAS,EAAE,eAAe;SAC3B,CAAC,CAAC;QACH,IAAA,aAAM,EACJ,CAAC,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CACnE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACd,MAAM,EAAE,kBAAkB;YAC1B,SAAS,EAAE,eAAe;SAC3B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/validation/auth.schema.d.ts

@@ -7,29 +7,29 @@ export declare const authSchema: {
         lang: z.ZodString;
         token: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        name: string;
-        lang: string;
-        email: string;
         token: string;
-        password: string;
-    }, {
         name: string;
-        lang: string;
+        password: string;
         email: string;
+        lang: string;
+    }, {
         token: string;
+        name: string;
         password: string;
+        email: string;
+        lang: string;
     }>;
     login: z.ZodObject<{
         email: z.ZodString;
         password: z.ZodString;
         keep_login: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        email: string;
         password: string;
+        email: string;
         keep_login?: boolean | undefined;
     }, {
-        email: string;
         password: string;
+        email: string;
         keep_login?: boolean | undefined;
     }>;
     oauthCallback: z.ZodObject<{
@@ -42,14 +42,14 @@ export declare const authSchema: {
         code: string;
         state: string;
         state_cookie: string;
-        language?: string | undefined;
         invite?: string | undefined;
+        language?: string | undefined;
     }, {
         code: string;
         state: string;
         state_cookie: string;
-        language?: string | undefined;
         invite?: string | undefined;
+        language?: string | undefined;
     }>;
     refresh: z.ZodObject<{
         token: z.ZodString;
@@ -83,37 +83,37 @@ export declare const authSchema: {
         token: z.ZodString;
         email: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        email: string;
         token: string;
-    }, {
         email: string;
+    }, {
         token: string;
+        email: string;
     }>;
     reset: z.ZodObject<{
         token: z.ZodString;
         email: z.ZodString;
         password: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        email: string;
         token: string;
         password: string;
-    }, {
         email: string;
+    }, {
         token: string;
         password: string;
+        email: string;
     }>;
     verify2FA: z.ZodObject<{
         token: z.ZodString;
         code: z.ZodString;
         method: z.ZodEnum<["totp", "email", "backup"]>;
     }, "strip", z.ZodTypeAny, {
-        code: string;
         method: "email" | "totp" | "backup";
         token: string;
-    }, {
         code: string;
+    }, {
         method: "email" | "totp" | "backup";
         token: string;
+        code: string;
     }>;
     request2FAEmail: z.ZodObject<{
         token: z.ZodString;
@@ -133,11 +133,11 @@ export declare const authSchema: {
         method: z.ZodEnum<["totp", "email"]>;
         code: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        code: string;
         method: "email" | "totp";
-    }, {
         code: string;
+    }, {
         method: "email" | "totp";
+        code: string;
     }>;
     regenerateBackup: z.ZodObject<{
         code: z.ZodString;

package/dist/validation/onboarding/register-admin.schema.d.ts

@@ -5,18 +5,18 @@ export declare const onboardingRegisterAdminSchema: z.ZodEffects<z.ZodObject<{
     password: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    email: string;
     password: string;
+    email: string;
 }, {
     name: string;
-    email: string;
     password: string;
+    email: string;
 }>, {
     email: string;
     name: string;
     password: string;
 }, {
     name: string;
-    email: string;
     password: string;
+    email: string;
 }>;

package/frontend-vue/layers/dms-layout/app/composables/page/useSiteLayout.ts

@@ -37,36 +37,65 @@ interface MatchRouteResult {
   params: Record<string, string>;
 }
 
-function extractRouteParams(
+// A route pattern can carry the same placeholder name twice: a page-mode form
+// sub-page under a page whose own slug is `:id` resolves to
+// `/workspaces/:id/invoiceTable/:id/edit`. The bare name holds the LAST
+// occurrence, so `params.id` keeps meaning the row id the way it does on every
+// single-placeholder form route, and each occurrence of a repeated name is
+// exposed as well under `<name>:<n>`, numbered from 1 in pattern order, so the
+// id of the carrying page stays reachable as `id:1`. A name that occurs only
+// once gets no indexed key: those bags are exactly what they were.
+const OCCURRENCE_KEY_SEPARATOR = ":";
+
+const occurrenceKey = (name: string, occurrence: number): string =>
+  `${name}${OCCURRENCE_KEY_SEPARATOR}${occurrence}`;
+
+function countByName(names: string[]): Record<string, number> {
+  const totals: Record<string, number> = {};
+  for (const name of names) {
+    totals[name] = (totals[name] ?? 0) + 1;
+  }
+  return totals;
+}
+
+function buildParamBag(
+  names: string[],
+  values: string[],
+): Record<string, string> {
+  const totals = countByName(names);
+  const seen: Record<string, number> = {};
+  const params: Record<string, string> = {};
+
+  names.forEach((name, index) => {
+    const value = values[index]!;
+    const occurrence = (seen[name] ?? 0) + 1;
+    seen[name] = occurrence;
+    params[name] = value;
+    if (totals[name]! > 1) {
+      params[occurrenceKey(name, occurrence)] = value;
+    }
+  });
+
+  return params;
+}
+
+export function extractRouteParams(
   pattern: string,
   path: string,
 ): Record<string, string> | null {
-  const regexPattern = pattern
-    .split("/")
-    .map((segment) => {
-      if (segment.startsWith(":")) {
-        return "([^/]+)";
-      }
-      return segment;
-    })
+  const segments = pattern.split("/");
+  const regexPattern = segments
+    .map((segment) => (segment.startsWith(":") ? "([^/]+)" : segment))
     .join("/");
 
-  const regex = new RegExp(`^${regexPattern}$`);
-  const match = path.match(regex);
-
+  const match = path.match(new RegExp(`^${regexPattern}$`));
   if (!match) return null;
 
-  const paramNames = pattern
-    .split("/")
+  const paramNames = segments
     .filter((segment) => segment.startsWith(":"))
     .map((segment) => segment.substring(1));
 
-  const params: Record<string, string> = {};
-  paramNames.forEach((name, index) => {
-    params[name] = match[index + 1]!;
-  });
-
-  return params;
+  return buildParamBag(paramNames, match.slice(1));
 }
 
 export const useSiteLayout = () => {

package/frontend-vue/layers/dms-ui/app/build/components/table/Table.vue

@@ -26,7 +26,10 @@ import type {
   CustomButton,
   TableViewDisplayCapabilities,
 } from "../../../composables/table-view/types";
-import type { FormContainer } from "../../composables/table-view/useTableViewConfig";
+import type {
+  FormContainer,
+  FormPageUrls,
+} from "../../composables/table-view/useTableViewConfig";
 import type { CustomRowAction } from "../../../types/row-action";
 import type { RowActionConfig } from "#dms-core/app/types/row-action";
 import type { TableTabItem } from "./Tabs.vue";
@@ -97,6 +100,8 @@ export interface TableProps<T> {
   onCustomRowAction?: (action: CustomRowAction, rowData: T) => void;
   componentId?: string;
   formContainer?: FormContainer;
+  formPages?: FormPageUrls;
+  routeParams?: Record<string, string>;
   defaultSort?: { field: string; desc?: boolean };
   initialColumnVisibility?: VisibilityState;
   presenceByRow?: TableRowPresenceMap;

package/frontend-vue/layers/dms-ui/app/build/composables/table/useTable.ts

@@ -92,6 +92,8 @@ export const useTable = <T extends Data>(props: UseTableProps<T>) => {
     ui: props.ui,
     componentId: props.tableProps.componentId,
     formContainer: props.tableProps.formContainer,
+    formPages: props.tableProps.formPages,
+    routeParams: props.tableProps.routeParams,
     onCustomRowAction: props.tableProps.onCustomRowAction,
   });
 

package/frontend-vue/layers/dms-ui/app/build/composables/table/useTableColumns.ts

@@ -28,7 +28,11 @@ import {
   FormContainerType,
   DEFAULT_FORM_CONTAINER_TYPE,
 } from "../table-view/types";
-import type { FormContainer } from "../table-view/useTableViewConfig";
+import {
+  fillFormPageUrl,
+  type FormContainer,
+  type FormPageUrls,
+} from "../table-view/useTableViewConfig";
 import type { DmsAppConfig } from "#dms-core/shared/types/app-config";
 
 const SORT_DIRECTION_ICON: Record<SortDirection, string> = {
@@ -84,6 +88,8 @@ interface ColumnConfig<T> {
   ui: ComputedRef<TableStyleSlots>;
   componentId?: string;
   formContainer?: FormContainer;
+  formPages?: FormPageUrls;
+  routeParams?: Record<string, string>;
   onCustomRowAction?: (action: CustomRowAction, rowData: T) => void;
 }
 
@@ -353,13 +359,13 @@ export const useTableColumns = <T extends Data>(config: ColumnConfig<T>) => {
 
     const containerType =
       config.formContainer?.type ?? DEFAULT_FORM_CONTAINER_TYPE;
-    if (containerType === FormContainerType.page) {
+    const viewPageUrl =
+      containerType === FormContainerType.page
+        ? config.formPages?.view
+        : undefined;
+    if (viewPageUrl) {
       const itemId = get(rowData, config.rowIdKey);
-      const viewSlug =
-        config.formContainer?.pages?.view?.urlSlug ||
-        `${currentRoute.path}/${itemId}/view`;
-      const viewUrl = viewSlug.replace(":id", itemId);
-      itemUrl = `${window.location.origin}${viewUrl}`;
+      itemUrl = `${window.location.origin}${fillFormPageUrl(viewPageUrl, config.routeParams, itemId)}`;
     } else {
       const updatedQuery = {
         ...currentRoute.query,

package/frontend-vue/layers/dms-ui/app/build/composables/table-view/registerDefaultFunctions.ts

@@ -1,32 +1,61 @@
 import type { LocationQueryValue } from "#dms/frontend-module";
+import { replaceUrlVariables } from "../../../composables/form/useForm";
+
+type RouteQuery = Record<string, LocationQueryValue | LocationQueryValue[]>;
+
+export interface FormSuccessParams {
+  url: string;
+  preserveQuery?: string[];
+}
+
+export interface FormSuccessRoute {
+  query: RouteQuery;
+  params?: Record<string, string>;
+}
+
+/**
+ * Where a page-mode form sends the user on submit: the page carrying the table
+ * view. Its URL holds a `{{params.X}}` token per placeholder of that page's
+ * slug, resolved against the parameters of the form route being left, the way
+ * `redirectOnSuccess` is.
+ */
+export function resolveFormSuccessTarget(
+  { url, preserveQuery }: FormSuccessParams,
+  route: FormSuccessRoute,
+): { path: string; query?: RouteQuery } {
+  const path = replaceUrlVariables(url, {
+    routeParams: route.params,
+    routeQuery: route.query,
+  });
+
+  // Restore the filtered table view: carry back the query params the form
+  // was opened with (those declared in `queryParamFilters`).
+  const query: RouteQuery = {};
+  for (const key of preserveQuery ?? []) {
+    if (route.query[key] !== undefined) {
+      query[key] = route.query[key];
+    }
+  }
+
+  return { path, ...(Object.keys(query).length > 0 ? { query } : {}) };
+}
 
 export function registerDefaultFunctions() {
   const { registerFunction } = useDefinedFunctions();
   const route = useDmsRoute();
+  const { findMatchingRoute } = useSiteLayout();
 
   registerFunction(
     TableViewFunctions.CUSTOM_PAGE_FORM_SUCCESS,
     (event: CustomEvent) => {
-      const { url, preserveQuery } = (
-        event as CustomEvent & {
-          params: { url: string; preserveQuery?: string[] };
-        }
-      ).params;
-
-      // Restore the filtered table view: carry back the query params the form
-      // was opened with (those declared in `queryParamFilters`).
-      const query: Record<string, LocationQueryValue | LocationQueryValue[]> =
-        {};
-      for (const key of preserveQuery ?? []) {
-        if (route.query[key] !== undefined) {
-          query[key] = route.query[key];
-        }
-      }
-
-      navigateDms({
-        path: url,
-        ...(Object.keys(query).length > 0 ? { query } : {}),
-      });
+      const { params } = event as CustomEvent & { params: FormSuccessParams };
+
+      navigateDms(
+        resolveFormSuccessTarget(params, {
+          query: route.query,
+          params: findMatchingRoute(route.path)?.params,
+        }),
+      );
     },
   );
 }