cabloy 5.1.148 → 5.1.150

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

@@ -1,9 +1,10 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
 import { DtoImageView } from 'vona-module-a-image';
-import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, $makeSchema, Api, 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';
@@ -11,7 +12,14 @@ import { ModelStudent } from '../model/student.ts';
 import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 import { DtoDetailRecordView } from './detailRecordView.tsx';
 
-export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
+const studentContentField = $makeSchema(
+  ZovaRender.fieldSource('content.descriptionMarkdown'),
+  ZovaRender.field('basic-markdown:formFieldMarkdown'),
+  v.optional(),
+  z.string(),
+);
+
+export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'_descriptionMarkdown'> {}
 
 @Dto<IDtoOptionsStudentView>({
   blocks: [
@@ -44,6 +52,16 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
                               },
                             ],
                           },
+                          {
+                            type: 'group',
+                            title: $locale('StudentContent'),
+                            children: [
+                              {
+                                type: 'section',
+                                children: [{ type: 'field', name: '_descriptionMarkdown' }],
+                              },
+                            ],
+                          },
                         ],
                       },
                       {
@@ -73,6 +91,7 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
     }),
   ],
   fields: {
+    _descriptionMarkdown: studentContentField,
     trainingRecords: $makeMetadata(
       v.title($locale('TrainingRecords')),
       ZovaRender.order(6),
@@ -81,7 +100,10 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
   },
 })
 export class DtoStudentView extends $Dto.get(() => ModelStudent, {
-  include: { trainingRecords: { dtoClass: DtoDetailRecordView } },
+  include: {
+    content: { columns: ['descriptionMarkdown'] },
+    trainingRecords: { dtoClass: DtoDetailRecordView },
+  },
 }) {
   @Api.field(
     ZovaRender.visible(false),

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

@@ -44,9 +44,6 @@ export class EntityStudent extends EntityBase {
   )
   name: string;
 
-  @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(2))
-  description?: string;
-
   @Api.field(
     v.title($locale('Mobile')),
     v.required(),

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

@@ -0,0 +1,36 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+
+import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { Entity, EntityBase } from 'vona-module-a-orm';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface IEntityOptionsStudentContent extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsStudentContent>('trainingStudentContent', {
+  openapi: { title: $locale('StudentContent') },
+  fields: {
+    id: $makeMetadata(ZovaRender.visible(false)),
+    iid: $makeMetadata(ZovaRender.visible(false)),
+    deleted: $makeMetadata(ZovaRender.visible(false)),
+    createdAt: $makeMetadata(ZovaRender.visible(false)),
+    updatedAt: $makeMetadata(ZovaRender.visible(false)),
+  },
+})
+export class EntityStudentContent extends EntityBase {
+  @Api.field(v.tableIdentity(), ZovaRender.visible(false))
+  studentId: TableIdentity;
+
+  @Api.field(
+    v.title($locale('DescriptionMarkdown')),
+    v.optional(),
+    ZovaRender.order(1),
+    ZovaRender.field('basic-markdown:formFieldMarkdown'),
+  )
+  descriptionMarkdown?: string;
+
+  @Api.field(v.title($locale('DescriptionHtml')), v.optional(), ZovaRender.visible(false))
+  descriptionHtml?: string;
+}

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

@@ -22,6 +22,12 @@ export interface IModelOptionsStudent extends IDecoratorModelOptions<EntityStude
         'description',
       ],
     }),
+    content: $relation.hasOne('training-student:studentContent', 'studentId', {
+      columns: ['id', 'descriptionMarkdown'],
+    }),
+    contentHtml: $relation.hasOne('training-student:studentContent', 'studentId', {
+      columns: ['id', 'descriptionHtml'],
+    }),
   },
 })
 export class ModelStudent extends BeanModelBase<EntityStudent> {}

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

@@ -0,0 +1,22 @@
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
+import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
+
+import { EntityStudentContent } from '../entity/studentContent.tsx';
+
+export interface IModelOptionsStudentContent extends IDecoratorModelOptions<EntityStudentContent> {}
+
+@Model<IModelOptionsStudentContent>({
+  entity: EntityStudentContent,
+  relations: {
+    student: $relation.belongsTo(
+      'training-student:studentContent',
+      'training-student:student',
+      'studentId',
+    ),
+  },
+  cache: {
+    modelsClear: 'training-student:student',
+  },
+})
+export class ModelStudentContent extends BeanModelBase<EntityStudentContent> {}

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

