cabloy 5.1.140 → 5.1.142

package/zova/src/suite/cabloy-basic/modules/basic-markdown/test/lib/codeBlockLanguages.test.ts

@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import {
+  codeBlockLanguages,
+  getCodeBlockLanguage,
+  isCodeBlockLanguage,
+} from '../../src/lib/codeBlockLanguages.js';
+
+test('Code block languages contain stable unique identifiers', () => {
+  assert.equal(new Set(codeBlockLanguages).size, codeBlockLanguages.length);
+  assert.equal(codeBlockLanguages.includes('typescript'), true);
+  assert.equal(codeBlockLanguages.includes('python'), true);
+});
+
+test('Code block languages normalize supported aliases without treating unknown values as plain text', () => {
+  assert.equal(getCodeBlockLanguage('ts'), 'typescript');
+  assert.equal(getCodeBlockLanguage('js'), 'javascript');
+  assert.equal(getCodeBlockLanguage('sh'), 'shell');
+  assert.equal(getCodeBlockLanguage('plaintext'), undefined);
+  assert.equal(getCodeBlockLanguage(undefined), undefined);
+  assert.equal(isCodeBlockLanguage('typescript'), true);
+  assert.equal(isCodeBlockLanguage('ts'), true);
+  assert.equal(isCodeBlockLanguage('plaintext'), false);
+});

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-rest-resource",
-  "version": "5.1.45",
+  "version": "5.1.46",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/model/resource.ts

@@ -26,6 +26,7 @@ interface IModelResourceQueryItemOptions<TData> {
   queryFn: () => Promise<TData>;
   meta?: {
     disableSuspenseOnInit?: boolean;
+    disableErrorEffect?: boolean;
   };
 }
 

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.46",
+  "version": "5.1.47",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "zova-module-a-rbac": "^5.0.1",
-    "zova-module-rest-resource": "^5.1.45"
+    "zova-module-rest-resource": "^5.1.46"
   },
   "title": "a-cabloy"
 }

