@ketvietlab/ketsuite 0.1.25 → 0.1.29

package/dist/modules/user_backend/search.d.ts

@@ -0,0 +1,128 @@
+export declare const userListSearch: {
+    key: string;
+    searchable: {
+        key: string;
+    }[];
+    filterable: ({
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "text";
+    } | {
+        key: string;
+        label: string;
+        type: "selection";
+        choices: readonly ["internal", "portal", "public"];
+    } | {
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "boolean";
+    })[];
+    groupable: {
+        key: string;
+        label: string;
+    }[];
+    sortable: {
+        key: string;
+        label: string;
+    }[];
+    presets: {
+        key: string;
+        label: string;
+        group: string;
+        match: (row: import("../backend/row-list.ts").AnyRow) => boolean;
+    }[];
+    defaultSort: {
+        key: string;
+        dir: "asc";
+    }[];
+};
+export declare const roleListSearch: {
+    key: string;
+    searchable: {
+        key: string;
+    }[];
+    filterable: ({
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "text";
+    } | {
+        key: string;
+        label: string;
+        type: "selection";
+        choices: readonly ["managed", "custom"];
+    } | {
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "number";
+    })[];
+    groupable: {
+        key: string;
+        label: string;
+    }[];
+    sortable: {
+        key: string;
+        label: string;
+    }[];
+    presets: {
+        key: string;
+        label: string;
+        group: string;
+        match: (row: import("../backend/row-list.ts").AnyRow) => boolean;
+    }[];
+    defaultSort: {
+        key: string;
+        dir: "asc";
+    }[];
+};
+/** The access rules collection, which states who a rule matches and whether it runs. */
+export declare const accessPolicyListSearch: {
+    key: string;
+    value: (row: import("../backend/row-list.ts").AnyRow, key: string) => unknown;
+    searchable: {
+        key: string;
+    }[];
+    filterable: ({
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "text";
+    } | {
+        key: string;
+        label: string;
+        type: "selection";
+        choices: readonly ["idpGroup", "department", "jobTitle"];
+    } | {
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "number";
+    } | {
+        choices?: undefined;
+        key: string;
+        label: string;
+        type: "boolean";
+    })[];
+    groupable: {
+        key: string;
+        label: string;
+    }[];
+    sortable: {
+        key: string;
+        label: string;
+    }[];
+    presets: {
+        key: string;
+        label: string;
+        group: string;
+        match: (row: import("../backend/row-list.ts").AnyRow) => boolean;
+    }[];
+    defaultSort: {
+        key: string;
+        dir: "asc";
+    }[];
+};
+//# sourceMappingURL=search.d.ts.map

package/dist/modules/user_backend/search.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../../packages/ketsuite/src/modules/user_backend/search.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCzB,CAAA;AAIF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqCzB,CAAA;AAIF,wFAAwF;AACxF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCjC,CAAA"}

package/dist/modules/user_backend/search.js

