cabloy 5.1.190 → 5.1.192

package/zova/src/suite/cabloy-basic/modules/basic-details/src/lib/detailsPermissions.ts

@@ -0,0 +1,65 @@
+import type {
+  IPermissionHintGeneral,
+  IResourceRenderDetailsActionBulkOptionsAction,
+  IResourceRenderDetailsActionRowOptionsAction,
+  TypeFormScene,
+  TypeOpenapiPermissions,
+} from 'zova-module-a-openapi';
+
+import type { TypeDetailsCheckPermission } from '../types/details.js';
+
+import { checkFormScene } from './utils.js';
+
+export interface IDetailsPermissionAction {
+  name?: string;
+  options?: { permission?: IPermissionHintGeneral };
+}
+
+export function createDetailsPermissionChecker(
+  getPermissions: () => TypeOpenapiPermissions | undefined,
+  getCurrentData: () => Record<string, unknown> | undefined,
+  checkPermission: (
+    permissions: TypeOpenapiPermissions | undefined,
+    actionName?: string,
+    permissionHint?: IPermissionHintGeneral,
+    currentData?: Record<string, unknown>,
+  ) => boolean,
+): TypeDetailsCheckPermission {
+  return (actionName, permissionHint) => {
+    return checkPermission(getPermissions(), actionName, permissionHint, getCurrentData());
+  };
+}
+
+export function isDetailsActionAllowed(
+  formScene: TypeFormScene,
+  checkPermission: TypeDetailsCheckPermission,
+  action: IDetailsPermissionAction,
+): boolean {
+  const permissionHint = action.options?.permission;
+  return checkFormScene(formScene, permissionHint) && checkPermission(action.name, permissionHint);
+}
+
+export function filterDetailsActions<TAction extends IDetailsPermissionAction>(
+  formScene: TypeFormScene,
+  checkPermission: TypeDetailsCheckPermission,
+  actions: TAction[] | undefined,
+): TAction[] {
+  if (!actions || actions.length === 0) return [];
+  return actions.filter(action => isDetailsActionAllowed(formScene, checkPermission, action));
+}
+
+export function filterDetailsBulkActions(
+  formScene: TypeFormScene,
+  checkPermission: TypeDetailsCheckPermission,
+  actions: IResourceRenderDetailsActionBulkOptionsAction[] | undefined,
+) {
+  return filterDetailsActions(formScene, checkPermission, actions);
+}
+
+export function filterDetailsRowActions(
+  formScene: TypeFormScene,
+  checkPermission: TypeDetailsCheckPermission,
+  actions: IResourceRenderDetailsActionRowOptionsAction[] | undefined,
+) {
+  return filterDetailsActions(formScene, checkPermission, actions);
+}

package/zova/src/suite/cabloy-basic/modules/basic-details/src/lib/index.ts

@@ -1 +1,2 @@
+export * from './detailsPermissions.js';
 export * from './utils.js';

package/zova/src/suite/cabloy-basic/modules/basic-details/src/lib/utils.ts

@@ -1,8 +1,8 @@
-import { IPermissionHintDetailsActionBulk, TypeFormScene } from 'zova-module-a-openapi';
+import type { IPermissionHintGeneral, TypeFormScene } from 'zova-module-a-openapi';
 
