cabloy 5.1.97 → 5.1.99

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

@@ -5,7 +5,12 @@ import { DtoImageView } from 'vona-module-a-image';
 import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
-import { ModelRecord, onEffectForTrainingRecordSubjects } from 'vona-module-training-record';
+import {
+  DtoRecordDossierFileView,
+  ModelRecord,
+  onEffectForTrainingRecordSubjects,
+  resolveDossierFiles,
+} from 'vona-module-training-record';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
@@ -34,6 +39,7 @@ export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
     'averageScore',
     'trainingTime',
     'sceneImageIds',
+    'dossierFileIds',
     'description',
   ],
   include: { trainingRecordSubjects: true },
@@ -48,4 +54,15 @@ export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
     v.array($Class.partial(DtoImageView)),
   )
   sceneImages?: Partial<DtoImageView>[];
+
+  @Api.field(
+    v.title($locale('DossierFiles')),
+    ZovaRender.visible(false),
+    v.optional(),
+    v.serializerTransform('a-serialization:custom', {
+      custom: resolveDossierFiles,
+    }),
+    v.array($Class.partial(DtoRecordDossierFileView)),
+  )
+  dossierFiles?: Partial<DtoRecordDossierFileView>[];
 }

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

@@ -65,8 +65,6 @@ export class EntityStudent extends EntityBase {
     ZovaRender.order(4),
     ZovaRender.field('basic-image:formFieldImage', {
       imageScene: 'training-student:studentImage',
-      accept: ['image/png', 'image/jpeg', 'image/webp'],
-      maxSize: 2 * 1024 * 1024,
       enableCrop: true,
       cropAspectRatio: 1,
       relationName: 'image',

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

@@ -18,6 +18,7 @@ export interface IModelOptionsStudent extends IDecoratorModelOptions<EntityStude
         'averageScore',
         'trainingTime',
         'sceneImageIds',
+        'dossierFileIds',
         'description',
       ],
     }),

package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/src/bean/ssrSite.admin.ts

@@ -22,5 +22,9 @@ export interface ISsrSiteOptionsAdmin extends IDecoratorSsrSiteOptions<
 @SsrSite<ISsrSiteOptionsAdmin>({
   publicPath: 'admin',
   bundlePath: 'ssr-cabloyBasicAdmin-5.0.0',
+  diagnostics: {
+    siteName: 'admin',
+    buildCommand: 'npm run build:zova:admin',
+  },
 })
 export class SsrSiteAdmin extends BeanSsrSiteBase<ISsrSiteOptionsAdmin> {}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/bean/ssrSite.web.ts

@@ -22,5 +22,9 @@ export interface ISsrSiteOptionsWeb extends IDecoratorSsrSiteOptions<
 @SsrSite<ISsrSiteOptionsWeb>({
   publicPath: '',
   bundlePath: 'ssr-cabloyBasicWeb-5.0.0',
+  diagnostics: {
+    siteName: 'web',
+    buildCommand: 'npm run build:zova:web',
+  },
 })
 export class SsrSiteWeb extends BeanSsrSiteBase<ISsrSiteOptionsWeb> {}

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

@@ -18,5 +18,8 @@ export interface ISsrSiteOptions<%=argv.beanNameCapitalize%> extends IDecoratorS
 @SsrSite<ISsrSiteOptions<%=argv.beanNameCapitalize%>>({
   publicPath: 'some',
   bundlePath: 'front-bundle-path',
+  diagnostics: {
+    siteName: 'some',
+  },
 })
 export class SsrSite<%=argv.beanNameCapitalize%> extends BeanSsrSiteBase<ISsrSiteOptions<%=argv.beanNameCapitalize%>> {}

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

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

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