@@ -0,0 +1,131 @@
+// What the search-filter bar offers on the identity lists.
+//
+// Both lists read a bounded collection the route already holds, so each spec
+// covers exactly the columns its table renders. People declare `active`, which
+// is what gives the bar its archived toggle; the same `?archived=1` also tells
+// `user.listUsers` to include archived accounts, so the toggle stays one
+// control over one URL.
+import { defineRowList } from '../backend/row-list.js';
+const ACCESS_KINDS = ['internal', 'portal', 'public'];
+export const userListSearch = defineRowList({
+    key: 'user.users',
+    searchable: [{ key: 'name' }, { key: 'login' }, { key: 'email' }, { key: 'accessKind' }],
+    filterable: [
+        { key: 'name', label: 'user_backend.field.name', type: 'text' },
+        { key: 'login', label: 'user_backend.field.login', type: 'text' },
+        { key: 'email', label: 'user_backend.field.email', type: 'text' },
+        {
+            key: 'accessKind',
+            label: 'user_backend.field.accessKind',
+            type: 'selection',
+            choices: ACCESS_KINDS,
+        },
+        { key: 'passwordReady', label: 'user_backend.field.credential', type: 'boolean' },
+        { key: 'active', label: 'user_backend.field.state', type: 'boolean' },
+    ],
+    groupable: [
+        { key: 'accessKind', label: 'user_backend.field.accessKind' },
+        { key: 'passwordReady', label: 'user_backend.field.credential' },
+    ],
+    sortable: [
+        { key: 'name', label: 'user_backend.field.name' },
+        { key: 'login', label: 'user_backend.field.login' },
+    ],
+    presets: [
+        ...ACCESS_KINDS.map((kind) => ({
+            key: kind,
+            label: `user_backend.access.${kind}`,
+            group: 'accessKind',
+            match: (row) => row.accessKind === kind,
+        })),
+        {
+            key: 'invitationPending',
+            label: 'user_backend.state.invitationPending',
+            group: 'credential',
+            match: (row) => row.passwordReady !== true,
+        },
+    ],
+    defaultSort: [{ key: 'name', dir: 'asc' }],
+});
+const ROLE_MODES = ['managed', 'custom'];
+export const roleListSearch = defineRowList({
+    key: 'user.roles',
+    searchable: [{ key: 'name' }, { key: 'description' }, { key: 'mode' }],
+    filterable: [
+        { key: 'name', label: 'user_backend.field.name', type: 'text' },
+        { key: 'description', label: 'user_backend.field.description', type: 'text' },
+        { key: 'mode', label: 'user_backend.field.roleMode', type: 'selection', choices: ROLE_MODES },
+        { key: 'assignmentCount', label: 'user_backend.access.assignments', type: 'number' },
+    ],
+    groupable: [{ key: 'mode', label: 'user_backend.field.roleMode' }],
+    sortable: [
+        { key: 'name', label: 'user_backend.field.name' },
+        { key: 'assignmentCount', label: 'user_backend.access.assignments' },
+    ],
+    presets: [
+        ...ROLE_MODES.map((mode) => ({
+            key: mode,
+            label: `user_backend.role.${mode}`,
+            group: 'mode',
+            match: (row) => (row.mode ?? 'custom') === mode,
+        })),
+        {
+            // The list exists to answer which roles need attention, so its health
+            // column is a filter of its own.
+            key: 'unhealthy',
+            label: 'user_backend.access.health',
+            group: 'health',
+            match: (row) => (row.healthIssues?.length ?? 0) > 0,
+        },
+        {
+            key: 'unassigned',
+            label: 'user_backend.filter.unassigned',
+            group: 'health',
+            match: (row) => Number(row.assignmentCount ?? 0) === 0,
+        },
+    ],
+    defaultSort: [{ key: 'name', dir: 'asc' }],
+});
+const POLICY_MATCH_KINDS = ['idpGroup', 'department', 'jobTitle'];
+/** The access rules collection, which states who a rule matches and whether it runs. */
+export const accessPolicyListSearch = defineRowList({
+    key: 'user.access-policies',
+    // A row carries its match as one object; the bar reads its two halves.
+    value: (row, key) => {
+        const match = row.match;
+        return key === 'matchKind' ? match?.kind : key === 'matchValue' ? match?.value : row[key];
+    },
+    searchable: [{ key: 'name' }, { key: 'matchValue' }],
+    filterable: [
+        { key: 'name', label: 'user_backend.field.name', type: 'text' },
+        {
+            key: 'matchKind',
+            label: 'user_backend.policy.matchKind',
+            type: 'selection',
+            choices: POLICY_MATCH_KINDS,
+        },
+        { key: 'memberCount', label: 'user_backend.policy.membersColumn', type: 'number' },
+        { key: 'active', label: 'user_backend.field.state', type: 'boolean' },
+    ],
+    groupable: [{ key: 'matchKind', label: 'user_backend.policy.matchKind' }],
+    sortable: [
+        { key: 'name', label: 'user_backend.field.name' },
+        { key: 'memberCount', label: 'user_backend.policy.membersColumn' },
+    ],
+    presets: [
+        ...POLICY_MATCH_KINDS.map((kind) => ({
+            key: kind,
+            label: `user_backend.policy.match.${kind}`,
+            group: 'matchKind',
+            match: (row) => row.match?.kind === kind,
+        })),
+        {
+            key: 'paused',
+            label: 'user_backend.policy.paused',
+            group: 'state',
+            match: (row) => row.active === false,
+        },
+    ],
+    defaultSort: [{ key: 'name', dir: 'asc' }],
+});
+//# sourceMappingURL=search.js.map

package/dist/modules/user_backend/search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../../../../packages/ketsuite/src/modules/user_backend/search.ts"],"names":[],"mappings":"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"}