@@ -12,18 +12,30 @@ import type { DtoStudentView } from '../dto/studentView.tsx';
 import type { EntityStudent } from '../entity/student.tsx';
 import type { ModelStudent } from '../model/student.ts';
 
-function getStudentRecordSubjectsInclude(): {
+type StudentContentInput = {
+  descriptionMarkdown?: string;
+};
+
+function getStudentRelationsInclude(): {
+  content: true;
   trainingRecords: { include: { trainingRecordSubjects: true } };
 } {
-  return { trainingRecords: { include: { trainingRecordSubjects: true } } };
+  return {
+    content: true,
+    trainingRecords: { include: { trainingRecordSubjects: true } },
+  };
 }
 
 @Service()
 export class ServiceStudent extends BeanBase {
   async create(student: DtoStudentCreate): Promise<EntityStudent> {
-    return await this.scope.model.student.insert(student, {
-      include: getStudentRecordSubjectsInclude(),
-    });
+    return await this.scope.model.student.insert(
+      {
+        ...student,
+        content: this._prepareContent(student.content),
+      },
+      { include: getStudentRelationsInclude() },
+    );
   }
 
   async select(params?: IQueryParams<ModelStudent>): Promise<DtoStudentSelectRes> {
@@ -32,20 +44,28 @@ export class ServiceStudent extends BeanBase {
 
   async view(id: TableIdentity): Promise<DtoStudentView | undefined> {
     return await this.scope.model.student.getById(id, {
-      include: getStudentRecordSubjectsInclude(),
+      include: getStudentRelationsInclude(),
     });
   }
 
   async update(id: TableIdentity, student: DtoStudentUpdate) {
-    return await this.scope.model.student.updateById(id, student, {
-      include: getStudentRecordSubjectsInclude(),
-    });
+    const content = Object.hasOwn(student, 'content')
+      ? this._prepareContent(student.content)
+      : undefined;
+    return await this.scope.model.student.updateById(
+      id,
+      content === undefined ? student : { ...student, content },
+      { include: getStudentRelationsInclude() },
+    );
   }
 
   async summary(id: TableIdentity): Promise<DtoStudentSummary | undefined> {
-    const student = await this.scope.model.student.getById(id);
+    const student = await this.scope.model.student.getById(id, {
+      include: { content: true, contentHtml: true },
+    });
     if (!student) return undefined;
-    const descriptionLength = student.description?.length ?? 0;
+    const descriptionMarkdown = student.content?.descriptionMarkdown;
+    const descriptionLength = descriptionMarkdown?.length ?? 0;
     const levelTitle = String(student.level);
     return {
       id: student.id,
@@ -53,7 +73,8 @@ export class ServiceStudent extends BeanBase {
       mobile: student.mobile,
       level: student.level,
       levelTitle,
-      description: student.description,
+      descriptionMarkdown,
+      descriptionHtml: student.contentHtml?.descriptionHtml,
       descriptionLength,
       summaryText: `${student.name} is in level ${student.level}. Description length: ${descriptionLength}.`,
     };
@@ -61,14 +82,22 @@ export class ServiceStudent extends BeanBase {
 
   async delete(id: TableIdentity) {
     return await this.scope.model.student.deleteById(id, {
-      include: getStudentRecordSubjectsInclude(),
+      include: getStudentRelationsInclude(),
     });
   }
 
   async deleteForce(id: TableIdentity) {
     return await this.scope.model.student.deleteById(id, {
       disableDeleted: true,
-      include: getStudentRecordSubjectsInclude(),
+      include: getStudentRelationsInclude(),
     });
   }
+
+  private _prepareContent(content: StudentContentInput | undefined) {
+    const descriptionMarkdown = content?.descriptionMarkdown ?? '';
+    return {
+      descriptionMarkdown,
+      descriptionHtml: this.bean.markdown.renderHtml(descriptionMarkdown),
+    };
+  }
 }

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

@@ -25,17 +25,36 @@ describe('student.test.ts', () => {
         const formLayout =
           blocks?.[0]?.options?.blocks?.[0]?.options?.blocks?.[0]?.options?.formLayout;
         const tabs = formLayout?.children[0];
-        const profileSection = tabs?.children[0]?.children[0]?.children[0];
+        const groups = tabs?.children[0]?.children;
+        const profileSection = groups?.[0]?.children[0];
+        const studentContentSection = groups?.[1]?.children[0];
         const trainingRecordsSection = tabs?.children[1]?.children[1];
         assert.equal(tabs?.type, 'tabs');
         assert.equal(tabs?.id, undefined);
         assert.equal(tabs?.children[1]?.type, 'tab');
         assert.equal(tabs?.children[1]?.id, undefined);
+        assert.equal(groups?.length, 2);
+        assert.deepEqual(
+          groups?.map(item => item.type),
+          ['group', 'group'],
+        );
         assert.deepEqual(profileSection?.columns, { default: 1, md: 2 });
         assert.deepEqual(
           profileSection?.children.map(item => item.name),
           ['name', 'mobile', 'imageId'],
         );
+        const descriptionFieldName =
+          DtoClass === DtoStudentView ? '_descriptionMarkdown' : 'content';
+        assert.deepEqual(
+          studentContentSection?.children.map(item => item.name),
+          [descriptionFieldName],
+        );
+        const descriptionField = (component as any).properties[descriptionFieldName];
+        assert.equal(descriptionField.rest.fieldSource, 'content.descriptionMarkdown');
+        assert.equal(descriptionField.rest.form.render, 'basic-markdown:formFieldMarkdown');
+        if (DtoClass === DtoStudentView) {
+          assert.equal((component as any).required?.includes('_descriptionMarkdown'), false);
+        }
         assert.equal(tabs?.children[1]?.children[0]?.name, 'level');
         assert.deepEqual(
           trainingRecordsSection?.children.map(item => item.name),
@@ -92,7 +111,8 @@ describe('student.test.ts', () => {
           'name',
           'mobile',
           'level',
-          'description',
+          'descriptionMarkdown',
+          'descriptionHtml',
           'levelTitle',
           'descriptionLength',
           'summaryText',
@@ -118,9 +138,13 @@ describe('student.test.ts', () => {
       const maskedMobileUpdate = '139****4321';
       const trainingTime = new Date('2026-03-10T08:00:00.000Z');
       const trainingTimeUpdate = new Date('2026-04-18T13:20:00.000Z');
+      const description =
+        `# Student profile\n\n${'This is a long Markdown description. '.repeat(10)}`.trim();
+      const descriptionUpdate =
+        `## Updated profile\n\n${'This is updated Markdown content. '.repeat(10)}`.trim();
       const data = {
         name: '__Tom__',
-        description: 'This is a test',
+        content: { descriptionMarkdown: description },
         mobile,
         level: 1,
         trainingRecords: [
@@ -157,6 +181,7 @@ describe('student.test.ts', () => {
       assert.equal(!!studentItem, true);
       assert.equal(studentItem!.level, data.level);
       assert.equal(studentItem!.mobile, maskedMobile);
+      assert.equal((studentItem as any).description, undefined);
       // findMany: level filter
       const selectResByLevel: DtoStudentSelectRes = await app.bean.executor.performAction(
         'get',
@@ -182,6 +207,7 @@ describe('student.test.ts', () => {
       const record = student.trainingRecords?.[0];
       const recordSubject = record?.trainingRecordSubjects?.[0];
       assert.equal(student.trainingRecords?.length, 1);
+      assert.equal(student.content?.descriptionMarkdown, description);
       assert.equal(record?.name, '__Record__');
       assert.equal(record?.subjectCount, 1);
       assert.equal(record?.totalScore, 88);
@@ -193,7 +219,7 @@ describe('student.test.ts', () => {
       // update
       const dataUpdate = {
         name: '__TomNew__',
-        description: 'This is a test',
+        content: { descriptionMarkdown: descriptionUpdate },
         mobile: mobileUpdate,
         level: 2,
         trainingRecords: [
@@ -236,6 +262,7 @@ describe('student.test.ts', () => {
       assert.equal(student.name, dataUpdate.name);
       assert.equal(student.level, dataUpdate.level);
       assert.equal(student.mobile, maskedMobileUpdate);
+      assert.equal(student.content?.descriptionMarkdown, descriptionUpdate);
       assert.equal(student.trainingRecords?.length, 1);
       assert.equal(updatedRecord?.name, '__RecordNew__');
       assert.equal(updatedRecord?.subjectCount, 2);
@@ -254,6 +281,15 @@ describe('student.test.ts', () => {
         disableDeleted: true,
       });
       assert.equal(studentRaw!.mobile, mobileUpdate);
+      assert.equal((studentRaw as any).description, undefined);
+      const studentContent = await app
+        .scope('training-student')
+        .model.studentContent.get({ studentId });
+      assert.equal(studentContent?.descriptionMarkdown, descriptionUpdate);
+      assert.equal(
+        studentContent?.descriptionHtml,
+        app.bean.markdown.renderHtml(descriptionUpdate),
+      );
       // summary
       const summary: DtoStudentSummary = await app.bean.executor.performAction(
         'get',
@@ -263,7 +299,9 @@ describe('student.test.ts', () => {
       assert.equal(summary.name, dataUpdate.name);
       assert.equal(summary.mobile, maskedMobileUpdate);
       assert.equal(summary.level, dataUpdate.level);
-      assert.equal(summary.descriptionLength, dataUpdate.description?.length);
+      assert.equal(summary.descriptionMarkdown, descriptionUpdate);
+      assert.equal(summary.descriptionHtml, app.bean.markdown.renderHtml(descriptionUpdate));
+      assert.equal(summary.descriptionLength, descriptionUpdate.length);
       assert.equal(typeof summary.levelTitle, 'string');
       assert.equal(typeof summary.summaryText, 'string');
       // delete
@@ -271,6 +309,14 @@ describe('student.test.ts', () => {
         params: { id: student.id },
       });
       assert.equal(deleteRes, null);
+      const studentContentDeleted = await app
+        .scope('training-student')
+        .model.studentContent.get({ studentId }, { disableDeleted: true });
+      assert.equal(studentContentDeleted?.deleted, true);
+      assert.equal(
+        await app.scope('training-student').model.studentContent.get({ studentId }),
+        undefined,
+      );
       // findOne
       student = await app.bean.executor.performAction('get', '/training/student/:id', {
         params: { id: student.id },
@@ -294,11 +340,94 @@ describe('student.test.ts', () => {
           disableDeleted: true,
         });
       assert.equal(studentForce, undefined);
+      assert.equal(
+        await app
+          .scope('training-student')
+          .model.studentContent.get({ studentId: studentIdForce }, { disableDeleted: true }),
+        undefined,
+      );
       // logout
       await app.bean.passport.signout();
     });
   });
 
+  it('action:student:contentPersistence', 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: '__ContentStudent__',
+            mobile: '13812345678',
+            level: 1,
+          },
+        });
+        const studentContentModel = app.scope('training-student').model.studentContent;
+        const createdContent = await studentContentModel.get({ studentId });
+        assert.equal(createdContent?.descriptionMarkdown, '');
+        assert.equal(createdContent?.descriptionHtml, '');
+
+        await app.bean.executor.performAction('patch', '/training/student/:id', {
+          params: { id: studentId },
+          body: {
+            name: '__ContentStudentUpdated__',
+            mobile: '13812345678',
+            level: 1,
+          },
+        });
+        const preservedContent = await studentContentModel.get({ studentId });
+        assert.equal(preservedContent?.descriptionMarkdown, '');
+        assert.equal(preservedContent?.descriptionHtml, '');
+
+        const markdown = '  ## Created later  ';
+        await app.bean.executor.performAction('patch', '/training/student/:id', {
+          params: { id: studentId },
+          body: {
+            name: '__ContentStudentUpdated__',
+            mobile: '13812345678',
+            level: 1,
+            content: {
+              descriptionMarkdown: markdown,
+              descriptionHtml: '<p>Forged HTML</p>',
+            },
+          },
+        });
+        const studentContent = await studentContentModel.get({ studentId });
+        assert.equal(studentContent?.descriptionMarkdown, markdown);
+        assert.equal(studentContent?.descriptionHtml, app.bean.markdown.renderHtml(markdown));
+        assert.notEqual(studentContent?.descriptionHtml, '<p>Forged HTML</p>');
+
+        const whitespaceMarkdown = ' \n\t ';
+        await app.bean.executor.performAction('patch', '/training/student/:id', {
+          params: { id: studentId },
+          body: {
+            name: '__ContentStudentUpdated__',
+            mobile: '13812345678',
+            level: 1,
+            content: { descriptionMarkdown: whitespaceMarkdown },
+          },
+        });
+        const whitespaceContent = await studentContentModel.get({ studentId });
+        assert.equal(whitespaceContent?.descriptionMarkdown, whitespaceMarkdown);
+        assert.equal(
+          whitespaceContent?.descriptionHtml,
+          app.bean.markdown.renderHtml(whitespaceMarkdown),
+        );
+      } 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:systemAdmin', async () => {
     await app.bean.executor.mockCtx(async () => {
       await app.bean.passport.signinMock();
@@ -327,7 +456,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            description: 'This is a test',
+            content: { descriptionMarkdown: 'This is a test' },
             mobile: '13812345678',
             level: 4,
           },
@@ -344,7 +473,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            description: 'This is a test',
+            content: { descriptionMarkdown: 'This is a test' },
             level: 1,
           },
         });
@@ -360,7 +489,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            description: 'This is a test',
+            content: { descriptionMarkdown: 'This is a test' },
             mobile: '1381234567',
             level: 1,
           },

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.153",
+  "version": "5.1.155",
   "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.152"
+    "zova-suite-a-zova": "^5.1.154"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -870,7 +870,7 @@ importers:
         specifier: ^5.1.88
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.152
+        specifier: ^5.1.153
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -1076,7 +1076,7 @@ importers:
         specifier: ^5.1.25
         version: link:modules/a-fetch
       zova-module-a-form:
-        specifier: ^5.1.48
+        specifier: ^5.1.49
         version: link:modules/a-form
       zova-module-a-icon:
         specifier: ^5.1.27
@@ -1804,6 +1804,10 @@ importers:
         version: link:modules/training-student
 
   src/suite/a-training/modules/training-student:
+    dependencies:
+      zova-module-basic-markdown:
+        specifier: ^5.0.0
+        version: link:../../../cabloy-basic/modules/basic-markdown
     devDependencies:
       clean-package:
         specifier: ^2.2.0

package/zova/src/suite/a-commerce/modules/commerce-trade/cli/openapi.config.ts

@@ -11,6 +11,7 @@ export default function (): ZovaOpenapiConfigModule {
         'CommerceTradeCart_clear',
         'CommerceTradeCheckout_paymentMethods',
         'CommerceTradeCheckout_create',
+        'CommerceTradeStockBalance_adjustStock',
         'CommerceTradeOrder_select',
         'CommerceTradeOrder_view',
         'CommerceTradeOrder_ship',

package/zova/src/suite/a-commerce/modules/commerce-trade/package.json

@@ -52,5 +52,10 @@
       "exports.\\..import"
     ]
   },
-  "title": "commerce-trade"
+  "title": "commerce-trade",
+  "zovaModule": {
+    "dependencies": {
+      "basic-app": "5.0.0"
+    }
+  }
 }

package/zova/src/suite/a-commerce/modules/commerce-trade/src/.metadata/component/tableCellActionAdjustStock.ts

@@ -0,0 +1,34 @@
+import type { TypeControllerInnerProps } from 'zova';
+
+import { defineComponent } from 'vue';
+import { prepareComponentOptions, useController } from 'zova';
+
+import type { ControllerTableCellActionAdjustStockProps } from '../../component/tableCellActionAdjustStock/controller.jsx';
+
+import { ControllerTableCellActionAdjustStock } from '../../component/tableCellActionAdjustStock/controller.jsx';
+export type ZTableCellActionAdjustStockProps = {
+  controllerRef?: (ref: ControllerTableCellActionAdjustStock) => void;
+} & ControllerTableCellActionAdjustStockProps;
+
+type ControllerInnerProps = TypeControllerInnerProps<
+  ControllerTableCellActionAdjustStockProps,
+  keyof typeof ControllerTableCellActionAdjustStock.$propsDefault
+>;
+declare module 'zova-module-commerce-trade' {
+  export interface ControllerTableCellActionAdjustStock {
+    $props: ControllerInnerProps;
+  }
+}
+
+export const ZTableCellActionAdjustStock = defineComponent(
+  (_props: ZTableCellActionAdjustStockProps) => {
+    useController(ControllerTableCellActionAdjustStock, undefined, undefined);
+    return () => {};
+  },
+  prepareComponentOptions(),
+);
+declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    'commerce-trade:tableCellActionAdjustStock': ControllerTableCellActionAdjustStockProps;
+  }
+}