cabloy 5.1.162 → 5.1.164

package/vona/src/suite/a-training/modules/training-student/src/dto/studentDeleteBulk.tsx

@@ -0,0 +1,14 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+import { z } from 'zod';
+
+export interface IDtoOptionsStudentDeleteBulk extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsStudentDeleteBulk>()
+export class DtoStudentDeleteBulk {
+  @Api.field(v.required(), z.array(v.tableIdentity()()).min(1).max(100))
+  ids: TableIdentity[];
+}

package/vona/src/suite/a-training/modules/training-student/src/dto/studentSelectResItem.tsx

@@ -40,7 +40,13 @@ export interface IDtoOptionsStudentSelectResItem extends IDecoratorDtoOptions {}
           ],
         }),
         ZovaRender.block('basic-page:blockToolbarBulk', {
-          actions: [ZovaRender.tableActionBulk('basic-table:actionCreate')],
+          actions: [
+            ZovaRender.tableActionBulk('basic-table:actionCreate'),
+            ZovaRender.tableActionBulk('basic-table:actionDeleteBulk', {
+              requiresSelection: true,
+              selectedMaxIds: 100,
+            }),
+          ],
         }),
         ZovaRender.block('basic-page:blockTable'),
         ZovaRender.block('basic-page:blockPager'),

package/vona/src/suite/a-training/modules/training-student/src/service/student.ts

@@ -3,6 +3,7 @@ import type { IQueryParams } from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
+import { Core } from 'vona-module-a-core';
 
 import type { DtoStudentCreate } from '../dto/studentCreate.tsx';
 import type { DtoStudentSelectRes } from '../dto/studentSelectRes.tsx';
@@ -86,6 +87,11 @@ export class ServiceStudent extends BeanBase {
     });
   }
 