package/dist/modules/website/cms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cms.d.ts","sourceRoot":"","sources":["../../../../../../packages/ketsuite/src/modules/website/cms.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAO,MAAM,EAA8B,GAAG,EAAE,MAAM,mBAAmB,CAAA;AA0FrF;;;;;;;GAOG;AACH;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,YAAI,iBAAiB,EAAE,WAAW,EAAE,SAAS,CAAU,CAAA;AAiBtF,eAAO,MAAM,UAAU,QAAS,GAAG,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAsC,CAAA;AA+NlG,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CA68C/C,CAAA"}
+{"version":3,"file":"cms.d.ts","sourceRoot":"","sources":["../../../../../../packages/ketsuite/src/modules/website/cms.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAO,MAAM,EAA8B,GAAG,EAAE,MAAM,mBAAmB,CAAA;AA4FrF;;;;;;;GAOG;AACH;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,YAAI,iBAAiB,EAAE,WAAW,EAAE,SAAS,CAAU,CAAA;AAiBtF,eAAO,MAAM,UAAU,QAAS,GAAG,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAsC,CAAA;AAkOlG,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAy9C/C,CAAA"}

package/dist/modules/website/cms.js

@@ -62,9 +62,11 @@ const cleanPath = (value) => {
 };
 const digest = (token) => createHash('sha256').update(token).digest('hex');
 const invalid = (field, message) => ({ ok: false, errors: [{ field, message }] });
+// Keep offsets exact: clamping a large offset repeats an earlier page and can
+// make a caller collecting pages report duplicated rows as a complete total.
 const page = (limit, offset, defaultLimit = 50) => ({
     limit: Math.min(Math.max(Number.isInteger(limit) ? Number(limit) : defaultLimit, 1), 100),
-    offset: Math.min(Math.max(Number.isInteger(offset) ? Number(offset) : 0, 0), 100_000),
+    offset: Math.max(Number.isSafeInteger(offset) ? Number(offset) : 0, 0),
 });
 const jsonBytes = (value) => {
     try {
@@ -298,7 +300,10 @@ const conflictReport = async (ctx, expectedRevisionId, headRevisionId) => {
 };
 const latestRevisionOf = async (ctx, entryId) => {
     const Revision = ctx.table('website.EntryRevision');
-    return ctx.db.one(from(Revision).where(eq(Revision.entryId, entryId)).orderBy(desc(Revision.version)).limit(1));
+    return ctx.db.one(from(Revision)
+        .where(eq(Revision.entryId, entryId))
+        .orderBy(desc(Revision.version), asc(Revision.id))
+        .limit(1));
 };
 export const cmsFunctions = {
     resolveSite: defineFn({
@@ -1140,8 +1145,9 @@ export const cmsFunctions = {
             const Revision = ctx.table('website.EntryRevision');
             const paging = page(args.limit, args.offset);
             return ctx.db.all(from(Revision)
+                .select(Revision.id, Revision.entryId, Revision.version, Revision.kind, Revision.authorId, Revision.createdAt)
                 .where(eq(Revision.entryId, args.entryId))
-                .orderBy(desc(Revision.version))
+                .orderBy(desc(Revision.version), asc(Revision.id))
                 .limit(paging.limit)
                 .offset(paging.offset));
         },
@@ -1379,7 +1385,9 @@ export const cmsFunctions = {
                 return [];
             const Term = ctx.table('website.TaxonomyTerm');
             const paging = page(args.limit, args.offset, 100);
-            let query = from(Term).where(eq(Term.siteId, args.siteId)).orderBy(asc(Term.taxonomy), asc(Term.name));
+            let query = from(Term)
+                .where(eq(Term.siteId, args.siteId))
+                .orderBy(asc(Term.taxonomy), asc(Term.name), asc(Term.id));
             if (args.taxonomy)
                 query = query.where(eq(Term.taxonomy, args.taxonomy));
             return ctx.db.all(query.limit(paging.limit).offset(paging.offset));
@@ -1534,7 +1542,7 @@ export const cmsFunctions = {
             const Term = ctx.table('website.TaxonomyTerm');
             const terms = await ctx.db.all(from(Term)
                 .where(inArray(Term.id, assignments.map((row) => row.termId)))
-                .orderBy(asc(Term.taxonomy), asc(Term.name)));
+                .orderBy(asc(Term.taxonomy), asc(Term.name), asc(Term.id)));
             const byId = new Map(terms.map((term) => [term.id, term]));
             // The assignment's own id, because that is what unassignTerm is given
             // and what a remove button has to carry.
@@ -1707,7 +1715,7 @@ export const cmsFunctions = {
             const paging = page(args.limit, args.offset, 100);
             return ctx.db.all(from(Media)
                 .where(eq(Media.siteId, args.siteId))
-                .orderBy(asc(Media.attachmentId))
+                .orderBy(asc(Media.attachmentId), asc(Media.id))
                 .limit(paging.limit)
                 .offset(paging.offset));
         },
@@ -1771,7 +1779,9 @@ export const cmsFunctions = {
                 return [];
             const Redirect = ctx.table('website.Redirect');
             const paging = page(args.limit, args.offset, 100);
-            let query = from(Redirect).where(eq(Redirect.siteId, args.siteId)).orderBy(asc(Redirect.fromPath));
+            let query = from(Redirect)
+                .where(eq(Redirect.siteId, args.siteId))
+                .orderBy(asc(Redirect.fromPath), asc(Redirect.id));
             if (args.active != null)
                 query = query.where(eq(Redirect.active, args.active));
             return ctx.db.all(query.limit(paging.limit).offset(paging.offset));