cabloy 5.1.168 → 5.1.169

package/.cabloy-version

@@ -1 +1 @@
-5.1.168
+5.1.169

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 5.1.169
+
+### Features
+
+- Add a resource picker.
+
 ## 5.1.168
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.168",
+  "version": "5.1.169",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/vona/pnpm-lock.yaml

@@ -567,8 +567,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.159
-        version: 5.1.159(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3))
+        specifier: ^5.1.160
+        version: 5.1.160(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.89
         version: 1.1.89(typescript@5.9.3)
@@ -576,8 +576,8 @@ importers:
         specifier: ^5.1.22
         version: 5.1.22
       zova-module-a-bean:
-        specifier: ^5.1.33
-        version: 5.1.33
+        specifier: ^5.1.34
+        version: 5.1.34
       zova-module-a-behavior:
         specifier: ^5.1.26
         version: 5.1.26
@@ -603,8 +603,8 @@ importers:
         specifier: ^5.0.7
         version: 5.0.7
       zova-module-a-router:
-        specifier: ^5.1.35
-        version: 5.1.35
+        specifier: ^5.1.36
+        version: 5.1.36
       zova-module-a-routertabs:
         specifier: ^5.1.34
         version: 5.1.34
@@ -615,14 +615,14 @@ importers:
         specifier: ^5.1.35
         version: 5.1.35
       zova-module-a-table:
-        specifier: ^5.1.40
-        version: 5.1.40(vue@3.5.42(typescript@5.9.3))
+        specifier: ^5.1.41
+        version: 5.1.41(vue@3.5.42(typescript@5.9.3))
       zova-module-pay-mock:
         specifier: ^5.0.5
         version: 5.0.5
       zova-module-rest-resource:
-        specifier: ^5.1.52
-        version: 5.1.52
+        specifier: ^5.1.53
+        version: 5.1.53
 
   .zova-rest/cabloy-basic-web:
     dependencies:
@@ -9011,6 +9011,9 @@ packages:
   zova-module-a-bean@5.1.33:
     resolution: {integrity: sha512-GuBrUTDP5IAxHq2+bEBkDMOkgbtdiKI0IqvDnN/ipsxjqOlJMYTth8CzmRySLEc89DLk0369+uayWqywIpx61g==}
 
+  zova-module-a-bean@5.1.34:
+    resolution: {integrity: sha512-+HIOCNuaVfdCAxtdgiwc5XLWIG07G/z3gGGVuwosL3SZRSTdQBeoz08fGXvQ23ylZQe2HBBu7qNZJ4XKRg0Jcw==}
+
   zova-module-a-behavior@5.1.26:
     resolution: {integrity: sha512-gvsonG3yIwH6mcEW/NNyaw9LCJK7WjKAW3pDYkhH+kipOe3TLPgmCQFz2FM0UZIwtopbRsR12exs7Sx26QqnAg==}
 
@@ -9062,9 +9065,15 @@ packages:
   zova-module-a-router@5.1.35:
     resolution: {integrity: sha512-uFHIXS1mEtYGqn8rsUxPXw20J1eZ60Me9irerpsr2v6tPLCC0E8QspeIXTzOO7jpnO660iuZYLGcIMp8GPh5Gw==}
 
+  zova-module-a-router@5.1.36:
+    resolution: {integrity: sha512-uVU4IECn7uPCVskHdle9J4bA/oMthCE/Uvnkm1zh102GIlfLojiPYIK9oDRGEI9kBD5bfZWtBz9wcbWfNf7DzA==}
+
   zova-module-a-routerstack@5.1.27:
     resolution: {integrity: sha512-mSL3IPbk8IDXnfkXwljh8gmi+i7u2yuSmxLdDzGTJL9AFLKmdBYPnMh+pstLzKUPxaADPsfLKikJ35w0H8DSrQ==}
 
+  zova-module-a-routerstack@5.1.28:
+    resolution: {integrity: sha512-fDAxZ0460L+A4VHCTUCQTZ7DuEDYoaOe+OHErEL1iF6GaMvcos4dCHxWqjuqUlMXnjj/fSRrfF/g9iFrAkssoQ==}
+
   zova-module-a-routertabs@5.1.34:
     resolution: {integrity: sha512-j8QS0bxpfQJidh/wUsA1N2FXhckoi5qq01nm2uKCY1CHLEFA19sccP41v6JjrN5N3sw90a3YTaMjbezO5bS9Lg==}
 
@@ -9086,6 +9095,9 @@ packages:
   zova-module-a-table@5.1.40:
     resolution: {integrity: sha512-R/vVUMVYt6lEno45fMfwyy+luQz+l0e2er9IfvorSlZ55kgnZOZj5lXGUCiYYBPgPwxJz3p42hHr7HZZpVu9sQ==}
 
+  zova-module-a-table@5.1.41:
+    resolution: {integrity: sha512-WWw51E+9TVLf1yx5BkW/98WrloxzpCbYugJuHp1BgNzIrjzxRYc8MKbuq/jgSkzVZev55SB2f+lU2J4aZQjBIA==}
+
   zova-module-a-zod@5.1.37:
     resolution: {integrity: sha512-rXHN9rKbum9w3gDSnC/pIusG2d2FGJOcIauf8jrbT96f+Olk4Q3iV3t2V92mxiLCh9kMvBJPfcOgJFW7pRB5Fw==}
 
@@ -9104,8 +9116,8 @@ packages:
   zova-module-rest-resource@5.1.51:
     resolution: {integrity: sha512-rZy8oaQvtcXmqepkE+OWsXt0MUbBuL+NdY099FuG1eYrtl/nB5WMyvmtFVF5d5NRaz6q+otysFuyo8Q93aHfwA==}
 
-  zova-module-rest-resource@5.1.52:
-    resolution: {integrity: sha512-qQAPo/qsuz3ZkUV4x6NspnAvgJKfaoQb4TH/dWHHwcSWRcrra+0JdFYeSoXIDAtbYlFFBMi2jOq+S5qfVGYQQA==}
+  zova-module-rest-resource@5.1.53:
+    resolution: {integrity: sha512-hrxfwTOjcWdC2SeF01V3N4Nmo/tqv202A9kCJ4Z4fnoeRCsbMooD4cSyKjKFfCot2DQOtpEmKLE4l2r3V3DDfQ==}
 
   zova-suite-a-zova@5.1.155:
     resolution: {integrity: sha512-w4+mlwOJ3DF+Bl9N1hkZBbgNW0UouP3/Xaw8PtiNEpmmr/ScWj+/+l85RTr/q9F+Qw/hjDCWTLwy4GBukTiBag==}
@@ -9113,8 +9125,8 @@ packages:
   zova-suite-a-zova@5.1.157:
     resolution: {integrity: sha512-oMJHt3stq27tHnOMC8t3w0+QFoipL+wnc1tkhOi6q1MP3hz4g7S8aOSEvNA/3SAiI+Bq+wpeoSVqt/2ze4zVGw==}
 
-  zova-suite-a-zova@5.1.158:
-    resolution: {integrity: sha512-QBYPzzZl6PAASrTESQ+iNdCGJIhVKshgUWKElEDrs8K1EV+Ws+blobR+IAz55fRI5mttes4eA/qkDY/Ky7I+dA==}
+  zova-suite-a-zova@5.1.159:
+    resolution: {integrity: sha512-esr/oC88vxBCjYuD9DmeF+Qcr3F6czxUbvSPxCaChPnS2tHo5LjlPilTecwUOfvpD6FNEKNiZ2fh9Oi1ATxzWw==}
 
   zova@5.1.156:
     resolution: {integrity: sha512-LawJuQhiR+M+BdFkLYEz1wLz0zQa2IuZFAR0Vtq/dcNMX1Jus9g2iem/guNbavgeNP8aXRa+P4vCnaFynnWC/w==}
@@ -9122,8 +9134,8 @@ packages:
   zova@5.1.158:
     resolution: {integrity: sha512-lrsU/TlQvghdd3XRUuqeTIOsum7yv2Jm3NBeUqmcjixcDXxeAWRmH7i9g8MG+1Q8GJru6J6UYpD8mvxeTNKgcA==}
 
-  zova@5.1.159:
-    resolution: {integrity: sha512-0g4hrd9dNWzztQEfjgmHPTj4EUx7xulrkPZOo0uMMKmUCrQFP15TdjelKgr/H4S6+WpaLCtrg0D2+bPW1IhB6g==}
+  zova@5.1.160:
+    resolution: {integrity: sha512-WuyQiOVjNE7F6G3B2atcj5iJbU7M46NkmPvXIVnuwkv9hMsT6Edi01UZAEArcRva+niv04XKwTGHh2aWz5UiuQ==}
 
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
@@ -15561,6 +15573,10 @@ snapshots:
     dependencies:
       globby: 14.1.0
 
+  zova-module-a-bean@5.1.34:
+    dependencies:
+      globby: 14.1.0
+
   zova-module-a-behavior@5.1.26: {}
 
   zova-module-a-behaviors@5.1.22: {}
@@ -15646,8 +15662,12 @@ snapshots:
 
   zova-module-a-router@5.1.35: {}
 
+  zova-module-a-router@5.1.36: {}
+
   zova-module-a-routerstack@5.1.27: {}
 
+  zova-module-a-routerstack@5.1.28: {}
+
   zova-module-a-routertabs@5.1.34: {}
 
   zova-module-a-ssr@5.1.38:
@@ -15690,6 +15710,13 @@ snapshots:
     transitivePeerDependencies:
       - vue
 
+  zova-module-a-table@5.1.41(vue@3.5.42(typescript@5.9.3)):
+    dependencies:
+      '@tanstack/table-core': 8.21.3
+      '@tanstack/vue-table': 8.21.3(vue@3.5.42(typescript@5.9.3))
+    transitivePeerDependencies:
+      - vue
+
   zova-module-a-zod@5.1.37:
     dependencies:
       '@cabloy/zod-errors-custom': link:packages-utils/zod-errors-custom
@@ -15735,7 +15762,7 @@ snapshots:
 
   zova-module-rest-resource@5.1.51: {}
 
-  zova-module-rest-resource@5.1.52: {}
+  zova-module-rest-resource@5.1.53: {}
 
   zova-suite-a-zova@5.1.155(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
@@ -15754,7 +15781,7 @@ snapshots:
       zova-module-a-meta: 5.1.22
       zova-module-a-model: 5.1.36(vue@3.5.39(typescript@5.9.3))
       zova-module-a-openapi: 5.1.53
-      zova-module-a-router: 5.1.34
+      zova-module-a-router: 5.1.35
       zova-module-a-routerstack: 5.1.27
       zova-module-a-routertabs: 5.1.34
       zova-module-a-ssr: 5.1.38
@@ -15788,7 +15815,7 @@ snapshots:
       zova-module-a-meta: 5.1.22
       zova-module-a-model: 5.1.36(vue@3.5.42(typescript@5.9.3))
       zova-module-a-openapi: 5.1.53
-      zova-module-a-router: 5.1.34
+      zova-module-a-router: 5.1.35
       zova-module-a-routerstack: 5.1.27
       zova-module-a-routertabs: 5.1.34
       zova-module-a-ssr: 5.1.38
@@ -15805,11 +15832,11 @@ snapshots:
       - typescript
       - vue
 
-  zova-suite-a-zova@5.1.158(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.159(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.22
       zova-module-a-app: 5.1.26
-      zova-module-a-bean: 5.1.33
+      zova-module-a-bean: 5.1.34
       zova-module-a-behavior: 5.1.26
       zova-module-a-behaviors: 5.1.22
       zova-module-a-boundary: 5.1.22
@@ -15822,14 +15849,14 @@ snapshots:
       zova-module-a-meta: 5.1.22
       zova-module-a-model: 5.1.36(vue@3.5.42(typescript@5.9.3))
       zova-module-a-openapi: 5.1.53
-      zova-module-a-router: 5.1.35
-      zova-module-a-routerstack: 5.1.27
+      zova-module-a-router: 5.1.36
+      zova-module-a-routerstack: 5.1.28
       zova-module-a-routertabs: 5.1.34
       zova-module-a-ssr: 5.1.38
       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.40(vue@3.5.42(typescript@5.9.3))
+      zova-module-a-table: 5.1.41(vue@3.5.42(typescript@5.9.3))
       zova-module-a-zod: 5.1.37
       zova-module-a-zova: 5.1.104(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3))
     transitivePeerDependencies:
@@ -15861,10 +15888,10 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.159(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3)):
+  zova@5.1.160(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.89(patch_hash=144450bd7a567a6067e5857c0cf4c780981b7e90bc48745c09e1696a9b6f1b97)(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.158(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3))
+      zova-suite-a-zova: 5.1.159(typescript@5.9.3)(vue@3.5.42(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.160",
+  "version": "5.1.161",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.89",
-    "zova-suite-a-zova": "^5.1.159"
+    "zova-suite-a-zova": "^5.1.160"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/src/suite/cabloy-basic/modules/basic-app/src/component/routedDialog/controller.tsx

@@ -41,8 +41,10 @@ export class ControllerRoutedDialog extends BeanControllerBase {
     if (!this.$$modelStack) return <div class="loading loading-spinner"></div>;
     const router = item.state.router;
     if (!router) return <div class="text-error">Router unavailable</div>;
+    const pageHostProviders = item.options.createPageHostProviders?.(item.state.context);
     const vnode = h(ZRouterViewStack, {
       pageHostProviders: {
+        ...pageHostProviders,
         [routedDialogContextKey]: item.state.context,
       },
     });

package/zova/src/suite/cabloy-basic/modules/basic-app/src/types/appModal.ts

@@ -94,6 +94,9 @@ export interface IModalRoutedDialogOptions<
   title?: string;
   props?: TProps;
   session?: TSession;
+  createPageHostProviders?: (
+    context: IRoutedDialogContext<any, any, any>,
+  ) => Record<string, unknown>;
   onClose?: () => void;
 }
 

package/zova/src/suite/cabloy-basic/modules/basic-resource/src/component/formFieldResourcePicker/controller.tsx

@@ -18,6 +18,7 @@ import { ZFormField, ZFormFieldPreset } from 'zova-module-a-form';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { resolvePickerSelectionMax } from 'zova-module-basic-page';
 import { ZSelect, ZSelectProps } from 'zova-module-basic-select';
+import { resourcePickerPageHostKey } from 'zova-module-rest-resource';
 import { ModelResource } from 'zova-module-rest-resource';
 
 import type { TypeResourcePickerSelectionMode } from '../../lib/resourcePicker.js';
@@ -26,6 +27,7 @@ import {
   normalizeResourcePickerIds,
   resolveResourcePickerValue,
 } from '../../lib/resourcePicker.js';
+import { createResourcePickerPageHost } from '../../lib/resourcePickerPageHost.js';
 
 export type TypeResourcePickerMode = 'select' | 'routedDialog';
 
@@ -227,6 +229,9 @@ export class ControllerFormFieldResourcePicker extends BeanControllerBase {
         },
         props: options,
         session,
+        createPageHostProviders: dialog => ({
+          [resourcePickerPageHostKey]: createResourcePickerPageHost(dialog),
+        }),
       });
       const result = await handle.result;
       if (!result) return;

package/zova/src/suite/cabloy-basic/modules/basic-resource/src/lib/resourcePickerPageHost.ts

@@ -0,0 +1,64 @@
+import type {
+  IResourceBlockOptionsBase,
+  IResourceRenderBlockOptionsBlock,
+  IResourceTableSelectionPayload,
+} from 'zova-module-a-openapi';
+import type { IRoutedDialogContext } from 'zova-module-basic-app';
+import type {
+  IResourcePickerPageContext,
+  IResourcePickerPageHost,
+} from 'zova-module-rest-resource';
+
+import { deepExtend } from 'zova';
+
+export function createResourcePickerPageHost(
+  dialog: IRoutedDialogContext<
+    IResourceTableSelectionPayload,
+    IResourcePickerPageContext['options'],
+    IResourcePickerPageContext['session']
+  >,
+): IResourcePickerPageHost {
+  const options = dialog.props;
+  const session = dialog.session;
+  if (!options || !session) {
+    throw new Error('resource picker requires dialog options and session');
+  }
+  return {
+    options,
+    session,
+    resolve: selection => dialog.resolve(selection),
+    cancel: () => dialog.cancel(),
+    prepareBlocks: (blocks, pickerContext) => {
+      if (!blocks) return;
+      return blocks.map(block => {
+        if (block.render !== 'basic-page:blockPage') return block;
+        return {
+          ...block,
+          options: deepExtend({}, block.options, {
+            actionPath: pickerContext.options.actionPath,
+            queryFixed: pickerContext.options.query,
+            selectionPolicy: 'always',
+            selectionMode: pickerContext.options.selectionMode,
+            selectionMax: pickerContext.options.selectionMax,
+            selectedIds: pickerContext.session.selectedIds,
+            selectedRows: pickerContext.session.selectedRows,
+            onSelectionChange: (selection: IResourceTableSelectionPayload) => {
+              pickerContext.session.selectedIds = [...selection.ids];
+              pickerContext.session.selectedRows = selection.rows.map(row => ({ ...row }));
+            },
+            blocks: [
+              ...((
+                block.options as IResourceBlockOptionsBase & {
+                  blocks?: IResourceRenderBlockOptionsBlock[];
+                }
+              ).blocks ?? []),
+              {
+                render: 'basic-resource:blockResourcePickerActions',
+              },
+            ],
+          }),
+        };
+      });
+    },
+  };
+}

package/zova/src/suite/cabloy-basic/modules/basic-resource/test/lib/resourcePickerPageHost.test.ts

@@ -0,0 +1,94 @@
+import type { IResourceRenderBlockOptionsBlock } from 'zova-module-a-openapi';
+
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { createResourcePickerPageHost } from '../../src/lib/resourcePickerPageHost.ts';
+
+function createDialog() {
+  const resolved: unknown[] = [];
+  let cancelled = false;
+  const dialog = {
+    id: 1,
+    props: {
+      resource: 'training-student:student',
+      selectionMode: 'multiple' as const,
+      selectionMax: 2,
+    },
+    session: {
+      selectedIds: [1],
+      selectedRows: [{ id: 1, name: 'One' }],
+    },
+    resolve(value: unknown) {
+      resolved.push(value);
+    },
+    cancel() {
+      cancelled = true;
+    },
+  };
+  return {
+    dialog,
+    resolved,
+    get cancelled() {
+      return cancelled;
+    },
+  };
+}
+
+test('Basic picker host adapts only the Basic page block and preserves picker state', () => {
+  const { dialog } = createDialog();
+  const host = createResourcePickerPageHost(dialog);
+  const unrelated: IResourceRenderBlockOptionsBlock = {
+    render: 'other:block' as never,
+    options: { class: 'other' },
+  };
+  const basicPage: IResourceRenderBlockOptionsBlock = {
+    render: 'basic-page:blockPage' as never,
+    options: {
+      blocks: [{ render: 'basic-page:blockTable' as never }],
+    } as any,
+  };
+
+  const context = {
+    options: dialog.props,
+    session: dialog.session,
+    dialog: host,
+  };
+  const blocks = host.prepareBlocks([unrelated, basicPage], context)!;
+
+  assert.equal(blocks[0], unrelated);
+  assert.deepEqual(blocks[1].options, {
+    actionPath: undefined,
+    queryFixed: undefined,
+    selectionPolicy: 'always',
+    selectionMode: 'multiple',
+    selectionMax: 2,
+    selectedIds: [1],
+    selectedRows: [{ id: 1, name: 'One' }],
+    blocks: [
+      { render: 'basic-page:blockTable' },
+      { render: 'basic-resource:blockResourcePickerActions' },
+    ],
+  });
+
+  const onSelectionChange = (blocks[1].options as any).onSelectionChange as (
+    selection: any,
+  ) => void;
+  onSelectionChange({ ids: [2], rows: [{ id: 2, name: 'Two' }], count: 1 });
+  assert.deepEqual(dialog.session, {
+    selectedIds: [2],
+    selectedRows: [{ id: 2, name: 'Two' }],
+  });
+});
+
+test('Basic picker host forwards resolve and cancel', () => {
+  const { dialog, resolved, cancelled } = createDialog();
+  const host = createResourcePickerPageHost(dialog);
+  const selection = { ids: [1], rows: [{ id: 1 }], count: 1 };
+
+  host.resolve(selection);
+  host.cancel();
+
+  assert.deepEqual(resolved, [selection]);
+  assert.equal(cancelled, true);
+});

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-rest-resource",
-  "version": "5.1.53",
+  "version": "5.1.54",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/lib/resourcePicker.ts

@@ -1 +1,43 @@
+import type { TableIdentity } from 'table-identity';
+import type {
+  IResourceRenderBlockOptionsBlock,
+  IResourceTableSelectionPayload,
+  ITableQuery,
+} from 'zova-module-a-openapi';
+
 export const resourcePickerPageContextKey = '$resourcePickerPageContext';
+export const resourcePickerPageHostKey = '$resourcePickerPageHost';
+
+export interface IResourcePickerPageOptions extends Record<string, unknown> {
+  resource: string;
+  actionPath?: string;
+  query?: ITableQuery;
+  selectionMode: 'single' | 'multiple';
+  selectionMax?: number;
+  selectedIds?: readonly TableIdentity[];
+}
+
+export interface IResourcePickerPageSession {
+  selectedIds: TableIdentity[];
+  selectedRows: Record<string, unknown>[];
+}
+
+export interface IResourcePickerPageDialog {
+  resolve(value: IResourceTableSelectionPayload): void;
+  cancel(): void;
+}
+
+export interface IResourcePickerPageContext {
+  options: IResourcePickerPageOptions;
+  session: IResourcePickerPageSession;
+  dialog: IResourcePickerPageDialog;
+}
+
+export interface IResourcePickerPageHost extends IResourcePickerPageDialog {
+  options: IResourcePickerPageOptions;
+  session: IResourcePickerPageSession;
+  prepareBlocks(
+    blocks: IResourceRenderBlockOptionsBlock[] | undefined,
+    context: IResourcePickerPageContext,
+  ): IResourceRenderBlockOptionsBlock[] | undefined;
+}

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/page/resourcePicker/controller.tsx

@@ -1,53 +1,25 @@
-import type { TableIdentity } from 'table-identity';
 import type { VNode } from 'vue';
-import type {
-  IResourceBlockOptionsBase,
-  IResourceRenderBlockOptionsBlock,
-  IResourceTableSelectionPayload,
-  ITableQuery,
-} from 'zova-module-a-openapi';
-import type { IRoutedDialogContext } from 'zova-module-basic-app';
 
 import { z } from 'zod';
 import { BeanControllerPageBase, deepExtend, Use, usePrepareArg } from 'zova';
 import { ZovaJsx } from 'zova-jsx';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
-import { routedDialogContextKey } from 'zova-module-basic-app';
 import { ZPage } from 'zova-module-home-base';
 
+import type {
+  IResourcePickerPageContext,
+  IResourcePickerPageHost,
+} from '../../lib/resourcePicker.js';
 import type { ModelResource } from '../../model/resource.js';
 
 import { ZResourcePickerContext } from '../../.metadata/component/resourcePickerContext.js';
+import { resourcePickerPageHostKey } from '../../lib/resourcePicker.js';
 
 export const ControllerPageResourcePickerSchemaParams = z.object({
   resource: z.string(),
 });
 
-export interface IResourcePickerPageOptions extends Record<string, unknown> {
-  resource: string;
-  actionPath?: string;
-  query?: ITableQuery;
-  selectionMode: 'single' | 'multiple';
-  selectionMax?: number;
-  selectedIds?: readonly TableIdentity[];
-}
-
-export interface IResourcePickerPageSession {
-  selectedIds: TableIdentity[];
-  selectedRows: Record<string, unknown>[];
-}
-
-export interface IResourcePickerPageContext {
-  options: IResourcePickerPageOptions;
-  session: IResourcePickerPageSession;
-  dialog: IRoutedDialogContext<
-    IResourceTableSelectionPayload,
-    IResourcePickerPageOptions,
-    IResourcePickerPageSession
-  >;
-}
-
 @Controller()
 export class ControllerPageResourcePicker extends BeanControllerPageBase {
   jsxZova: ZovaJsx;
@@ -57,27 +29,27 @@ export class ControllerPageResourcePicker extends BeanControllerPageBase {
     return usePrepareArg(this.resource, true);
   }
 
-  @Use({ name: routedDialogContextKey, injectionScope: 'host' })
-  $$routedDialogContext: IRoutedDialogContext<
-    IResourceTableSelectionPayload,
-    IResourcePickerPageOptions,
-    IResourcePickerPageSession
-  >;
+  @Use({ name: resourcePickerPageHostKey, injectionScope: 'host' })
+  $$pickerHost: IResourcePickerPageHost | undefined;
 
   get resource() {
     return this.$params.resource;
   }
 
   get pickerContext(): IResourcePickerPageContext {
-    const options = this.$$routedDialogContext.props;
-    const session = this.$$routedDialogContext.session;
-    if (!options || !session || options.resource !== this.resource) {
+    const host = this.$$pickerHost;
+    if (!host) {
+      throw new Error('resource picker requires a page host');
+    }
+    const options = host.options;
+    const session = host.session;
+    if (options.resource !== this.resource) {
       throw new Error('resource picker context does not match route resource');
     }
     return {
       options,
       session,
-      dialog: this.$$routedDialogContext,
+      dialog: host,
     };
   }
 
@@ -91,7 +63,8 @@ export class ControllerPageResourcePicker extends BeanControllerPageBase {
   }
 
   public render() {
-    const blocks = this._prepareBlocks(this.schemaRow?.rest?.blocks);
+    const pickerContext = this.pickerContext;
+    const blocks = this.$$pickerHost!.prepareBlocks(this.schemaRow?.rest?.blocks, pickerContext);
     if (!blocks || blocks.length === 0) return;
     const domBlocks: VNode[] = [];
     blocks.forEach((block, index) => {
@@ -102,43 +75,11 @@ export class ControllerPageResourcePicker extends BeanControllerPageBase {
       else domBlocks.push(domBlock);
     });
     return (
-      <ZResourcePickerContext context={this.pickerContext}>
+      <ZResourcePickerContext context={pickerContext}>
         <ZPage>{domBlocks}</ZPage>
       </ZResourcePickerContext>
     );
   }
-
-  private _prepareBlocks(blocks: IResourceRenderBlockOptionsBlock[] | undefined) {
-    if (!blocks) return;
-    return blocks.map(block => {
-      if (block.render !== 'basic-page:blockPage') return block;
-      const pickerContext = this.pickerContext;
-      return {
-        ...block,
-        options: deepExtend({}, block.options, {
-          actionPath: pickerContext.options.actionPath,
-          queryFixed: pickerContext.options.query,
-          selectionPolicy: 'always',
-          selectionMode: pickerContext.options.selectionMode,
-          selectionMax: pickerContext.options.selectionMax,
-          selectedIds: pickerContext.session.selectedIds,
-          selectedRows: pickerContext.session.selectedRows,
-          onSelectionChange: (selection: IResourceTableSelectionPayload) => {
-            pickerContext.session.selectedIds = [...selection.ids];
-            pickerContext.session.selectedRows = selection.rows.map(row => ({ ...row }));
-          },
-          blocks: [
-            ...((
-              block.options as IResourceBlockOptionsBase & {
-                blocks?: IResourceRenderBlockOptionsBlock[];
-              }
-            ).blocks ?? []),
-            {
-              render: 'basic-resource:blockResourcePickerActions',
-            },
-          ],
-        }),
-      };
-    });
-  }
 }
+
+export type { IResourcePickerPageContext } from '../../lib/resourcePicker.js';

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.54",
+  "version": "5.1.55",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "zova-module-a-rbac": "^5.0.1",
-    "zova-module-rest-resource": "^5.1.53"
+    "zova-module-rest-resource": "^5.1.54"
   },
   "title": "a-cabloy"
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.34",
+  "version": "5.1.35",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.36",
+  "version": "5.1.37",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-routerstack",
-  "version": "5.1.28",
+  "version": "5.1.29",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-table",
-  "version": "5.1.41",
+  "version": "5.1.42",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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.160",
   "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",
@@ -23,14 +23,14 @@
     "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-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-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.42",
     "zova-module-a-zod": "^5.1.37",
     "zova-module-a-zova": "^5.1.104"
   },