-export function checkPermission(
+export function checkFormScene(
   formScene: TypeFormScene,
-  permissionHint?: IPermissionHintDetailsActionBulk,
+  permissionHint?: IPermissionHintGeneral,
 ): boolean {
   const formSceneHint = permissionHint?.formScene;
   if (!formSceneHint) return true;

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

@@ -1,9 +1,14 @@
 import 'zova-module-a-table';
 import 'zova-module-a-openapi';
-import type { IDetailsScope } from 'zova-module-a-openapi';
+import type { IDetailsScope, IPermissionHintGeneral } from 'zova-module-a-openapi';
 
 import { ControllerBlockDetails } from '../component/blockDetails/controller.jsx';
 
+export type TypeDetailsCheckPermission = (
+  actionName?: string,
+  permissionHint?: IPermissionHintGeneral,
+) => boolean;
+
 declare module 'zova-module-a-openapi' {
   export interface IJsxRenderContextDetails<TData extends {} = {}> {
     $$details: ControllerBlockDetails<TData>;

package/zova/src/suite/cabloy-basic/modules/basic-details/test/lib/detailsPermissions.test.ts

@@ -0,0 +1,125 @@
+import type { IPermissionHintGeneral, TypeOpenapiPermissions } from 'zova-module-a-openapi';
+
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import {
+  createDetailsPermissionChecker,
+  filterDetailsBulkActions,
+  filterDetailsRowActions,
+} from '../../src/lib/detailsPermissions.js';
+
+test('details permission checker lazily reads the current enclosing Resource projection', () => {
+  let permissions: TypeOpenapiPermissions | undefined = true;
+  let currentData: Record<string, unknown> = { departmentId: 7 };
+  const calls: unknown[][] = [];
+  const checkPermission = createDetailsPermissionChecker(
+    () => permissions,
+    () => currentData,
+    (...args) => {
+      calls.push(args);
+      return true;
+    },
+  );
+  const permissionHint: IPermissionHintGeneral = { actionInherit: 'view' };
+
+  const firstPermissions = permissions;
+  const firstCurrentData = currentData;
+  assert.equal(checkPermission('grantSystemAdmin', permissionHint), true);
+  permissions = false;
+  currentData = { departmentId: 8 };
+  assert.equal(checkPermission('grantSystemAdmin', permissionHint), true);
+
+  assert.equal(calls.length, 2);
+  assert.strictEqual(calls[0][0], firstPermissions);
+  assert.strictEqual(calls[1][0], permissions);
+  assert.strictEqual(calls[0][3], firstCurrentData);
+  assert.strictEqual(calls[1][3], currentData);
+  assert.deepEqual(
+    calls.map(call => call.slice(1, 3)),
+    [
+      ['grantSystemAdmin', permissionHint],
+      ['grantSystemAdmin', permissionHint],
+    ],
+  );
+  assert.equal(
+    calls.every(call => call.length === 4),
+    true,
+  );
+});
+
+test('bulk details actions apply form-scene filtering before the enclosing Resource checker', () => {
+  const calls: Array<[string | undefined, IPermissionHintGeneral | undefined]> = [];
+  const grantHint = { actionInherit: 'view', formScene: ['view'] };
+  const actions = [
+    {
+      name: 'hiddenInView',
+      render: 'test:hiddenInView',
+      options: { permission: { formScene: ['edit'] } },
+    },
+    {
+      name: 'denied',
+      render: 'test:denied',
+      options: { permission: { formScene: ['view'] } },
+    },
+    {
+      name: 'grantSystemAdmin',
+      render: 'test:grantSystemAdmin',
+      options: { permission: grantHint },
+    },
+  ];
+
+  const allowed = filterDetailsBulkActions(
+    'view',
+    (actionName, permissionHint) => {
+      calls.push([actionName, permissionHint]);
+      return actionName === 'grantSystemAdmin';
+    },
+    actions as any,
+  );
+
+  assert.deepEqual(
+    allowed.map(action => action.name),
+    ['grantSystemAdmin'],
+  );
+  assert.deepEqual(
+    calls.map(([actionName]) => actionName),
+    ['denied', 'grantSystemAdmin'],
+  );
+  assert.strictEqual(calls[1][1], grantHint);
+});
+
+test('row details actions use the same enclosing Resource checker and form-scene gate', () => {
+  const calls: string[] = [];
+  const actions = [
+    {
+      name: 'hiddenInView',
+      render: 'test:hiddenInView',
+      options: { permission: { formScene: ['edit'] } },
+    },
+    {
+      name: 'allowed',
+      render: 'test:allowed',
+      options: { permission: { public: true } },
+    },
+    {
+      name: 'denied',
+      render: 'test:denied',
+    },
+  ];
+
+  const allowed = filterDetailsRowActions(
+    'view',
+    actionName => {
+      calls.push(actionName!);
+      return actionName === 'allowed';
+    },
+    actions as any,
+  );
+
+  assert.deepEqual(
+    allowed.map(action => action.name),
+    ['allowed'],
+  );
+  assert.deepEqual(calls, ['allowed', 'denied']);
+});

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.54",
+  "version": "5.1.55",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/permissions.ts

@@ -52,12 +52,6 @@ export interface IPermissionHintTableActionBulk {
   public?: boolean;
 }
 
-export interface IPermissionHintDetailsActionRow {
-  formScene?: TypeFormScene | TypeFormScene[];
-}
+export interface IPermissionHintDetailsActionRow extends IPermissionHintGeneral {}
 
-export interface IPermissionHintDetailsActionBulk {
-  // actionInherit?: keyof IResourceDetailsActionBulkNameRecord;
-  // public?: boolean;
-  formScene?: TypeFormScene | TypeFormScene[];
-}
+export interface IPermissionHintDetailsActionBulk extends IPermissionHintGeneral {}

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

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

package/zova/src/suite-vendor/a-zova/modules/a-table/src/component/table/controller.tsx

@@ -1,4 +1,5 @@
 import type {
+  IResourceDetailsActionRowOptionsBase,
   IResourceTableActionRowOptionsBase,
   ISchemaObjectExtensionField,
   ISchemaObjectExtensionFieldRest,
@@ -466,7 +467,7 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
 
   public cellRender(
     render: TypeTableCellRenderComponent,
-    columnProps: IResourceTableActionRowOptionsBase,
+    columnProps: IResourceTableActionRowOptionsBase | IResourceDetailsActionRowOptionsBase,
     renderContext: IJsxRenderContextTableCell,
   ) {
     // render

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.165",
+  "version": "5.1.166",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "zova-module-a-logger": "^5.1.28",
     "zova-module-a-meta": "^5.1.22",
     "zova-module-a-model": "^5.1.37",
-    "zova-module-a-openapi": "^5.1.54",
+    "zova-module-a-openapi": "^5.1.55",
     "zova-module-a-router": "^5.1.41",
     "zova-module-a-routerstack": "^5.1.29",
     "zova-module-a-routertabs": "^5.1.34",
@@ -29,7 +29,7 @@
     "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.43",
+    "zova-module-a-table": "^5.1.44",
     "zova-module-a-zod": "^5.1.37",
     "zova-module-a-zova": "^5.1.108"
   },