cabloy 5.1.174 → 5.1.176

package/zova/src/{suite-vendor/a-pay/modules/a-pay → suite/cabloy-basic/modules/basic-pay}/src/component/paymentNextAction/controller.tsx

@@ -1,22 +1,11 @@
+import type { IPaymentNextActionProps } from 'zova-module-a-pay';
+
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { ServicePaymentCoordinator } from 'zova-module-a-pay';
+import { ZButton } from 'zova-module-basic-button';
 
-import type { TypePaymentNextAction } from '../../types/payment.js';
-
-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>;
-}
+export interface ControllerPaymentNextActionProps extends IPaymentNextActionProps {}
 
 @Controller()
 export class ControllerPaymentNextAction extends BeanControllerBase {
@@ -26,8 +15,8 @@ export class ControllerPaymentNextAction extends BeanControllerBase {
   $$paymentCoordinator: ServicePaymentCoordinator;
 
   async continueRedirect() {
-    const action = this.$props.action;
-    if (action?.kind !== 'redirect' || this.$props.disabled) return;
+    const { action, disabled } = this.$props as IPaymentNextActionProps;
+    if (action?.kind !== 'redirect' || disabled) return;
     await this.$$paymentCoordinator.execute(action);
   }
 
@@ -43,19 +32,19 @@ export class ControllerPaymentNextAction extends BeanControllerBase {
       paymentPreparingRetryText,
       refreshPaymentStatusText,
       onRefresh,
-    } = this.$props as ControllerPaymentNextActionProps;
+    } = this.$props as IPaymentNextActionProps;
     if (!action) return null;
     if (action.kind === 'redirect') {
       return (
         <div class="mt-6 space-y-3">
           <p class="text-base-content/70">{continueToPaymentHelpText}</p>
-          <button
+          <ZButton
             class="btn btn-primary"
             disabled={disabled}
-            onClick={() => this.continueRedirect()}
+            onPerform={() => this.continueRedirect()}
           >
             {continueToPaymentText}
-          </button>
+          </ZButton>
         </div>
       );
     }
@@ -68,9 +57,9 @@ export class ControllerPaymentNextAction extends BeanControllerBase {
               : paymentPreparingText}
           </p>
           {onRefresh && (
-            <button class="btn btn-outline" disabled={disabled} onClick={() => onRefresh()}>
+            <ZButton class="btn btn-outline" disabled={disabled} onPerform={() => onRefresh()}>
               {refreshPaymentStatusText}
-            </button>
+            </ZButton>
           )}
         </div>
       );

package/zova/src/suite/cabloy-basic/modules/basic-table/src/bean/tableCell.actionUpdate.tsx

