cabloy 5.1.168 → 5.1.170

package/zova/src/suite-vendor/a-zova/modules/a-table/src/types/tableLayout.ts

@@ -0,0 +1,101 @@
+import type { ISchemaObjectExtensionField } from 'zova-module-a-openapi';
+
+import { TableColumnIdSelection } from './table.js';
+
+export type TypeTableLayoutWidth = number | 'auto';
+
+export interface ITableLayoutColumn {
+  key: string;
+  visible: boolean;
+  width: TypeTableLayoutWidth;
+}
+
+export interface ITableLayout {
+  version: 1;
+  schemaFingerprint?: string;
+  columns: ITableLayoutColumn[];
+}
+
+export interface ITableLayoutProfileLike {
+  version?: unknown;
+  schemaFingerprint?: unknown;
+  columns?: unknown;
+}
+
+function isWidth(value: unknown): value is TypeTableLayoutWidth {
+  return (
+    value === 'auto' ||
+    (typeof value === 'number' && Number.isInteger(value) && value >= 1 && value <= 2000)
+  );
+}
+
+/**
+ * Reconciles a persisted layout with the currently eligible schema columns.
+ * Schema visibility and fixed regions always remain authoritative.
+ */
+export function reconcileTableLayout(
+  properties: readonly ISchemaObjectExtensionField[],
+  profile?: ITableLayoutProfileLike | ITableLayout,
+): ITableLayout {
+  const entries = new Map<string, ITableLayoutColumn>();
+  const profileColumns = Array.isArray(profile?.columns) ? profile.columns : [];
+  for (const item of profileColumns) {
+    if (!item || typeof item !== 'object') continue;
+    const column = item as Record<string, unknown>;
+    const key = typeof column.key === 'string' ? column.key.trim() : '';
+    if (!key || entries.has(key)) continue;
+    if (typeof column.visible !== 'boolean' || !isWidth(column.width)) continue;
+    entries.set(key, { key, visible: column.visible, width: column.width });
+  }
+
+  const eligible = properties.filter(
+    property =>
+      typeof property.key === 'string' && property.key && property.key !== TableColumnIdSelection,
+  );
+  const schemaKeys = new Set(eligible.map(property => property.key!));
+  const regions = new Map<'left' | 'center' | 'right', ISchemaObjectExtensionField[]>();
+  regions.set('left', []);
+  regions.set('center', []);
+  regions.set('right', []);
+  for (const property of eligible) {
+    const fixed = property.rest?.fixed;
+    regions.get(fixed === 'left' ? 'left' : fixed === 'right' ? 'right' : 'center')!.push(property);
+  }
+
+  const result: ITableLayoutColumn[] = [];
+  for (const region of ['left', 'center', 'right'] as const) {
+    const regionProperties = regions.get(region)!;
+    const regionKeys = new Set(regionProperties.map(property => property.key!));
+    const ordered = profileColumns
+      .map(item =>
+        item && typeof item === 'object' ? (item as Record<string, unknown>) : undefined,
+      )
+      .filter(item => {
+        const key = typeof item?.key === 'string' ? item.key.trim() : '';
+        return !!key && regionKeys.has(key) && schemaKeys.has(key) && entries.get(key)?.key === key;
+      })
+      .map(item => item!.key as string);
+    const seen = new Set<string>();
+    for (const key of [...ordered, ...regionProperties.map(property => property.key!)]) {
+      if (seen.has(key)) continue;
+      seen.add(key);
+      const property = regionProperties.find(item => item.key === key)!;
+      const entry = entries.get(key);
+      const schemaWidth = property.rest?.width;
+      result.push({
+        key,
+        visible: entry?.visible ?? true,
+        width:
+          entry?.width ??
+          (typeof schemaWidth === 'number' && schemaWidth > 0 ? schemaWidth : 'auto'),
+      });
+    }
+  }
+  return {
+    version: 1,
+    ...(typeof profile?.schemaFingerprint === 'string'
+      ? { schemaFingerprint: profile.schemaFingerprint }
+      : {}),
+    columns: result,
+  };
+}

package/zova/src/suite-vendor/a-zova/modules/a-table/test/lib/tableLayout.test.ts