+  @Core.transaction()
+  async deleteBulk(ids: TableIdentity[]): Promise<void> {
+    await this.scope.model.student.deleteBulk(ids, { include: getStudentRelationsInclude() });
+  }
+
   async deleteForce(id: TableIdentity) {
     return await this.scope.model.student.deleteById(id, {
       disableDeleted: true,

package/vona/src/suite/a-training/modules/training-student/test/student.test.ts

@@ -64,13 +64,47 @@ describe('student.test.ts', { concurrency: false }, () => {
     });
   });
 
+  it('action:student:bulkDeleteOpenapi', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const controller = app.bean.onion.controller
+        .getOnionsEnabledCached()
+        .find(item => item.beanOptions.beanFullName === 'training-student.controller.student')
+        ?.beanOptions.beanClass;
+      if (!controller) throw new Error('training-student.controller.student not found');
+      const apiJson = await app.bean.openapi.generateJsonOfControllerAction(
+        controller,
+        'deleteBulk',
+        'V31',
+      );
+      const operation = apiJson.paths?.['/api/training/student/bulk/delete']?.post;
+      assert.equal(operation?.operationId, 'TrainingStudent_deleteBulk');
+      assert.equal(operation?.summary?.toJSON(), 'Bulk Delete');
+      const requestSchema = operation?.requestBody?.content?.['application/json']?.schema as any;
+      const requestSchemaRef = requestSchema?.$ref;
+      assert.ok(requestSchemaRef);
+      const requestSchemaName = requestSchemaRef.replace('#/components/schemas/', '');
+      const component = apiJson.components?.schemas?.[requestSchemaName] as any;
+      assert.equal(component?.properties?.ids?.minItems, 1);
+      assert.equal(component?.properties?.ids?.maxItems, 100);
+    });
+  });
+
   it('action:student:filterFormLayoutMetadata', async () => {
     await app.bean.executor.mockCtx(async () => {
       const apiJson = await app.bean.openapi.generateJsonOfClass(DtoStudentSelectResItem);
       const component = Object.values(apiJson.components!.schemas as any).find(item => {
         return (item as any).properties?._operationsRow;
       });
-      const filterBlock = (component as any)?.rest?.blocks?.[0]?.options?.blocks?.[0];
+      const pageBlocks = (component as any)?.rest?.blocks?.[0]?.options?.blocks;
+      const toolbarBlock = pageBlocks?.[1];
+      assert.equal(toolbarBlock?.render, 'basic-page:blockToolbarBulk');
+      const deleteBulkAction = toolbarBlock?.options?.actions?.find(
+        (action: any) => action.render === 'basic-table:actionDeleteBulk',
+      );
+      assert.equal(deleteBulkAction?.options?.requiresSelection, true);
+      assert.equal(deleteBulkAction?.options?.selectedMaxIds, 100);
+
+      const filterBlock = pageBlocks?.[0];
       assert.equal(filterBlock?.render, 'basic-page:blockFilter');
       assert.equal(filterBlock?.options?.formFieldLayout?.inline, true);
       assert.deepEqual(
@@ -449,6 +483,75 @@ describe('student.test.ts', { concurrency: false }, () => {
     });
   });
 
+  it('action:student:deleteBulk', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      const studentIds: string[] = [];
+      try {
+        for (const name of ['__DeleteBulkA__', '__DeleteBulkB__']) {
+          const studentId = await app.bean.executor.performAction('post', '/training/student', {
+            body: { name, mobile: `138${studentIds.length}1234567`, level: 1 },
+          });
+          studentIds.push(studentId);
+        }
+        const deleted = await app.bean.executor.performAction(
+          'post',
+          '/training/student/bulk/delete',
+          { body: { ids: studentIds } },
+        );
+        assert.equal(deleted, null);
+        for (const studentId of studentIds) {
+          assert.equal(
+            await app.scope('training-student').model.student.getById(studentId),
+            undefined,
+          );
+        }
+      } finally {
+        for (const studentId of studentIds.reverse()) {
+          await app
+            .scope('training-student')
+            .model.studentContent.delete({ studentId }, { disableDeleted: true });
+          await app
+            .scope('training-student')
+            .model.student.deleteById(studentId, { disableDeleted: true });
+        }
+        await app.bean.passport.signout();
+      }
+    });
+  });
+
+  it('action:student:deleteBulk accepts duplicate and missing IDs', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      let studentId: string | undefined;
+      try {
+        studentId = await app.bean.executor.performAction('post', '/training/student', {
+          body: { name: '__DeleteBulkIdempotent__', mobile: '13891234567', level: 1 },
+        });
+        const deleted = await app.bean.executor.performAction(
+          'post',
+          '/training/student/bulk/delete',
+          { body: { ids: [studentId, studentId, '__missing-student__'] } },
+        );
+        assert.equal(deleted, null);
+        assert.equal(
+          await app.scope('training-student').model.student.getById(studentId),
+          undefined,
+        );
+      } finally {
+        if (studentId) {
+          await app
+            .scope('training-student')
+            .model.studentContent.delete({ studentId }, { disableDeleted: true });
+          await app
+            .scope('training-student')
+            .model.student.deleteById(studentId, { disableDeleted: true });
+        }
+        await app.bean.passport.signout();
+      }
+    });
+  });
+
   it('action:student:contentPersistence', async () => {
     await app.bean.executor.mockCtx(async () => {
       await app.bean.passport.signinMock();
@@ -531,7 +634,16 @@ describe('student.test.ts', { concurrency: false }, () => {
       await app.bean.passport.signinMock();
       try {
         app.bean.passport.current!.roles = [];
-        const actions = ['create', 'select', 'view', 'update', 'summary', 'delete', 'deleteForce'];
+        const actions = [
+          'create',
+          'select',
+          'view',
+          'update',
+          'summary',
+          'delete',
+          'deleteBulk',
+          'deleteForce',
+        ];
         const permissions = await Promise.all(
           actions.map(action =>
             app.bean.permission.retrievePermissionAction('training-student:student', action),

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-rbac",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/.metadata/index.ts

@@ -27,6 +27,7 @@ declare module 'vona-module-a-rbac' {
 /** guard: end */
 /** bean: begin */
 export * from '../bean/bean.rbacCatalog.ts';
+export * from '../bean/bean.rbacResourceBulk.ts';
 export * from '../bean/bean.rbacScope.ts';
 
 import 'vona';
@@ -41,6 +42,11 @@ declare module 'vona-module-a-rbac' {
           get scope(): ScopeModuleARbac;
         }
 
+        export interface BeanRbacResourceBulk {
+          /** @internal */
+          get scope(): ScopeModuleARbac;
+        }
+
         export interface BeanRbacScope {
           /** @internal */
           get scope(): ScopeModuleARbac;
@@ -49,11 +55,13 @@ declare module 'vona-module-a-rbac' {
 /** bean: end */
 /** bean: begin */
 import type { BeanRbacCatalog } from '../bean/bean.rbacCatalog.ts';
+import type { BeanRbacResourceBulk } from '../bean/bean.rbacResourceBulk.ts';
 import type { BeanRbacScope } from '../bean/bean.rbacScope.ts';
 import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'rbacCatalog': BeanRbacCatalog;
+    'rbacResourceBulk': BeanRbacResourceBulk;
     'rbacScope': BeanRbacScope;
   }
 }
@@ -139,8 +147,15 @@ declare module 'vona-module-a-rbac' {
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
 /** config: end */
+/** locale: begin */
+import { locales } from './locales.ts';
+/** locale: end */
+/** error: begin */
+export * from '../config/errors.ts';
+import type { errors } from '../config/errors.ts';
+/** error: end */
 /** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig } from 'vona';
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig, type TypeModuleErrors, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
 import { Scope } from 'vona-module-a-bean';
 
 @Scope()
@@ -149,6 +164,8 @@ export class ScopeModuleARbac extends BeanScopeBase {}
 export interface ScopeModuleARbac {
   util: BeanScopeUtil;
 config: TypeModuleConfig<typeof config>;
+error: TypeModuleErrors<typeof errors>;
+locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
 event: IModuleEvent;
 }
 
@@ -166,8 +183,12 @@ declare module 'vona' {
     'a-rbac': ReturnType<typeof config>;
   }
 
+  export interface IBeanScopeLocale {
+    'a-rbac': (typeof locales)[TypeLocaleBase];
+  }
 
-
-
+  export interface IBeanScopeErrors {
+    'a-rbac': typeof errors;
+  }
 }
 /** scope: end */

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/.metadata/locales.ts

@@ -0,0 +1,18 @@
+import type { TypeLocaleBase } from 'vona';
+
+import { $makeLocaleMagic } from 'vona';
+
+import locale_en_us from '../config/locale/en-us.ts';
+import locale_zh_cn from '../config/locale/zh-cn.ts';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
+  return $makeLocaleMagic(`a-rbac::${key}`, ...args);
+}

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/bean/bean.rbacResourceBulk.ts

@@ -0,0 +1,50 @@
+import type { TableIdentity } from 'table-identity';
+
+import { BeanBase } from 'vona';
+import { Bean } from 'vona-module-a-bean';
+
+import type { IRbacScopeAccess } from '../types/scope.ts';
+
+export type TypeRbacResourceBulkLoad<Entry extends { id: TableIdentity }> = (
+  ids: readonly TableIdentity[],
+) => Promise<Entry[]>;
+
+@Bean()
+export class BeanRbacResourceBulk extends BeanBase {
+  async entries<Entry extends { id: TableIdentity }>(
+    ids: readonly TableIdentity[],
+    load: TypeRbacResourceBulkLoad<Entry>,
+    access: IRbacScopeAccess,
+  ): Promise<Entry[]> {
+    const requested = this.validateIds(ids);
+    const entries = await load(requested);
+    const entriesByKey = new Map(entries.map(entry => [this.idKey(entry.id), entry]));
+    if (
+      entries.length !== requested.length ||
+      requested.some(id => !entriesByKey.has(this.idKey(id)))
+    ) {
+      this.scope.error.ResourceBulkEntriesMissing.throw();
+    }
+    const orderedEntries = requested.map(id => entriesByKey.get(this.idKey(id))!);
+    access.checkEntries(orderedEntries);
+    return orderedEntries;
+  }
+
+  private validateIds(ids: readonly TableIdentity[]): TableIdentity[] {
+    if (ids.length === 0) this.scope.error.ResourceBulkIdsEmpty.throw();
+    const keys = new Set<string>();
+    for (const id of ids) {
+      const key = this.idKey(id);
+      if (keys.has(key)) this.scope.error.ResourceBulkIdsDuplicate.throw();
+      keys.add(key);
+    }
+    return [...ids];
+  }
+
+  private idKey(id: TableIdentity): string {
+    if (id === undefined || id === null || id === '') {
+      this.scope.error.ResourceBulkIdsInvalid.throw();
+    }
+    return String(id);
+  }
+}

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/bean/index.ts

@@ -1,4 +1,5 @@
 export * from './bean.rbacCatalog.ts';
+export * from './bean.rbacResourceBulk.ts';
 export * from './bean.rbacScope.ts';
 export * from './event.policyInvalidated.ts';
 export * from './event.resolvePolicy.ts';

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/config/errors.ts

@@ -0,0 +1,18 @@
+export const errors = {
+  ResourceBulkIdsEmpty: {
+    code: 1001,
+    status: 422,
+  },
+  ResourceBulkIdsInvalid: {
+    code: 1003,
+    status: 422,
+  },
+  ResourceBulkIdsDuplicate: {
+    code: 1004,
+    status: 422,
+  },
+  ResourceBulkEntriesMissing: {
+    code: 1005,
+    status: 404,
+  },
+} as const;

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/config/locale/en-us.ts

@@ -0,0 +1,6 @@
+export default {
+  ResourceBulkIdsEmpty: 'Bulk resource IDs are required',
+  ResourceBulkIdsInvalid: 'Bulk resource IDs cannot contain empty values',
+  ResourceBulkIdsDuplicate: 'Bulk resource IDs cannot contain duplicates',
+  ResourceBulkEntriesMissing: 'One or more bulk resource entries are absent',
+};

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/config/locale/zh-cn.ts

@@ -0,0 +1,6 @@
+export default {
+  ResourceBulkIdsEmpty: '批量资源 ID 不能为空',
+  ResourceBulkIdsInvalid: '批量资源 ID 不能包含空值',
+  ResourceBulkIdsDuplicate: '批量资源 ID 不能包含重复值',
+  ResourceBulkEntriesMissing: '一个或多个批量资源条目不存在',
+};

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/index.ts

@@ -1,3 +1,4 @@
+export * from './.metadata/locales.ts';
 export * from './lib/index.ts';
 export * from './types/index.ts';
 export * from './.metadata/index.ts';

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/test/resourceBulk.test.ts

@@ -0,0 +1,128 @@
+import type { TableIdentity } from 'table-identity';
+
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+import type { IRbacScopeAccess } from '../src/types/scope.ts';
+
+function createAccess(
+  onCheck?: (entries: readonly { id: TableIdentity }[]) => void,
+): IRbacScopeAccess {
+  return {
+    action: {} as never,
+    decision: {} as never,
+    unrestricted: false,
+    ownerValues: () => ({}),
+    where: () => undefined,
+    checkEntry: () => {},
+    checkEntries: entries => onCheck?.(entries as readonly { id: TableIdentity }[]),
+    permissionProjection: () => ({ key: '', allowed: true, matcher: { mode: 'all' } }),
+  };
+}
+
+function assertScopedError(errorName: string, status: number) {
+  return (error: Error) => error.code === `a-rbac:${errorName}` && error.status === status;
+}
+
+describe('resourceBulk.test.ts', { concurrency: false }, () => {
+  it('rejects invalid IDs before loading with scoped errors', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      let loads = 0;
+      const load = async () => {
+        loads += 1;
+        return [];
+      };
+      await assert.rejects(
+        () => app.bean.rbacResourceBulk.entries([], load, createAccess()),
+        assertScopedError('1001', 422),
+      );
+      await assert.rejects(
+        () => app.bean.rbacResourceBulk.entries([undefined as never], load, createAccess()),
+        assertScopedError('1003', 422),
+      );
+      await assert.rejects(
+        () => app.bean.rbacResourceBulk.entries(['1', '1'], load, createAccess()),
+        assertScopedError('1004', 422),
+      );
+      assert.equal(loads, 0);
+    });
+  });
+
+  it('requires full coverage and preserves requested order for authorization', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      let checked: readonly { id: TableIdentity }[] | undefined;
+      const entries = await app.bean.rbacResourceBulk.entries(
+        ['2', '1'],
+        async () => [{ id: '1' }, { id: '2' }],
+        createAccess(value => {
+          checked = value;
+        }),
+      );
+      assert.deepEqual(
+        entries.map(entry => entry.id),
+        ['2', '1'],
+      );
+      assert.deepEqual(
+        checked?.map(entry => entry.id),
+        ['2', '1'],
+      );
+
+      await assert.rejects(
+        () =>
+          app.bean.rbacResourceBulk.entries(['1', '2'], async () => [{ id: '1' }], createAccess()),
+        assertScopedError('1005', 404),
+      );
+    });
+  });
+
+  it('runs authorization only after complete scoped loading', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      let calls = 0;
+      let loads = 0;
+      await assert.rejects(
+        () =>
+          app.bean.rbacResourceBulk.entries(
+            ['1', '2'],
+            async () => {
+              loads += 1;
+              return [{ id: '1' }];
+            },
+            createAccess(() => {
+              calls += 1;
+            }),
+          ),
+        assertScopedError('1005', 404),
+      );
+      assert.equal(loads, 1);
+      assert.equal(calls, 0);
+
+      await assert.rejects(
+        () =>
+          app.bean.rbacResourceBulk.entries(
+            ['1'],
+            async () => [{ id: '1' }],
+            createAccess(() => {
+              throw new Error('forbidden');
+            }),
+          ),
+        /forbidden/,
+      );
+    });
+  });
+
+  it('localizes scoped errors', async () => {
+    await app.bean.executor.mockCtx(
+      async () => {
+        await assert.rejects(
+          () => app.bean.rbacResourceBulk.entries([], async () => [], createAccess()),
+          (error: Error) =>
+            error.code === 'a-rbac:1001' &&
+            error.status === 422 &&
+            error.message === '批量资源 ID 不能为空',
+        );
+      },
+      { locale: 'zh-cn' },
+    );
+  });
+});

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.51",
+  "version": "5.1.52",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -9,7 +9,7 @@
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.5",
+    "vona-module-a-rbac": "^5.0.6",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

package/vona/src/suite-vendor/a-vona/modules/a-permission/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.21",
+  "version": "5.1.22",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.85",
+  "version": "5.1.86",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.106",
+  "version": "1.2.107",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.104"
+    "zova-cli-set-front": "^1.2.105"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateTableActionBulk/controller.tsx_

@@ -1,7 +1,7 @@
 import type { IComponentOptions } from 'zova';
 import type {
   IJsxRenderContextPage,
-  IResourceTableActionBulkOptionsBase,
+  IResourceTableActionBulkPropsBase,
 } from 'zova-module-a-openapi';
 
 import { BeanControllerBase, Use } from 'zova';
@@ -13,7 +13,7 @@ declare module 'zova-module-a-openapi' {
   }
 }
 
-export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceTableActionBulkOptionsBase {}
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceTableActionBulkPropsBase {}
 
 @Controller()
 export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.104",
+  "version": "1.2.105",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

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

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