@@ -51,8 +51,9 @@ export class ServiceSsrHandler extends BeanBase {
   private async _prepareHandler() {
     // handler
     const fileHandler = path.join(this._siteAssetDir, 'handler.js');
-    if (!fse.existsSync(fileHandler))
-      throw new Error(`The bundlePath of ssr site not exists: ${this._siteAssetDir}`);
+    if (!fse.existsSync(fileHandler)) {
+      throw new Error(this._createMissingBundleMessage());
+    }
     // import
     const fileUrl = `${pathToHref(fileHandler)}?${this._handlerNonce}`;
     const handlerInstance = await import(fileUrl);
@@ -65,4 +66,12 @@ export class ServiceSsrHandler extends BeanBase {
     // ok
     return ssrHandler;
   }
+
+  private _createMissingBundleMessage() {
+    const diagnostics = this._siteOptions.diagnostics;
+    const siteName = diagnostics?.siteName ?? String(this._siteOptions.publicPath || 'unknown');
+    const buildCommand = diagnostics?.buildCommand;
+    const commandHint = buildCommand ? ` Run "${buildCommand}" at the repository root.` : '';
+    return `Missing SSR bundle for site ${siteName}: ${this._siteAssetDir}.${commandHint}`;
+  }
 }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrSite.ts

@@ -50,6 +50,11 @@ export interface ISsrSitePublicPathRecord {}
 
 export interface ISsrSiteRecord {}
 
+export interface ISsrSiteDiagnosticsOptions {
+  siteName?: string;
+  buildCommand?: string;
+}
+
 export type TypeMergePagesAndPagesData<Pages extends {} = {}, PagesData extends {} = {}> = {
   // @ts-ignore: ignore
   [K in keyof Pages]: Pages[K] & { data?: PagesData[K] };
@@ -65,6 +70,7 @@ export interface IDecoratorSsrSiteOptions<
     IOnionOptionsMatch<TypeOnionOptionsMatchRule<keyof IInstanceRecord>> {
   publicPath: keyof ISsrSitePublicPathRecord;
   bundlePath: string;
+  diagnostics?: ISsrSiteDiagnosticsOptions;
   envServer?: ZovaConfigEnv;
   envClient?: ZovaConfigEnv;
   apiType: 'performAction' | 'api' | 'dev';

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

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

package/vona/src/suite-vendor/a-file/modules/a-file/cli/fileProvider/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -0,0 +1,23 @@
+import type {
+  IDecoratorFileProviderOptions,
+  IFileProviderClientOptions,
+  IFileProviderClientRecord,
+  IFileProviderExecute,
+} from 'vona-module-a-file';
+
+import { BeanBase } from 'vona';
+import { FileProvider } from 'vona-module-a-file';
+
+export interface IFileProvider<%=argv.beanNameCapitalize%>ClientRecord extends IFileProviderClientRecord {}
+
+export interface IFileProvider<%=argv.beanNameCapitalize%>ClientOptions extends IFileProviderClientOptions {}
+
+export interface IFileProviderOptions<%=argv.beanNameCapitalize%> extends IDecoratorFileProviderOptions<
+  IFileProvider<%=argv.beanNameCapitalize%>ClientRecord,
+  IFileProvider<%=argv.beanNameCapitalize%>ClientOptions
+> {}
+
+@FileProvider<IFileProviderOptions<%=argv.beanNameCapitalize%>>({
+  base: {},
+})
+export class FileProvider<%=argv.beanNameCapitalize%> extends BeanBase implements IFileProviderExecute {}

package/vona/src/suite-vendor/a-file/modules/a-file/cli/fileScene/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -0,0 +1,5 @@
+import { BeanBase } from 'vona';
+import { FileScene } from 'vona-module-a-file';
+
+@FileScene()
+export class FileScene<%=argv.beanNameCapitalize%> extends BeanBase {}

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

@@ -0,0 +1,68 @@
+{
+  "name": "vona-module-a-file",
+  "version": "5.0.4",
+  "description": "",
+  "keywords": [
+    "Vona Module"
+  ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.1.3"
+  },
+  "clean-package": {
+    "indent": 2,
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "a-file",
+  "vonaModule": {
+    "fileVersion": 1,
+    "dependencies": {
+      "a-orm": "5.0.0",
+      "a-upload": "5.0.0",
+      "a-user": "5.0.0",
+      "a-web": "5.0.0"
+    },
+    "onions": {
+      "fileProvider": {
+        "optionsGlobalInterfaceName": "IDecoratorFileProviderOptions",
+        "optionsGlobalInterfaceFrom": "vona-module-a-file",
+        "scopeResource": true,
+        "boilerplate": "fileProvider/boilerplate"
+      },
+      "fileScene": {
+        "optionsGlobalInterfaceName": "IDecoratorFileSceneOptions",
+        "optionsGlobalInterfaceFrom": "vona-module-a-file",
+        "boilerplate": "fileScene/boilerplate"
+      }
+    }
+  }
+}