cabloy 5.1.106 → 5.1.107

package/vona/src/suite/a-training/modules/training-record/src/controller/record.ts

@@ -5,7 +5,9 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
 import { Core } from 'vona-module-a-core';
 import { Api, Resource, v } from 'vona-module-a-openapiutils';
+import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
+import { z } from 'zod';
 
 import type { ModelRecord } from '../model/record.ts';
 
@@ -22,6 +24,7 @@ export interface IControllerOptionsRecord extends IDecoratorControllerOptions {}
 export class ControllerRecord extends BeanBase {
   @Web.post()
   @Api.body(v.tableIdentity())
+  @Passport.systemAdmin()
   async create(@Arg.body() record: DtoRecordCreate): Promise<TableIdentity> {
     return (await this.scope.service.record.create(record)).id;
   }
@@ -29,6 +32,7 @@ export class ControllerRecord extends BeanBase {
   @Web.get()
   @Api.body(DtoRecordSelectRes)
   @Core.serializer()
+  @Passport.systemAdmin()
   async select(
     @Arg.filter(DtoRecordSelectReq) params: IQueryParams<ModelRecord>,
   ): Promise<DtoRecordSelectRes> {
@@ -38,6 +42,7 @@ export class ControllerRecord extends BeanBase {
   @Web.get(':id')
   @Api.body(v.optional(), v.object(DtoRecordView))
   @Core.serializer()
+  @Passport.systemAdmin()
   async view(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoRecordView | undefined> {
@@ -45,15 +50,19 @@ export class ControllerRecord extends BeanBase {
   }
 
   @Web.patch(':id')
+  @Api.body(z.null())
+  @Passport.systemAdmin()
   async update(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
     @Arg.body() record: DtoRecordUpdate,
-  ) {
-    return await this.scope.service.record.update(id, record);
+  ): Promise<void> {
+    await this.scope.service.record.update(id, record);
   }
 
   @Web.delete(':id')
-  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
-    return await this.scope.service.record.delete(id);
+  @Api.body(z.null())
+  @Passport.systemAdmin()
+  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.record.delete(id);
   }
 }

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

@@ -160,10 +160,11 @@ describe('record.test.ts', () => {
             },
           ],
         } as any as DtoRecordUpdate;
-        await app.bean.executor.performAction('patch', '/training/record/:id', {
+        const updateRes = await app.bean.executor.performAction('patch', '/training/record/:id', {
           params: { id: recordId },
           body: dataUpdate,
         });
+        assert.equal(updateRes, null);
 
         record = await app.bean.executor.performAction('get', '/training/record/:id', {
           params: { id: recordId },
@@ -200,9 +201,10 @@ describe('record.test.ts', () => {
         assert.equal(studentRecord?.dossierFiles?.length, 2);
         assert.equal(studentRecord?.trainingRecordSubjects?.length, 2);
 
-        await app.bean.executor.performAction('delete', '/training/record/:id', {
+        const deleteRes = await app.bean.executor.performAction('delete', '/training/record/:id', {
           params: { id: recordId },
         });
+        assert.equal(deleteRes, null);
 
         record = await app.bean.executor.performAction('get', '/training/record/:id', {
           params: { id: recordId },
@@ -243,4 +245,25 @@ describe('record.test.ts', () => {
       }
     });
   });
+
+  it('action:record:systemAdmin', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      try {
+        app.bean.passport.current!.roles = [];
+        const actions = ['create', 'select', 'view', 'update', 'delete'];
+        const permissions = await Promise.all(
+          actions.map(action =>
+            app.bean.permission.retrievePermissionAction('training-record:record', action),
+          ),
+        );
+        assert.deepEqual(
+          permissions,
+          actions.map(() => false),
+        );
+      } finally {
+        await app.bean.passport.signout();
+      }
+    });
+  });
 });

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

@@ -5,7 +5,9 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
 import { Core } from 'vona-module-a-core';
 import { Api, Resource, v } from 'vona-module-a-openapiutils';
+import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
+import { z } from 'zod';
 
 import type { ModelStudent } from '../model/student.ts';
 
@@ -23,6 +25,7 @@ export interface IControllerOptionsStudent extends IDecoratorControllerOptions {
 export class ControllerStudent extends BeanBase {
   @Web.post()
   @Api.body(v.tableIdentity())
+  @Passport.systemAdmin()
   async create(@Arg.body() student: DtoStudentCreate): Promise<TableIdentity> {
     return (await this.scope.service.student.create(student)).id;
   }
@@ -30,6 +33,7 @@ export class ControllerStudent extends BeanBase {
   @Web.get()
   @Api.body(DtoStudentSelectRes)
   @Core.serializer()
+  @Passport.systemAdmin()
   async select(
     @Arg.filter(DtoStudentSelectReq) params: IQueryParams<ModelStudent>,
   ): Promise<DtoStudentSelectRes> {
@@ -39,6 +43,7 @@ export class ControllerStudent extends BeanBase {
   @Web.get(':id')
   @Api.body(v.optional(), v.object(DtoStudentView))
   @Core.serializer()
+  @Passport.systemAdmin()
   async view(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoStudentView | undefined> {
@@ -46,16 +51,19 @@ export class ControllerStudent extends BeanBase {
   }
 
   @Web.patch(':id')
+  @Api.body(z.null())
+  @Passport.systemAdmin()
   async update(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
     @Arg.body() student: DtoStudentUpdate,
-  ) {
-    return await this.scope.service.student.update(id, student);
+  ): Promise<void> {
+    await this.scope.service.student.update(id, student);
   }
 
   @Web.get('summary/:id')
   @Api.body(v.optional(), v.object(DtoStudentSummary))
   @Core.serializer()
+  @Passport.systemAdmin()
   async summary(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoStudentSummary | undefined> {
@@ -63,12 +71,16 @@ export class ControllerStudent extends BeanBase {
   }
 
   @Web.delete(':id')
-  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
-    return await this.scope.service.student.delete(id);
+  @Api.body(z.null())
+  @Passport.systemAdmin()
+  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.student.delete(id);
   }
 
   @Web.delete('deleteForce/:id')
-  async deleteForce(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
-    return await this.scope.service.student.deleteForce(id);
+  @Api.body(z.null())
+  @Passport.systemAdmin()
+  async deleteForce(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.student.deleteForce(id);
   }
 }

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

@@ -123,10 +123,11 @@ describe('student.test.ts', () => {
           },
         ],
       } as any as DtoStudentUpdate;
-      await app.bean.executor.performAction('patch', '/training/student/:id', {
+      const updateRes = await app.bean.executor.performAction('patch', '/training/student/:id', {
         params: { id: studentId },
         body: dataUpdate,
       });
+      assert.equal(updateRes, null);
       // findOne after nested update
       student = await app.bean.executor.performAction('get', '/training/student/:id', {
         params: { id: studentId },
@@ -168,9 +169,10 @@ describe('student.test.ts', () => {
       assert.equal(typeof summary.levelTitle, 'string');
       assert.equal(typeof summary.summaryText, 'string');
       // delete
-      await app.bean.executor.performAction('delete', '/training/student/:id', {
+      const deleteRes = await app.bean.executor.performAction('delete', '/training/student/:id', {
         params: { id: student.id },
       });
+      assert.equal(deleteRes, null);
       // findOne
       student = await app.bean.executor.performAction('get', '/training/student/:id', {
         params: { id: student.id },
@@ -180,9 +182,14 @@ describe('student.test.ts', () => {
       const studentIdForce = await app.bean.executor.performAction('post', '/training/student', {
         body: data,
       });
-      await app.bean.executor.performAction('delete', '/training/student/deleteForce/:id', {
-        params: { id: studentIdForce },
-      });
+      const deleteForceRes = await app.bean.executor.performAction(
+        'delete',
+        '/training/student/deleteForce/:id',
+        {
+          params: { id: studentIdForce },
+        },
+      );
+      assert.equal(deleteForceRes, null);
       const studentForce: EntityStudent | undefined = await app.bean
         .scope('training-student')
         .model.student.getById(studentIdForce, {
@@ -194,6 +201,27 @@ describe('student.test.ts', () => {
     });
   });
 
+  it('action:student:systemAdmin', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      try {
+        app.bean.passport.current!.roles = [];
+        const actions = ['create', 'select', 'view', 'update', 'summary', 'delete', 'deleteForce'];
+        const permissions = await Promise.all(
+          actions.map(action =>
+            app.bean.permission.retrievePermissionAction('training-student:student', action),
+          ),
+        );
+        assert.deepEqual(
+          permissions,
+          actions.map(() => false),
+        );
+      } finally {
+        await app.bean.passport.signout();
+      }
+    });
+  });
+
   it('action:student:level invalid', async () => {
     await app.bean.executor.mockCtx(async () => {
       await app.bean.passport.signinMock();

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/cli/ssrMenuAdmin/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -14,6 +14,7 @@ export interface ISsrMenuOptions<%=argv.beanNameCapitalize%> extends IDecoratorS
     icon: undefined,
     link: undefined,
     group: '<%=argv.ssrSiteGroupName%>',
+    roles: ['systemAdmin'],
   },
   site: ['<%=argv.ssrSiteOnionName%>'],
 })

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.25",
+  "version": "5.1.26",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/service/ssrHandler.ts

@@ -33,7 +33,7 @@ export class ServiceSsrHandler extends BeanBase {
     return await ssrHandler.resolvePath(filename);
   }
 
-  public async render(options: ISsrHandlerRenderOptionsInner) {
+  public async render(options: ISsrHandlerRenderOptionsInner): Promise<true | string | undefined> {
     const ssrHandler = await this.ensureReady();
     return await ssrHandler.render(options);
   }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.40",
+  "version": "5.1.41",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-user",
-  "version": "5.1.19",
+  "version": "5.1.20",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -1,4 +1,5 @@
 import type { TableIdentity } from 'table-identity';
+import type { ILocaleRecord } from 'vona';
 
 export interface IRoleNameRecord {
   registeredUser: never;
@@ -10,6 +11,8 @@ export interface IRoleIdRecord {}
 export interface IRole {
   id: TableIdentity;
   name: string;
+  title: string;
+  locales?: Partial<Record<keyof ILocaleRecord, string>>;
   siteIds: string[];
 }
 

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.97",
+  "version": "1.2.98",
   "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.95"
+    "zova-cli-set-front": "^1.2.96"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

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

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.openapi.generate.ts

@@ -606,6 +606,10 @@ function _patchOpenapiTSOptions(options?: OpenAPITSOptions) {
           const res = transformCustom(schemaObject, options);
           if (res !== undefined) return res;
         }
+        // // null
+        // if (schemaObject.type === 'null') {
+        //   return NULL;
+        // }
         // multipart
         if (schemaObject.format === 'binary') {
           if (

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

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

package/zova/src/suite/a-home/modules/home-api/mock/passport.fake.ts

@@ -235,8 +235,25 @@ const __sdkSchemaPassportLogin = {
               type: 'string',
               title: '角色名',
             },
+            title: {
+              type: 'string',
+              title: '角色标题',
+            },
+            locales: {
+              type: 'object',
+              additionalProperties: {
+                type: 'string',
+              },
+              title: '角色本地化文本',
+            },
+            siteIds: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
           },
-          required: ['createdAt', 'updatedAt', 'id', 'name'],
+          required: ['createdAt', 'updatedAt', 'id', 'name', 'title', 'siteIds'],
           title: '角色',
         },
         'a-jwt.dto.jwtToken': {
@@ -393,6 +410,22 @@ export default defineFakeRoute([
             auth: {
               id: 1,
             },
+            roles: [
+              {
+                id: 1,
+                name: 'registeredUser',
+                title: 'Registered User',
+                locales: { 'zh-cn': '注册用户' },
+                siteIds: ['web'],
+              },
+              {
+                id: 2,
+                name: 'systemAdmin',
+                title: 'System Administrator',
+                locales: { 'zh-cn': '系统管理员' },
+                siteIds: ['web', 'admin'],
+              },
+            ],
           },
           jwt: {
             accessToken: `accessToken-${user.name}`,
@@ -423,6 +456,22 @@ export default defineFakeRoute([
           auth: {
             id: 1,
           },
+          roles: [
+            {
+              id: 1,
+              name: 'registeredUser',
+              title: 'Registered User',
+              locales: { 'zh-cn': '注册用户' },
+              siteIds: ['web'],
+            },
+            {
+              id: 2,
+              name: 'systemAdmin',
+              title: 'System Administrator',
+              locales: { 'zh-cn': '系统管理员' },
+              siteIds: ['web', 'admin'],
+            },
+          ],
         },
       };
     },

package/zova/src/suite/a-home/modules/home-api/src/api/openapi/types.ts

@@ -1531,6 +1531,14 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      /** @description Role Title */
+      title: string;
+      /** @description Role Locales */
+      locales?:
+        | {
+            [key: string]: string;
+          }
+        | undefined;
       siteIds: string[];
     };
     'home-user.dto.passportJwt': {
@@ -3568,7 +3576,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3598,7 +3606,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3715,7 +3723,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3745,7 +3753,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -3797,7 +3805,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4408,7 +4416,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };
@@ -4438,7 +4446,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: unknown;
+            data: undefined;
           };
         };
       };

package/zova/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -83,6 +83,7 @@ declare module 'zova' {
 export * from '../component/itemLink/controller.jsx';
 export * from '../component/page/controller.jsx';
 export * from '../page/authCallback/controller.jsx';
+export * from '../page/errorAccessDenied/controller.jsx';
 export * from '../page/errorExpired/controller.jsx';
 export * from '../page/errorNotFound/controller.jsx';
 
@@ -108,6 +109,11 @@ declare module 'zova-module-home-base' {
           get scope(): ScopeModuleHomeBase;
         }
 
+        export interface ControllerPageErrorAccessDenied {
+          /** @internal */
+          get scope(): ScopeModuleHomeBase;
+        }
+
         export interface ControllerPageErrorExpired {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
@@ -123,6 +129,7 @@ declare module 'zova-module-home-base' {
 import { ControllerItemLink } from '../component/itemLink/controller.jsx';
 import { ControllerPage } from '../component/page/controller.jsx';
 import { ControllerPageAuthCallback } from '../page/authCallback/controller.jsx';
+import { ControllerPageErrorAccessDenied } from '../page/errorAccessDenied/controller.jsx';
 import { ControllerPageErrorExpired } from '../page/errorExpired/controller.jsx';
 import { ControllerPageErrorNotFound } from '../page/errorNotFound/controller.jsx';
 import 'zova';
@@ -131,6 +138,7 @@ declare module 'zova' {
     'home-base.controller.itemLink': ControllerItemLink;
 'home-base.controller.page': ControllerPage;
 'home-base.controller.pageAuthCallback': ControllerPageAuthCallback;
+'home-base.controller.pageErrorAccessDenied': ControllerPageErrorAccessDenied;
 'home-base.controller.pageErrorExpired': ControllerPageErrorExpired;
 'home-base.controller.pageErrorNotFound': ControllerPageErrorNotFound;
   }
@@ -139,6 +147,7 @@ declare module 'zova' {
 /** pages: begin */
 export * from './page/authCallback.js';
 import { NSControllerPageAuthCallback } from './page/authCallback.js';
+export * from './page/errorAccessDenied.js';
 export * from './page/errorExpired.js';
 import { NSControllerPageErrorExpired } from './page/errorExpired.js';
 export * from './page/errorNotFound.js';
@@ -148,6 +157,7 @@ import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
   '/home/base/authCallback': TypePagePathSchema<undefined,NSControllerPageAuthCallback.QueryInput>;
+'/home/base/errorAccessDenied': TypePagePathSchema<undefined,undefined>;
 '/home/base/errorExpired': TypePagePathSchema<undefined,NSControllerPageErrorExpired.QueryInput>;
 '/home/base//:catchAll(.*)*': TypePagePathSchema<undefined,undefined>;
 }

package/zova/src/suite/a-home/modules/home-base/src/page/errorAccessDenied/controller.tsx

@@ -31,7 +31,7 @@ export class ControllerPageErrorAccessDenied extends BeanControllerPageBase {
               this.app.$gotoHome();
             }}
           >
-            Go Home
+            {this.scope.locale.GoHome()}
           </button>
         </div>
       </div>