@@ -0,0 +1,112 @@
+import type { ISchemaObjectExtensionField } from 'zova-module-a-openapi';
+
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { TableColumnIdSelection } from '../../src/types/table.js';
+import { reconcileTableLayout } from '../../src/types/tableLayout.js';
+
+function createProperties(...properties: ISchemaObjectExtensionField[]) {
+  return properties;
+}
+
+test('table layout drops stale and malformed profile columns while preserving schema defaults', () => {
+  const layout = reconcileTableLayout(
+    createProperties(
+      { key: 'id', type: 'number', rest: { width: 60, fixed: 'left' } },
+      { key: 'name', type: 'string' },
+      { key: 'level', type: 'string', rest: { width: 120 } },
+      { key: 'operations', type: 'string', rest: { width: 360, fixed: 'right' } },
+    ),
+    {
+      version: 1,
+      schemaFingerprint: 'student-v1',
+      columns: [
+        { key: 'name', visible: false, width: 480 },
+        { key: 'obsolete', visible: true, width: 80 },
+        { key: 'level', visible: true, width: 0 },
+        { key: 'operations', visible: true, width: 'auto' },
+        { key: '', visible: false, width: 90 },
+      ],
+    },
+  );
+
+  assert.deepEqual(layout, {
+    version: 1,
+    schemaFingerprint: 'student-v1',
+    columns: [
+      { key: 'id', visible: true, width: 60 },
+      { key: 'name', visible: false, width: 480 },
+      { key: 'level', visible: true, width: 120 },
+      { key: 'operations', visible: true, width: 'auto' },
+    ],
+  });
+});
+
+test('table layout retains the first valid duplicate and appends new schema fields', () => {
+  const layout = reconcileTableLayout(
+    createProperties(
+      { key: 'name', type: 'string' },
+      { key: 'level', type: 'string' },
+      { key: 'createdAt', type: 'string', rest: { width: 180 } },
+    ),
+    {
+      columns: [
+        { key: 'level', visible: false, width: 240 },
+        { key: 'name', visible: true, width: 'auto' },
+        { key: 'level', visible: true, width: 300 },
+      ],
+    },
+  );
+
+  assert.deepEqual(layout.columns, [
+    { key: 'level', visible: false, width: 240 },
+    { key: 'name', visible: true, width: 'auto' },
+    { key: 'createdAt', visible: true, width: 180 },
+  ]);
+});
+
+test('table layout permits ordering only within schema fixed regions', () => {
+  const layout = reconcileTableLayout(
+    createProperties(
+      { key: 'leftFirst', type: 'string', rest: { fixed: 'left' } },
+      { key: 'leftSecond', type: 'string', rest: { fixed: 'left' } },
+      { key: 'centerFirst', type: 'string' },
+      { key: 'centerSecond', type: 'string' },
+      { key: 'rightFirst', type: 'string', rest: { fixed: 'right' } },
+      { key: 'rightSecond', type: 'string', rest: { fixed: 'right' } },
+    ),
+    {
+      columns: [
+        { key: 'rightSecond', visible: true, width: 'auto' },
+        { key: 'centerSecond', visible: true, width: 'auto' },
+        { key: 'leftSecond', visible: true, width: 'auto' },
+        { key: 'rightFirst', visible: true, width: 'auto' },
+        { key: 'centerFirst', visible: true, width: 'auto' },
+        { key: 'leftFirst', visible: true, width: 'auto' },
+      ],
+    },
+  );
+
+  assert.deepEqual(
+    layout.columns.map(column => column.key),
+    ['leftSecond', 'leftFirst', 'centerSecond', 'centerFirst', 'rightSecond', 'rightFirst'],
+  );
+});
+
+test('table layout excludes synthetic selection state from persistence', () => {
+  const layout = reconcileTableLayout(
+    createProperties(
+      { key: TableColumnIdSelection, type: 'boolean' },
+      { key: 'name', type: 'string' },
+    ),
+    {
+      columns: [
+        { key: TableColumnIdSelection, visible: false, width: 40 },
+        { key: 'name', visible: true, width: 'auto' },
+      ],
+    },
+  );
+
+  assert.deepEqual(layout.columns, [{ key: 'name', visible: true, width: 'auto' }]);
+});

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.159",
+  "version": "5.1.161",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "dependencies": {
     "zova-module-a-api": "^5.1.22",
     "zova-module-a-app": "^5.1.26",
-    "zova-module-a-bean": "^5.1.34",
+    "zova-module-a-bean": "^5.1.35",
     "zova-module-a-behavior": "^5.1.26",
     "zova-module-a-behaviors": "^5.1.22",
     "zova-module-a-boundary": "^5.1.22",
@@ -22,15 +22,15 @@
     "zova-module-a-logger": "^5.1.28",
     "zova-module-a-meta": "^5.1.22",
     "zova-module-a-model": "^5.1.36",
-    "zova-module-a-openapi": "^5.1.53",
-    "zova-module-a-router": "^5.1.36",
-    "zova-module-a-routerstack": "^5.1.28",
+    "zova-module-a-openapi": "^5.1.54",
+    "zova-module-a-router": "^5.1.37",
+    "zova-module-a-routerstack": "^5.1.29",
     "zova-module-a-routertabs": "^5.1.34",
-    "zova-module-a-ssr": "^5.1.38",
+    "zova-module-a-ssr": "^5.1.39",
     "zova-module-a-ssrhmr": "^5.1.23",
     "zova-module-a-ssrserver": "^5.1.26",
     "zova-module-a-style": "^5.1.35",
-    "zova-module-a-table": "^5.1.41",
+    "zova-module-a-table": "^5.1.43",
     "zova-module-a-zod": "^5.1.37",
     "zova-module-a-zova": "^5.1.104"
   },