package/zova/src/suite-vendor/a-pay/modules/a-pay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-pay",
-  "version": "5.0.5",
+  "version": "5.0.7",
   "description": "",
   "keywords": [
     "Zova Module"

package/zova/src/suite-vendor/a-pay/modules/a-pay/src/api/openapi/schemas.ts

@@ -535,17 +535,6 @@ export type ApiSchemaPayMockDtoMockRefundComplete =
   components['schemas']['pay-mock.dto.mockRefundComplete'];
 export type ApiSchemaPayMockDtoMockRefundCompletePartial =
   Partial<ApiSchemaPayMockDtoMockRefundComplete>;
-export type ApiSchemaAPaypalEntityPaypalRecord =
-  components['schemas']['a-paypal.entity.paypalRecord'];
-export type ApiSchemaAPaypalEntityPaypalRecordPartial = Partial<ApiSchemaAPaypalEntityPaypalRecord>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayload =
-  components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayloadPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordPayload>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptions =
-  components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptionsPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordOptions>;
 export type ApiSchemaTestCaptchaDtoSignin = components['schemas']['test-captcha.dto.signin'];
 export type ApiSchemaTestCaptchaDtoSigninPartial = Partial<ApiSchemaTestCaptchaDtoSignin>;
 export type ApiSchemaTestRestDtoProductCreate =

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

@@ -1504,54 +1504,6 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/paypal/getRecord/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get: operations['Paypal_getRecord'];
-    put?: never;
-    post?: never;
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/captureOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_captureOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/cancelOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_cancelOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
   '/api/test/auth/passport/isAuthenticated': {
     parameters: {
       query?: never;
@@ -3954,7 +3906,29 @@ export interface components {
     'a-permission.dto.permissions': {
       roleIds?: (number | string)[] | undefined;
       roleNames?: string[] | undefined;
-      actions?: unknown;
+      actions?:
+        | {
+            [key: string]:
+              | boolean
+              | {
+                  key: string;
+                  allowed: boolean;
+                  matcher:
+                    | {
+                        /** @enum {string} */
+                        mode: 'all';
+                      }
+                    | {
+                        /** @enum {string} */
+                        mode: 'any';
+                        rules: {
+                          field: string;
+                          values: string[];
+                        }[];
+                      };
+                };
+          }
+        | undefined;
     };
     'home-base.dto.siteCatalogSelectRes': {
       list: components['schemas']['home-base.dto.siteCatalogSelectResItem'][];
@@ -4771,49 +4745,6 @@ export interface components {
       /** @enum {string} */
       outcome: 'succeeded' | 'failed' | 'cancelled';
     };
-    'a-paypal.entity.paypalRecord': {
-      /**
-       * Format: date-time
-       * @description Created At
-       */
-      createdAt: Date;
-      /**
-       * Format: date-time
-       * @description Updated At
-       */
-      updatedAt: Date;
-      /**
-       * @description Deleted
-       * @default false
-       */
-      deleted?: boolean;
-      /**
-       * @description Instance ID
-       * @default 0
-       */
-      iid?: number;
-      /** @description ID */
-      id: number | string;
-      userId: number | string;
-      /** @default 0 */
-      status?: number;
-      prepayId: string;
-      payload: components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-      options: components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-    };
-    'a-paypal.dto.paypalOrderRecordPayload': {
-      remark: string;
-      total: string;
-      currencyCode: string;
-    };
-    'a-paypal.dto.paypalOrderRecordOptions': {
-      brandName: string;
-      returnUrl: string;
-      cancelUrl: string;
-      returnTo: string;
-      scene: string;
-      orderId: number | string;
-    };
     'test-captcha.dto.signin': {
       username: string;
       password: string;
@@ -8544,84 +8475,6 @@ export interface operations {
     };
     authToken: true;
   };
-  Paypal_getRecord: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data: components['schemas']['a-paypal.entity.paypalRecord'];
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_captureOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_cancelOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
   TestAuthPassport_isAuthenticated: {
     parameters: {
       query?: never;

package/zova/src/suite-vendor/a-pay/modules/a-pay/src/component/paymentNextAction/controller.tsx

@@ -8,6 +8,13 @@ import { ServicePaymentCoordinator } from '../../service/paymentCoordinator.js';
 export interface ControllerPaymentNextActionProps {
   action?: TypePaymentNextAction;
   disabled?: boolean;
+  continueToPaymentText?: string;
+  continueToPaymentHelpText?: string;
+  embeddedCheckoutUnavailableText?: string;
+  paymentCompletedText?: string;
+  paymentPreparingText?: string;
+  paymentPreparingRetryText?: (retryAfterSeconds: number) => string;
+  refreshPaymentStatusText?: string;
   onRefresh?: () => void | Promise<void>;
 }
 
@@ -25,18 +32,29 @@ export class ControllerPaymentNextAction extends BeanControllerBase {
   }
 
   protected render() {
-    const { action, disabled, onRefresh } = this.$props as ControllerPaymentNextActionProps;
+    const {
+      action,
+      disabled,
+      continueToPaymentText,
+      continueToPaymentHelpText,
+      embeddedCheckoutUnavailableText,
+      paymentCompletedText,
+      paymentPreparingText,
+      paymentPreparingRetryText,
+      refreshPaymentStatusText,
+      onRefresh,
+    } = this.$props as ControllerPaymentNextActionProps;
     if (!action) return null;
     if (action.kind === 'redirect') {
       return (
         <div class="mt-6 space-y-3">
-          <p class="text-base-content/70">Continue to the payment provider to complete payment.</p>
+          <p class="text-base-content/70">{continueToPaymentHelpText}</p>
           <button
             class="btn btn-primary"
             disabled={disabled}
             onClick={() => this.continueRedirect()}
           >
-            Continue to payment
+            {continueToPaymentText}
           </button>
         </div>
       );
@@ -45,15 +63,13 @@ export class ControllerPaymentNextAction extends BeanControllerBase {
       return (
         <div class="mt-6 space-y-3" aria-live="polite">
           <p class="text-base-content/70">
-            Payment is being prepared
             {action.retryAfterSeconds
-              ? `; retrying in about ${action.retryAfterSeconds} seconds`
-              : ''}
-            .
+              ? paymentPreparingRetryText?.(action.retryAfterSeconds)
+              : paymentPreparingText}
           </p>
           {onRefresh && (
             <button class="btn btn-outline" disabled={disabled} onClick={() => onRefresh()}>
-              Refresh payment status
+              {refreshPaymentStatusText}
             </button>
           )}
         </div>
@@ -62,15 +78,13 @@ export class ControllerPaymentNextAction extends BeanControllerBase {
     if (action.kind === 'completed') {
       return (
         <p class="mt-6 text-base-content/70" aria-live="polite">
-          Payment is complete. Confirming the order…
+          {paymentCompletedText}
         </p>
       );
     }
     return (
       <div class="mt-6" aria-live="polite">
-        <p class="text-base-content/70">
-          Embedded checkout will be available when this payment provider is configured.
-        </p>
+        <p class="text-base-content/70">{embeddedCheckoutUnavailableText}</p>
       </div>
     );
   }

package/zova/src/suite-vendor/a-pay/modules/pay-mock/cli/openapi.config.ts

@@ -3,7 +3,7 @@ import type { ZovaOpenapiConfigModule } from 'zova-openapi';
 export default function (): ZovaOpenapiConfigModule {
   return {
     operations: {
-      match: ['PayMockMockPayment_complete'],
+      match: ['PayMockMockPayment_complete', 'PayMockMockPayment_completeRefund'],
     },
   };
 }

package/zova/src/suite-vendor/a-pay/modules/pay-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-pay-mock",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "description": "",
   "keywords": [
     "Zova Module"

package/zova/src/suite-vendor/a-pay/modules/pay-mock/src/api/openapi/schemas.ts

@@ -535,17 +535,6 @@ export type ApiSchemaPayMockDtoMockRefundComplete =
   components['schemas']['pay-mock.dto.mockRefundComplete'];
 export type ApiSchemaPayMockDtoMockRefundCompletePartial =
   Partial<ApiSchemaPayMockDtoMockRefundComplete>;
-export type ApiSchemaAPaypalEntityPaypalRecord =
-  components['schemas']['a-paypal.entity.paypalRecord'];
-export type ApiSchemaAPaypalEntityPaypalRecordPartial = Partial<ApiSchemaAPaypalEntityPaypalRecord>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayload =
-  components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayloadPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordPayload>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptions =
-  components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptionsPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordOptions>;
 export type ApiSchemaTestCaptchaDtoSignin = components['schemas']['test-captcha.dto.signin'];
 export type ApiSchemaTestCaptchaDtoSigninPartial = Partial<ApiSchemaTestCaptchaDtoSignin>;
 export type ApiSchemaTestRestDtoProductCreate =

package/zova/src/suite-vendor/a-pay/modules/pay-mock/src/api/openapi/types.ts

@@ -1504,54 +1504,6 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/paypal/getRecord/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get: operations['Paypal_getRecord'];
-    put?: never;
-    post?: never;
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/captureOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_captureOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/cancelOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_cancelOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
   '/api/test/auth/passport/isAuthenticated': {
     parameters: {
       query?: never;
@@ -3954,7 +3906,29 @@ export interface components {
     'a-permission.dto.permissions': {
       roleIds?: (number | string)[] | undefined;
       roleNames?: string[] | undefined;
-      actions?: unknown;
+      actions?:
+        | {
+            [key: string]:
+              | boolean
+              | {
+                  key: string;
+                  allowed: boolean;
+                  matcher:
+                    | {
+                        /** @enum {string} */
+                        mode: 'all';
+                      }
+                    | {
+                        /** @enum {string} */
+                        mode: 'any';
+                        rules: {
+                          field: string;
+                          values: string[];
+                        }[];
+                      };
+                };
+          }
+        | undefined;
     };
     'home-base.dto.siteCatalogSelectRes': {
       list: components['schemas']['home-base.dto.siteCatalogSelectResItem'][];
@@ -4771,49 +4745,6 @@ export interface components {
       /** @enum {string} */
       outcome: 'succeeded' | 'failed' | 'cancelled';
     };
-    'a-paypal.entity.paypalRecord': {
-      /**
-       * Format: date-time
-       * @description Created At
-       */
-      createdAt: Date;
-      /**
-       * Format: date-time
-       * @description Updated At
-       */
-      updatedAt: Date;
-      /**
-       * @description Deleted
-       * @default false
-       */
-      deleted?: boolean;
-      /**
-       * @description Instance ID
-       * @default 0
-       */
-      iid?: number;
-      /** @description ID */
-      id: number | string;
-      userId: number | string;
-      /** @default 0 */
-      status?: number;
-      prepayId: string;
-      payload: components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-      options: components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-    };
-    'a-paypal.dto.paypalOrderRecordPayload': {
-      remark: string;
-      total: string;
-      currencyCode: string;
-    };
-    'a-paypal.dto.paypalOrderRecordOptions': {
-      brandName: string;
-      returnUrl: string;
-      cancelUrl: string;
-      returnTo: string;
-      scene: string;
-      orderId: number | string;
-    };
     'test-captcha.dto.signin': {
       username: string;
       password: string;
@@ -8544,84 +8475,6 @@ export interface operations {
     };
     authToken: true;
   };
-  Paypal_getRecord: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data: components['schemas']['a-paypal.entity.paypalRecord'];
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_captureOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_cancelOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
   TestAuthPassport_isAuthenticated: {
     parameters: {
       query?: never;

package/zova/src/suite-vendor/a-pay/modules/pay-mock/src/api/payMockMockPayment.ts

@@ -17,6 +17,19 @@ export type ApiApiPayMockMockPaymentcompleteRequestBody =
 export type ApiApiPayMockMockPaymentcompleteResponseBody =
   paths[ApiApiPayMockMockPaymentcompletePath][ApiApiPayMockMockPaymentcompleteMethod]['responses']['200']['content']['application/json']['data'];
 
+/** PayMockMockPayment_completeRefund */
+export const ApiApiPayMockMockPaymentcompleteRefundPath =
+  '/api/pay/mock/payment-session/refund-operation/{id}/complete';
+export type ApiApiPayMockMockPaymentcompleteRefundPath =
+  '/api/pay/mock/payment-session/refund-operation/{id}/complete';
+export type ApiApiPayMockMockPaymentcompleteRefundMethod = 'post';
+export type ApiApiPayMockMockPaymentcompleteRefundRequestParams =
+  paths[ApiApiPayMockMockPaymentcompleteRefundPath][ApiApiPayMockMockPaymentcompleteRefundMethod]['parameters']['path'];
+export type ApiApiPayMockMockPaymentcompleteRefundRequestBody =
+  components['schemas']['pay-mock.dto.mockRefundComplete'];
+export type ApiApiPayMockMockPaymentcompleteRefundResponseBody =
+  paths[ApiApiPayMockMockPaymentcompleteRefundPath][ApiApiPayMockMockPaymentcompleteRefundMethod]['responses']['200']['content']['application/json']['data'];
+
 @Api()
 export class ApiPayMockMockPayment extends BeanApiBase {
   complete(
@@ -31,4 +44,17 @@ export class ApiPayMockMockPayment extends BeanApiBase {
       this.$configPrepare(OpenApiBaseURL(this.sys), options, true),
     );
   }
+
+  completeRefund(
+    body: ApiApiPayMockMockPaymentcompleteRefundRequestBody,
+    options: {
+      params: ApiApiPayMockMockPaymentcompleteRefundRequestParams;
+    } & IApiActionOptions,
+  ) {
+    return this.$fetch.post<any, ApiApiPayMockMockPaymentcompleteRefundResponseBody>(
+      this.$pathTranslate(ApiApiPayMockMockPaymentcompleteRefundPath, options.params),
+      body,
+      this.$configPrepare(OpenApiBaseURL(this.sys), options, true),
+    );
+  }
 }