@@ -8,6 +8,7 @@ import type {
 import { BeanBase } from 'zova';
 import { ZIcon } from 'zova-module-a-icon';
 import { TableCell } from 'zova-module-a-table';
+import { ZButton } from 'zova-module-basic-button';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceTableActionRowRecord {
@@ -28,15 +29,14 @@ export class TableCellActionUpdate extends BeanBase implements ITableCellRender
   ) {
     const { $host } = renderContext;
     return (
-      <button
+      <ZButton
         class={options.class}
-        type="button"
-        onClick={async () => {
+        onPerform={async () => {
           await $host.$performCommand('basic-commands:edit', options, renderContext);
         }}
       >
         <ZIcon name="::draft" width={24}></ZIcon>
-      </button>
+      </ZButton>
     );
   }
 }

package/zova/src/suite/cabloy-basic/modules/basic-table/src/component/actionCreate/controller.tsx

@@ -6,6 +6,7 @@ import type {
 
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { ZButton } from 'zova-module-basic-button';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceTableActionBulkRecord {
@@ -28,17 +29,16 @@ export class ControllerActionCreate extends BeanControllerBase {
   protected render() {
     const disabled = this.$props.disabled === true || this.$props.dynamicDisabled === true;
     return (
-      <button
+      <ZButton
         class={this.$props.class}
-        type="button"
         disabled={disabled}
-        onClick={async () => {
+        onPerform={async () => {
           if (disabled) return;
           await this.$performCommand('basic-commands:create', this.$props, this.$$renderContext);
         }}
       >
         {this.scope.locale.Create()}
-      </button>
+      </ZButton>
     );
   }
 }

package/zova/src/suite/cabloy-basic/modules/basic-table/src/component/actionDeleteBulk/controller.tsx

@@ -6,6 +6,7 @@ import type {
 
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { ZButton } from 'zova-module-basic-button';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceTableActionBulkRecord {
@@ -27,13 +28,12 @@ export class ControllerActionDeleteBulk extends BeanControllerBase {
     const { dynamicDisabledReason, dynamicSelection } = this.$props;
     const disabled = this.$props.disabled === true || this.$props.dynamicDisabled === true;
     return (
-      <button
+      <ZButton
         class={this.$props.class}
-        type="button"
         disabled={disabled}
         title={dynamicDisabledReason}
         aria-description={dynamicDisabledReason}
-        onClick={async () => {
+        onPerform={async () => {
           if (disabled) return;
           const confirmed = await this.$performCommand(
             'basic-commands:confirm',
@@ -51,7 +51,7 @@ export class ControllerActionDeleteBulk extends BeanControllerBase {
         }}
       >
         {this.scope.locale.DeleteBulk() as string}
-      </button>
+      </ZButton>
     );
   }
 }

package/zova/src/suite/cabloy-basic/package.json

@@ -24,6 +24,7 @@
     "zova-module-basic-metrics": "workspace:",
     "zova-module-basic-page": "^5.0.7",
     "zova-module-basic-pageentry": "^5.0.7",
+    "zova-module-basic-pay": "^5.0.0",
     "zova-module-basic-resource": "^5.0.0",
     "zova-module-basic-select": "^5.0.4",
     "zova-module-basic-table": "^5.0.6",

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

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

package/zova/src/suite-vendor/a-pay/modules/a-pay/src/.metadata/index.ts

@@ -26,7 +26,7 @@ declare module 'zova-module-a-pay' {
 }
 /** model: end */
 /** model: begin */
-import { ModelPaymentSession } from '../model/paymentSession.js';
+import type { ModelPaymentSession } from '../model/paymentSession.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
@@ -57,7 +57,7 @@ declare module 'zova-module-a-pay' {
 }
 /** api: end */
 /** api: begin */
-import { ApiPayPaymentSession } from '../api/payPaymentSession.js';
+import type { ApiPayPaymentSession } from '../api/payPaymentSession.js';
 export interface IModuleApi {
   'payPaymentSession': ApiPayPaymentSession;
 }
@@ -97,7 +97,7 @@ declare module 'zova-module-a-pay' {
 }
 /** apiSchema: end */
 /** apiSchema: begin */
-import { ApiSchemaPayPaymentSession } from '../apiSchema/payPaymentSession.js';
+import type { ApiSchemaPayPaymentSession } from '../apiSchema/payPaymentSession.js';
 export interface IModuleApiSchema {
   'payPaymentSession': ApiSchemaPayPaymentSession;
 }
@@ -138,7 +138,7 @@ declare module 'zova-module-a-pay' {
 }
 /** service: end */
 /** service: begin */
-import { ServicePaymentCoordinator } from '../service/paymentCoordinator.js';
+import type { ServicePaymentCoordinator } from '../service/paymentCoordinator.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
@@ -146,48 +146,6 @@ declare module 'zova' {
   }
 }
 /** service: end */
-/** controller: begin */
-export * from '../component/paymentNextAction/controller.jsx';
-
-import 'zova';
-declare module 'zova' {
-
-
-}
-declare module 'zova-module-a-pay' {
-
-        export interface ControllerPaymentNextAction {
-          /** @internal */
-          get scope(): ScopeModuleAPay;
-        }
-}
-/** controller: end */
-/** controller: begin */
-import { ControllerPaymentNextAction } from '../component/paymentNextAction/controller.jsx';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecordLocal {
-    'a-pay.controller.paymentNextAction': ControllerPaymentNextAction;
-  }
-}
-/** controller: end */
-
-/** components: begin */
-export * from './component/paymentNextAction.js';
-import { ZPaymentNextAction } from './component/paymentNextAction.js';
-export const components = {
-  'paymentNextAction': ZPaymentNextAction,
-};
-import 'zova';
-declare module 'zova' {
-export interface IComponentRecord {
-  'a-pay:paymentNextAction': ControllerPaymentNextAction;
-}
-export interface IZovaComponentRecord {
-  'a-pay:paymentNextAction': typeof ZPaymentNextAction;
-}
-}
-/** components: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil } from 'zova';
 import { Scope } from 'zova-module-a-bean';

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

@@ -19,6 +19,19 @@ export interface IPaymentSessionView {
   nextAction?: TypePaymentNextAction;
 }
 
+export interface IPaymentNextActionProps {
+  action?: TypePaymentNextAction;
+  disabled?: boolean;
+  continueToPaymentText?: string;
+  continueToPaymentHelpText?: string;
+  embeddedCheckoutUnavailableText?: string;
+  paymentCompletedText?: string;
+  paymentPreparingText?: string;
+  paymentPreparingRetryText?: (retryAfterSeconds: number) => string;
+  refreshPaymentStatusText?: string;
+  onRefresh?: () => void | Promise<void>;
+}
+
 export interface IPayUiProvider {
   supports(action: TypePaymentNextAction): boolean;
   execute(action: TypePaymentNextAction): Promise<void>;

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

@@ -1,12 +1,12 @@
 {
   "name": "zova-suite-a-pay",
-  "version": "5.0.6",
+  "version": "5.0.8",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
-    "zova-module-a-pay": "^5.0.7",
+    "zova-module-a-pay": "^5.0.9",
     "zova-module-pay-mock": "^5.0.5",
     "zova-module-pay-paypal": "^5.0.2",
     "zova-module-pay-stripe": "^5.0.2"

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.38",
+  "version": "5.1.39",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-router/src/monkey.ts

@@ -190,8 +190,6 @@ export class Monkey
     // check if changed
     const changed = !controller.$route || controller.$route.fullPath !== route.fullPath;
     if (!changed) return;
-    controller.$route = route;
-    controller.$routeMatched = routeMatched;
     // update $params/$query
     const routeName = getRealRouteName(routeMatched.name);
     const schemaKey = routeName || String(routeMatched.path);
@@ -205,7 +203,23 @@ export class Monkey
       // do nothing
       return;
     }
-    const module = this.app.meta.module.get(moduleInfo.relativeName)!;
+    const module = this.app.meta.module.get(moduleInfo.relativeName, false);
+    if (!module) {
+      void this.app.meta.module
+        .use(moduleInfo.relativeName)
+        .then(() => {
+          if (cast(controller).ctx.disposed) return;
+          const currentRoute = getPageRoute(cast<ZovaContext>(cast(controller).ctx));
+          if (!currentRoute || currentRoute.fullPath !== route.fullPath) return;
+          this._initControllerRoute(currentRoute, controller);
+        })
+        .catch(err => {
+          console.error('failed to load route module', moduleInfo.relativeName, err);
+        });
+      return;
+    }
+    controller.$route = route;
+    controller.$routeMatched = routeMatched;
     if (routeName) {
       schemas = module.resource.pageNameSchemas?.[schemaKey];
     } else {

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.105",
+  "version": "5.1.106",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -70,7 +70,6 @@
       "a-app": "5.0.0",
       "a-bean": "5.0.0",
       "a-behavior": "5.0.0",
-      "a-boundary": "5.0.0",
       "a-fetch": "5.0.0",
       "a-form": "5.0.0",
       "a-icon": "5.0.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.162",
+  "version": "5.1.163",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -13,7 +13,6 @@
     "zova-module-a-bean": "^5.1.36",
     "zova-module-a-behavior": "^5.1.26",
     "zova-module-a-behaviors": "^5.1.22",
-    "zova-module-a-boundary": "^5.1.22",
     "zova-module-a-command": "^5.1.35",
     "zova-module-a-fetch": "^5.1.25",
     "zova-module-a-form": "^5.1.51",
@@ -23,7 +22,7 @@
     "zova-module-a-meta": "^5.1.22",
     "zova-module-a-model": "^5.1.37",
     "zova-module-a-openapi": "^5.1.54",
-    "zova-module-a-router": "^5.1.38",
+    "zova-module-a-router": "^5.1.39",
     "zova-module-a-routerstack": "^5.1.29",
     "zova-module-a-routertabs": "^5.1.34",
     "zova-module-a-ssr": "^5.1.40",
@@ -32,7 +31,7 @@
     "zova-module-a-style": "^5.1.35",
     "zova-module-a-table": "^5.1.43",
     "zova-module-a-zod": "^5.1.37",
-    "zova-module-a-zova": "^5.1.105"
+    "zova-module-a-zova": "^5.1.106"
   },
   "title": "a-zova"
 }

package/zova/src/suite-vendor/a-zova/modules/a-boundary/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016-present Zova
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/zova/src/suite-vendor/a-zova/modules/a-boundary/src/.metadata/index.ts

@@ -1,26 +0,0 @@
-// eslint-disable
-/** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil } from 'zova';
-import { Scope } from 'zova-module-a-bean';
-
-@Scope()
-export class ScopeModuleABoundary extends BeanScopeBase {}
-
-export interface ScopeModuleABoundary {
-  util: BeanScopeUtil;
-}
-
-import 'zova';
-declare module 'zova' {
-  export interface IBeanScopeRecord {
-    'a-boundary': ScopeModuleABoundary;
-  }
-
-
-
-
-
-
-}
-
-/** scope: end */

package/zova/src/suite-vendor/a-zova/modules/a-boundary/src/.metadata/this.ts

@@ -1,2 +0,0 @@
-export const __ThisModule__ = 'a-boundary';
-export { ScopeModuleABoundary as ScopeModule } from './index.js';