cabloy 5.1.149 → 5.1.150

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

@@ -12,33 +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 } } };
-}
-
-function getStudentContentFormInclude() {
-  return { studentContentForm: true };
-}
-
-function getStudentContentInclude() {
-  return { studentContent: true };
+  return {
+    content: true,
+    trainingRecords: { include: { trainingRecordSubjects: true } },
+  };
 }
 
 @Service()
 export class ServiceStudent extends BeanBase {
   async create(student: DtoStudentCreate): Promise<EntityStudent> {
-    const { studentContentForm, ...studentFields } = student as DtoStudentCreate & {
-      studentContentForm?: { descriptionMarkdown?: string };
-    };
-    const created = await this.scope.model.student.insert(studentFields, {
-      include: getStudentRecordSubjectsInclude(),
-    });
-    if (studentContentForm !== undefined) {
-      await this._updateStudentContent(created.id, studentContentForm.descriptionMarkdown);
-    }
-    return created;
+    return await this.scope.model.student.insert(
+      {
+        ...student,
+        content: this._prepareContent(student.content),
+      },
+      { include: getStudentRelationsInclude() },
+    );
   }
 
   async select(params?: IQueryParams<ModelStudent>): Promise<DtoStudentSelectRes> {
@@ -47,34 +44,28 @@ export class ServiceStudent extends BeanBase {
 
   async view(id: TableIdentity): Promise<DtoStudentView | undefined> {
     return await this.scope.model.student.getById(id, {
-      include: {
-        ...getStudentRecordSubjectsInclude(),
-        ...getStudentContentFormInclude(),
-      },
+      include: getStudentRelationsInclude(),
     });
   }
 
   async update(id: TableIdentity, student: DtoStudentUpdate) {
-    const { studentContentForm, ...studentFields } = student as DtoStudentUpdate & {
-      studentContentForm?: { descriptionMarkdown?: string };
-    };
-    const updateResult = await this.scope.model.student.updateById(id, studentFields, {
-      include: getStudentRecordSubjectsInclude(),
-    });
-    if (studentContentForm !== undefined) {
-      await this._updateStudentContent(id, studentContentForm.descriptionMarkdown);
-    }
-    return updateResult;
+    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, {
-      include: getStudentContentInclude(),
+      include: { content: true, contentHtml: true },
     });
     if (!student) return undefined;
-    const description = student.studentContent?.descriptionMarkdown;
-    const descriptionHtml = student.studentContent?.descriptionHtml;
-    const descriptionLength = description?.length ?? 0;
+    const descriptionMarkdown = student.content?.descriptionMarkdown;
+    const descriptionLength = descriptionMarkdown?.length ?? 0;
     const levelTitle = String(student.level);
     return {
       id: student.id,
@@ -82,50 +73,31 @@ export class ServiceStudent extends BeanBase {
       mobile: student.mobile,
       level: student.level,
       levelTitle,
-      description,
-      descriptionHtml,
+      descriptionMarkdown,
+      descriptionHtml: student.contentHtml?.descriptionHtml,
       descriptionLength,
       summaryText: `${student.name} is in level ${student.level}. Description length: ${descriptionLength}.`,
     };
   }
 
   async delete(id: TableIdentity) {
-    await this.scope.model.studentContent.delete({ studentId: id });
     return await this.scope.model.student.deleteById(id, {
-      include: getStudentRecordSubjectsInclude(),
+      include: getStudentRelationsInclude(),
     });
   }
 
   async deleteForce(id: TableIdentity) {
-    await this.scope.model.studentContent.delete({ studentId: id }, { disableDeleted: true });
     return await this.scope.model.student.deleteById(id, {
       disableDeleted: true,
-      include: getStudentRecordSubjectsInclude(),
+      include: getStudentRelationsInclude(),
     });
   }
 
-  private async _updateStudentContent(
-    studentId: TableIdentity,
-    descriptionMarkdown?: string,
-  ): Promise<void> {
-    const markdown = descriptionMarkdown?.trim();
-    const studentContent = await this.scope.model.studentContent.get({ studentId });
-    if (!markdown) {
-      if (studentContent) await this.scope.model.studentContent.deleteById(studentContent.id);
-      return;
-    }
-    const descriptionHtml = this.bean.markdown.renderHtml(markdown);
-    if (studentContent) {
-      await this.scope.model.studentContent.updateById(studentContent.id, {
-        descriptionMarkdown: markdown,
-        descriptionHtml,
-      });
-    } else {
-      await this.scope.model.studentContent.insert({
-        studentId,
-        descriptionMarkdown: markdown,
-        descriptionHtml,
-      });
-    }
+  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

@@ -43,18 +43,18 @@ describe('student.test.ts', () => {
           profileSection?.children.map(item => item.name),
           ['name', 'mobile', 'imageId'],
         );
+        const descriptionFieldName =
+          DtoClass === DtoStudentView ? '_descriptionMarkdown' : 'content';
         assert.deepEqual(
           studentContentSection?.children.map(item => item.name),
-          ['studentContentForm'],
-        );
-        assert.equal(
-          component.properties.studentContentForm.rest.fieldSource,
-          'studentContentForm.descriptionMarkdown',
-        );
-        assert.equal(
-          component.properties.studentContentForm.rest.form.render,
-          'basic-markdown:formFieldMarkdown',
+          [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),
@@ -111,7 +111,7 @@ describe('student.test.ts', () => {
           'name',
           'mobile',
           'level',
-          'description',
+          'descriptionMarkdown',
           'descriptionHtml',
           'levelTitle',
           'descriptionLength',
@@ -144,7 +144,7 @@ describe('student.test.ts', () => {
         `## Updated profile\n\n${'This is updated Markdown content. '.repeat(10)}`.trim();
       const data = {
         name: '__Tom__',
-        studentContentForm: { descriptionMarkdown: description },
+        content: { descriptionMarkdown: description },
         mobile,
         level: 1,
         trainingRecords: [
@@ -207,7 +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.studentContentForm?.descriptionMarkdown, description);
+      assert.equal(student.content?.descriptionMarkdown, description);
       assert.equal(record?.name, '__Record__');
       assert.equal(record?.subjectCount, 1);
       assert.equal(record?.totalScore, 88);
@@ -219,7 +219,7 @@ describe('student.test.ts', () => {
       // update
       const dataUpdate = {
         name: '__TomNew__',
-        studentContentForm: { descriptionMarkdown: descriptionUpdate },
+        content: { descriptionMarkdown: descriptionUpdate },
         mobile: mobileUpdate,
         level: 2,
         trainingRecords: [
@@ -262,7 +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.studentContentForm?.descriptionMarkdown, descriptionUpdate);
+      assert.equal(student.content?.descriptionMarkdown, descriptionUpdate);
       assert.equal(student.trainingRecords?.length, 1);
       assert.equal(updatedRecord?.name, '__RecordNew__');
       assert.equal(updatedRecord?.subjectCount, 2);
@@ -299,7 +299,7 @@ describe('student.test.ts', () => {
       assert.equal(summary.name, dataUpdate.name);
       assert.equal(summary.mobile, maskedMobileUpdate);
       assert.equal(summary.level, dataUpdate.level);
-      assert.equal(summary.description, descriptionUpdate);
+      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');
@@ -309,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 },
@@ -355,45 +363,56 @@ describe('student.test.ts', () => {
             level: 1,
           },
         });
-        assert.equal(
-          await app.scope('training-student').model.studentContent.get({ studentId }),
-          undefined,
-        );
+        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: '__ContentStudent__',
+            name: '__ContentStudentUpdated__',
             mobile: '13812345678',
             level: 1,
-            studentContentForm: {
-              descriptionMarkdown: '  ## Created later  ',
+          },
+        });
+        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 app
-          .scope('training-student')
-          .model.studentContent.get({ studentId });
-        assert.equal(studentContent?.descriptionMarkdown, '## Created later');
-        assert.equal(
-          studentContent?.descriptionHtml,
-          app.bean.markdown.renderHtml('## Created later'),
-        );
+        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: '__ContentStudent__',
+            name: '__ContentStudentUpdated__',
             mobile: '13812345678',
             level: 1,
-            studentContentForm: { descriptionMarkdown: ' \n\t ' },
+            content: { descriptionMarkdown: whitespaceMarkdown },
           },
         });
+        const whitespaceContent = await studentContentModel.get({ studentId });
+        assert.equal(whitespaceContent?.descriptionMarkdown, whitespaceMarkdown);
         assert.equal(
-          await app.scope('training-student').model.studentContent.get({ studentId }),
-          undefined,
+          whitespaceContent?.descriptionHtml,
+          app.bean.markdown.renderHtml(whitespaceMarkdown),
         );
       } finally {
         if (studentId) {
@@ -437,7 +456,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            studentContentForm: { descriptionMarkdown: 'This is a test' },
+            content: { descriptionMarkdown: 'This is a test' },
             mobile: '13812345678',
             level: 4,
           },
@@ -454,7 +473,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            studentContentForm: { descriptionMarkdown: 'This is a test' },
+            content: { descriptionMarkdown: 'This is a test' },
             level: 1,
           },
         });
@@ -470,7 +489,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            studentContentForm: { descriptionMarkdown: '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.154",
+  "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.153"
+    "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

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;
+  }
+}