cabloy 5.1.158 → 5.1.159

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/zh-cn.ts

@@ -1,6 +1,7 @@
 export default {
   Available: '可用库存',
   Category: '分类',
+  CreateProduct: '新建商品',
   Description: '描述',
   DescriptionHtml: '商品描述（HTML）',
   DescriptionMarkdown: '商品描述（Markdown）',
@@ -15,6 +16,8 @@ export default {
   Unpublished: '未发布',
   Sku: 'SKU',
   SkuAttributeName: 'SKU 属性名',
+  UpdateProduct: '编辑商品',
+  ViewProduct: '商品详情',
   SkuAttributeValue: 'SKU 属性值',
   SkuAttributes: 'SKU 属性',
   SkuCode: 'SKU 编码',

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productCreate.tsx

@@ -11,6 +11,7 @@ import { ModelProduct } from '../model/product.ts';
 export interface IDtoOptionsProductCreate extends IDecoratorDtoOptions<'productContentForm'> {}
 
 @Dto<IDtoOptionsProductCreate>({
+  openapi: { title: $locale('CreateProduct') },
   fields: {
     productContentForm: $makeMetadata(
       ZovaRender.fieldSource('productContentForm.descriptionMarkdown'),
@@ -19,6 +20,7 @@ export interface IDtoOptionsProductCreate extends IDecoratorDtoOptions<'productC
   },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
+      pageTitleKey: 'title',
       blocks: [
         ZovaRender.block('basic-pageentry:blockForm', {
           blocks: [

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productUpdate.tsx

@@ -11,6 +11,7 @@ import { ModelProduct } from '../model/product.ts';
 export interface IDtoOptionsProductUpdate extends IDecoratorDtoOptions<'productContentForm'> {}
 
 @Dto<IDtoOptionsProductUpdate>({
+  openapi: { title: $locale('UpdateProduct') },
   fields: {
     productContentForm: $makeMetadata(
       ZovaRender.fieldSource('productContentForm.descriptionMarkdown'),
@@ -19,6 +20,7 @@ export interface IDtoOptionsProductUpdate extends IDecoratorDtoOptions<'productC
   },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
+      pageTitleKey: 'title',
       blocks: [
         ZovaRender.block('basic-pageentry:blockForm', {
           blocks: [

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productView.tsx

@@ -11,6 +11,7 @@ import { ModelProduct } from '../model/product.ts';
 export interface IDtoOptionsProductView extends IDecoratorDtoOptions<'productContentForm'> {}
 
 @Dto<IDtoOptionsProductView>({
+  openapi: { title: $locale('ViewProduct') },
   fields: {
     productContentForm: $makeMetadata(
       ZovaRender.fieldSource('productContentForm.descriptionMarkdown'),
@@ -19,6 +20,7 @@ export interface IDtoOptionsProductView extends IDecoratorDtoOptions<'productCon
   },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
+      pageTitleKey: 'title',
       blocks: [
         ZovaRender.block('basic-pageentry:blockForm', {
           blocks: [

package/vona/src/suite/a-training/modules/training-record/src/dto/recordCreate.tsx

@@ -14,6 +14,7 @@ import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx'
 export interface IDtoOptionsRecordCreate extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsRecordCreate>({
+  openapi: { title: $locale('AddTrainingRecord') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

package/vona/src/suite/a-training/modules/training-record/src/dto/recordSelectReq.tsx

@@ -1,12 +1,11 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { $makeSchema, $resourceName, v } from 'vona-module-a-openapiutils';
+import { $makeSchema, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
-import { $locale } from '../.metadata/locales.ts';
 import { EntityRecord } from '../entity/record.tsx';
 
 export interface IDtoOptionsRecordSelectReq extends IDecoratorDtoOptions {}
@@ -16,12 +15,9 @@ export interface IDtoOptionsRecordSelectReq extends IDecoratorDtoOptions {}
   fields: {
     name: $makeSchema(v.optional(), z.string()),
     studentId: $makeSchema(
-      v.title($locale('Student')),
-      ZovaRender.field('basic-resource:formFieldResourcePicker', {
-        resource: $resourceName('training-student:student'),
-      }),
+      ZovaRender.field('basic-input:formFieldInput'),
       v.optional(),
-      z.number(),
+      z.string(),
     ),
     createdAt: $makeSchema(
       ZovaRender.field('basic-date:formFieldDateRange'),

package/vona/src/suite/a-training/modules/training-record/src/dto/recordUpdate.tsx

@@ -14,6 +14,7 @@ import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx'
 export interface IDtoOptionsRecordUpdate extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsRecordUpdate>({
+  openapi: { title: $locale('EditTrainingRecord') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

package/vona/src/suite/a-training/modules/training-record/src/dto/recordView.tsx

@@ -15,6 +15,7 @@ import { DtoDetailRecordSubjectView } from './detailRecordSubjectView.tsx';
 export interface IDtoOptionsRecordView extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsRecordView>({
+  openapi: { title: $locale('ViewTrainingRecord') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

package/vona/src/suite/a-training/modules/training-record/src/entity/record.tsx

@@ -42,7 +42,15 @@ export class EntityRecord extends EntityBase {
   @Api.field(
     v.title($locale('Student')),
     v.required(),
+    v.filter({
+      table: 'trainingStudent',
+      joinType: 'innerJoin',
+      joinOn: ['studentId', 'trainingStudent.id'],
+      originalName: 'name',
+      op: '_includesI_',
+    }),
     ZovaRender.order(2),
+    ZovaRender.column({ enableSorting: true }),
     ZovaRender.field('basic-resource:formFieldResourcePicker', {
       resource: $resourceName('training-student:student'),
     }),

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

@@ -1,14 +1,17 @@
 import type { DtoRecordCreate, DtoRecordUpdate } from 'vona-module-training-record';
 import type { DtoStudentCreate } from 'vona-module-training-student';
 
+import { ZodMetadata } from '@cabloy/zod-openapi';
 import fse from 'fs-extra';
 import assert from 'node:assert';
 import os from 'node:os';
 import path from 'node:path';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
+import { getTargetDecoratorRules } from 'vona-module-a-openapiutils';
 
 import { DtoDetailRecordSubjectResItem } from '../src/dto/detailRecordSubjectResItem.tsx';
+import { DtoRecordSelectReq } from '../src/dto/recordSelectReq.tsx';
 import { DtoRecordSelectResItem } from '../src/dto/recordSelectResItem.tsx';
 import { DtoRecordView } from '../src/dto/recordView.tsx';
 
@@ -27,6 +30,38 @@ describe('record.test.ts', () => {
       assert.ok(subjectComponent?.properties?._lineNumber);
       assert.equal(subjectComponent.required?.includes('_lineNumber'), false);
 
+      const selectReqRules = getTargetDecoratorRules(DtoRecordSelectReq.prototype);
+      const studentIdMetadata = ZodMetadata.getOpenapiMetadata(selectReqRules.studentId!);
+      assert.equal(selectReqRules.studentId?.type, 'optional');
+      assert.deepEqual(studentIdMetadata?.filter, {
+        table: 'trainingStudent',
+        joinType: 'innerJoin',
+        joinOn: ['studentId', 'trainingStudent.id'],
+        originalName: 'name',
+        op: '_includesI_',
+      });
+
+      const controller = app.bean.onion.controller
+        .getOnionsEnabledCached()
+        .find(item => item.beanOptions.beanFullName === 'training-record.controller.record')
+        ?.beanOptions.beanClass;
+      if (!controller) throw new Error('training-record.controller.record not found');
+      const controllerApiJson = await app.bean.openapi.generateJsonOfControllerAction(
+        controller,
+        'select',
+        'V31',
+      );
+      const parameters = controllerApiJson.paths?.['/api/training/record']?.get?.parameters ?? [];
+      const studentIdParameter = parameters.find(parameter => parameter.name === 'studentId');
+      assert.ok(studentIdParameter);
+      assert.equal(studentIdParameter.in, 'query');
+      assert.equal(studentIdParameter.required, false);
+      assert.deepEqual(studentIdParameter.schema?.type, ['string', 'null']);
+      assert.equal(
+        parameters.some(parameter => parameter.name === 'studentName'),
+        false,
+      );
+
       for (const [DtoClass, hasTrainingRecordSubjects] of [
         [DtoRecordSelectResItem, false],
         [DtoRecordView, true],
@@ -49,6 +84,7 @@ describe('record.test.ts', () => {
           'id',
           'name',
         ]);
+        assert.equal(component.properties.studentId.rest.table.enableSorting, true);
       }
     });
   });
@@ -123,6 +159,21 @@ describe('record.test.ts', () => {
         assert.equal(String(recordItem!.studentId), String(studentId));
         assert.equal(String(recordItem!.student?.id), String(studentId));
         assert.equal(recordItem!.student?.name, studentData.name);
+
+        const filteredSelectRes: any = await app.bean.executor.performAction(
+          'get',
+          '/training/record',
+          { query: { studentId: 'tude' } },
+        );
+        assert.equal(
+          filteredSelectRes.list.some((item: any) => String(item.id) === String(recordId)),
+          true,
+        );
+        assert.equal(
+          filteredSelectRes.list.every((item: any) => item.student?.name.includes('tude')),
+          true,
+        );
+
         assert.equal(recordItem!.dossierFiles?.length, 1);
         assert.equal(recordItem!.dossierFiles?.[0]?.filename, 'attendance.txt');
 

package/vona/src/suite/a-training/modules/training-student/src/config/locale/en-us.ts

@@ -5,6 +5,9 @@ export default {
   StudentContent: 'Student Content',
   Level: 'Training Stage',
   BasicInformation: 'Basic Information',
+  AddStudent: 'Add Student',
+  EditStudent: 'Edit Student',
+  ViewStudent: 'View Student',
   StudentProfile: 'Student Profile',
   LevelAdvanced: 'Advanced Workshop',
   LevelBeginner: 'Foundation Track',

package/vona/src/suite/a-training/modules/training-student/src/config/locale/zh-cn.ts

@@ -5,6 +5,9 @@ export default {
   StudentContent: '学生内容',
   Level: '培训阶段',
   BasicInformation: '基本信息',
+  AddStudent: '添加学生',
+  EditStudent: '编辑学生',
+  ViewStudent: '查看学生',
   StudentProfile: '学生资料',
   LevelAdvanced: '高级研修班',
   LevelBeginner: '基础班',

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

@@ -18,6 +18,7 @@ const studentContentField = $makeMetadata(
 export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions<'content'> {}
 
 @Dto<IDtoOptionsStudentCreate>({
+  openapi: { title: $locale('AddStudent') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

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

@@ -63,6 +63,7 @@ export class DtoStudentSelectResItem extends $Dto.get(() => ModelStudent) {
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),
+    ZovaRender.column({ align: 'center', width: 360, fixed: 'right' }),
     ZovaRender.cell('basic-table:actionOperationsRow', {
       actions: [
         ZovaRender.tableActionRow('training-student:actionSummary', {

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

@@ -18,6 +18,7 @@ const studentContentField = $makeMetadata(
 export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions<'content'> {}
 
 @Dto<IDtoOptionsStudentUpdate>({
+  openapi: { title: $locale('EditStudent') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

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

@@ -22,6 +22,7 @@ const studentContentField = $makeSchema(
 export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'_descriptionMarkdown'> {}
 
 @Dto<IDtoOptionsStudentView>({
+  openapi: { title: $locale('ViewStudent') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

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

@@ -19,11 +19,12 @@ export interface IEntityOptionsStudent extends IDecoratorEntityOptions {}
 @Entity<IEntityOptionsStudent>('trainingStudent', {
   openapi: { title: $locale('Student') },
   fields: {
-    id: $makeMetadata(ZovaRender.order(1, 'core')),
+    id: $makeMetadata(ZovaRender.order(1, 'core'), ZovaRender.column({ width: 50, fixed: 'left' })),
     iid: $makeMetadata(ZovaRender.visible(false)),
     deleted: $makeMetadata(ZovaRender.visible(false)),
     createdAt: $makeMetadata(
       ZovaRender.order(-2, 'max'),
+      ZovaRender.column({ align: 'center', width: 180, enableSorting: true }),
       ZovaRender.field('basic-date:formFieldDate'),
       ZovaRender.cell('basic-date:date'),
     ),
@@ -40,6 +41,13 @@ export class EntityStudent extends EntityBase {
     v.required(),
     v.min(2),
     ZovaRender.order(1),
+    ZovaRender.column({
+      align: 'left',
+      width: 240,
+      fixed: 'left',
+      enableSorting: true,
+      sortDescFirst: true,
+    }),
     ZovaRender.cell('basic-table:actionView'),
   )
   name: string;
@@ -82,6 +90,7 @@ export class EntityStudent extends EntityBase {
     v.title($locale('Level')),
     v.required(),
     ZovaRender.order(5),
+    ZovaRender.column({ align: 'center', width: 140, enableSorting: true }),
     // Tutorial 3 built-in form renderer example. Keep it commented here for side-by-side comparison.
     // ZovaRender.field('basic-select:formFieldSelect', {
     //   items: studentLevelItems,

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

@@ -13,7 +13,7 @@ import {
 import { DtoDetailRecordResItem } from '../src/dto/detailRecordResItem.tsx';
 import { DtoStudentSummary } from '../src/dto/studentSummary.tsx';
 
-describe('student.test.ts', () => {
+describe('student.test.ts', { concurrency: false }, () => {
   it('action:student:formLayoutMetadata', async () => {
     await app.bean.executor.mockCtx(async () => {
       for (const DtoClass of [DtoStudentCreate, DtoStudentUpdate, DtoStudentView]) {
@@ -95,6 +95,104 @@ describe('student.test.ts', () => {
     });
   });
 
+  it('action:student:tableColumnMetadata', 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;
+      }) as any;
+      assert.deepEqual(
+        {
+          align: component.properties.name.rest.table.align,
+          width: component.properties.name.rest.table.width,
+          fixed: component.properties.name.rest.table.fixed,
+          enableSorting: component.properties.name.rest.table.enableSorting,
+        },
+        { align: 'left', width: 240, fixed: 'left', enableSorting: true },
+      );
+      assert.deepEqual(
+        {
+          align: component.properties.level.rest.table.align,
+          width: component.properties.level.rest.table.width,
+          enableSorting: component.properties.level.rest.table.enableSorting,
+        },
+        { align: 'center', width: 140, enableSorting: true },
+      );
+      assert.deepEqual(
+        {
+          align: component.properties.createdAt.rest.table.align,
+          width: component.properties.createdAt.rest.table.width,
+          enableSorting: component.properties.createdAt.rest.table.enableSorting,
+        },
+        { align: 'center', width: 180, enableSorting: true },
+      );
+      assert.deepEqual(
+        {
+          align: component.properties._operationsRow.rest.table.align,
+          width: component.properties._operationsRow.rest.table.width,
+          fixed: component.properties._operationsRow.rest.table.fixed,
+        },
+        { align: 'center', width: 360, fixed: 'right' },
+      );
+    });
+  });
+
+  it('action:student:serverSorting', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      const studentIds: string[] = [];
+      const names = ['__StudentSortA__', '__StudentSortZ__'];
+      try {
+        for (const [index, name] of names.entries()) {
+          const studentId = await app.bean.executor.performAction('post', '/training/student', {
+            body: {
+              name,
+              mobile: `13812345${678 + index}`,
+              level: 1,
+            },
+          });
+          studentIds.push(studentId);
+        }
+        const ascending: DtoStudentSelectRes = await app.bean.executor.performAction(
+          'get',
+          '/training/student',
+          { query: { orders: [['name', 'asc']] } },
+        );
+        const descending: DtoStudentSelectRes = await app.bean.executor.performAction(
+          'get',
+          '/training/student',
+          { query: { orders: [['name', 'desc']] } },
+        );
+        const ascendingIndexes = names.map(name =>
+          ascending.list.findIndex(item => item.name === name),
+        );
+        const descendingIndexes = names.map(name =>
+          descending.list.findIndex(item => item.name === name),
+        );
+        assert.equal(
+          ascendingIndexes.every(index => index >= 0),
+          true,
+        );
+        assert.equal(
+          descendingIndexes.every(index => index >= 0),
+          true,
+        );
+        assert.equal(ascendingIndexes[0] < ascendingIndexes[1], true);
+        assert.equal(descendingIndexes[0] > descendingIndexes[1], true);
+      } 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:emittedDtoSchemas', async () => {
     await app.bean.executor.mockCtx(async () => {
       const summaryApiJson = await app.bean.openapi.generateJsonOfClass(DtoStudentSummary);

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.50",
+  "version": "5.1.51",
   "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.4",
+    "vona-module-a-rbac": "^5.0.5",
     "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.20",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

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