cabloy 5.1.152 → 5.1.154

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.81",
+  "version": "5.1.82",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/pnpm-lock.yaml

@@ -977,7 +977,7 @@ importers:
         specifier: ^5.0.1
         version: link:modules/a-rbac
       zova-module-rest-resource:
-        specifier: ^5.1.47
+        specifier: ^5.1.48
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/a-rbac:

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/payment/controller.tsx

@@ -159,8 +159,10 @@ export class ControllerPagePayment extends BeanControllerPageBase {
       for (const [attempt, delay] of SettlementPollDelaysMilliseconds.entries()) {
         if (delay > 0) await new Promise(resolve => setTimeout(resolve, delay));
         if (!this._isCurrentSettlementPoll(pollVersion)) return;
+        let session: NonNullable<ReturnType<ModelPaymentSession['view']>>['data'];
         try {
-          await this.queryPaymentSession?.refetch({ bypassPersister: true });
+          const result = await this.queryPaymentSession?.refetch({ bypassPersister: true });
+          session = result?.data;
         } catch (error) {
           if (isNotFoundError(error)) {
             this.paymentSessionUnavailable = true;
@@ -170,7 +172,6 @@ export class ControllerPagePayment extends BeanControllerPageBase {
           throw error;
         }
         if (!this._isCurrentSettlementPoll(pollVersion)) return;
-        const session = this.queryPaymentSession?.data;
         const sessionState = session?.state;
         this.pendingSessionState = sessionState;
         this.pendingNextAction = session?.nextAction;

package/zova/src/suite/a-home/modules/home-api/mock/passport.fake.ts

@@ -416,14 +416,14 @@ export default defineFakeRoute([
                 name: 'registeredUser',
                 title: 'Registered User',
                 titleLocales: { 'zh-cn': '注册用户' },
-                siteIds: ['web'],
+                siteIds: ['*'],
               },
               {
                 id: 2,
                 name: 'systemAdmin',
                 title: 'System Administrator',
                 titleLocales: { 'zh-cn': '系统管理员' },
-                siteIds: ['web', 'admin'],
+                siteIds: ['*'],
               },
             ],
           },
@@ -461,15 +461,15 @@ export default defineFakeRoute([
               id: 1,
               name: 'registeredUser',
               title: 'Registered User',
-              locales: { 'zh-cn': '注册用户' },
-              siteIds: ['web'],
+              titleLocales: { 'zh-cn': '注册用户' },
+              siteIds: ['*'],
             },
             {
               id: 2,
               name: 'systemAdmin',
               title: 'System Administrator',
-              locales: { 'zh-cn': '系统管理员' },
-              siteIds: ['web', 'admin'],
+              titleLocales: { 'zh-cn': '系统管理员' },
+              siteIds: ['*'],
             },
           ],
         },

package/zova/src/suite/a-home/modules/home-base/src/lib/index.ts

@@ -1 +1,2 @@
+export * from './roleSiteAdmission.js';
 export * from './utils.js';

package/zova/src/suite/a-home/modules/home-base/src/lib/roleSiteAdmission.ts

@@ -0,0 +1,15 @@
+export const roleSiteIdAll = '*';
+
+export interface RoleSiteAdmission {
+  siteIds: string[];
+}
+
+export function isRoleSiteAdmitted(
+  siteId: string | undefined,
+  roles: RoleSiteAdmission[] | undefined,
+): boolean {
+  if (!siteId) return false;
+  return !!roles?.some(
+    role => role.siteIds.includes(siteId) || role.siteIds.includes(roleSiteIdAll),
+  );
+}

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -4,6 +4,8 @@ import { catchError } from '@cabloy/utils';
 import { Service } from 'zova-module-a-bean';
 import { BeanRouterGuardsBase } from 'zova-module-a-router';
 
+import { isRoleSiteAdmitted } from '../lib/roleSiteAdmission.js';
+
 @Service()
 export class ServiceRouterGuards extends BeanRouterGuardsBase {
   protected onRouterGuards(router: BeanRouter) {
@@ -31,9 +33,7 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
         }
         return pagePath;
       }
-      const siteId = this.sys.env.SITE_ID;
-      const siteAdmitted =
-        !!siteId && !!this.$passport.roles?.some(role => role.siteIds.includes(siteId));
+      const siteAdmitted = isRoleSiteAdmitted(this.sys.env.SITE_ID, this.$passport.roles);
       if (!siteAdmitted) {
         const pagePath = this.app.$getPagePathAccessDenied();
         if (process.env.SERVER) {

package/zova/src/suite/a-home/modules/home-layoutadmin/src/model/menu.ts

@@ -28,7 +28,7 @@ export class ModelMenu extends BeanModelBase {
     // event
     if (process.env.CLIENT && this.sys.config.ssr.hmr) {
       this._eventSsrHmrReload = this.sys.meta.event.on('a-ssrhmr:reload', async (_data, next) => {
-        await this._refetchRetrieveMenus();
+        await this.refreshMenus();
         return next();
       });
     }
@@ -78,8 +78,9 @@ export class ModelMenu extends BeanModelBase {
     });
   }
 
-  private _refetchRetrieveMenus(): Promise<void> {
-    return this.$refetchQueries({ queryKey: this._getQueryKeyRetrieveMenus() });
+  async refreshMenus(): Promise<void> {
+    const queryMenus = this.retrieveMenus();
+    await queryMenus.refetch({ bypassPersister: true });
   }
 
   private _getQueryKeyRetrieveMenus(): [string, string | undefined, string | undefined] {

package/zova/src/suite/a-home/modules/home-layoutweb/src/model/menu.ts

@@ -28,7 +28,7 @@ export class ModelMenu extends BeanModelBase {
     // event
     if (process.env.CLIENT && this.sys.config.ssr.hmr) {
       this._eventSsrHmrReload = this.sys.meta.event.on('a-ssrhmr:reload', async (_data, next) => {
-        await this._refetchRetrieveMenus();
+        await this.refreshMenus();
         return next();
       });
     }
@@ -78,8 +78,9 @@ export class ModelMenu extends BeanModelBase {
     });
   }
 
-  private _refetchRetrieveMenus(): Promise<void> {
-    return this.$refetchQueries({ queryKey: this._getQueryKeyRetrieveMenus() });
+  async refreshMenus(): Promise<void> {
+    const queryMenus = this.retrieveMenus();
+    await queryMenus.refetch({ bypassPersister: true });
   }
 
   private _getQueryKeyRetrieveMenus(): [string, string | undefined, string | undefined] {

package/zova/src/suite/a-home/modules/home-passport/package.json

@@ -54,7 +54,8 @@
       "monkey": true
     },
     "dependencies": {
-      "a-zova": "5.0.0"
+      "a-zova": "5.0.0",
+      "home-base": "5.0.0"
     }
   }
 }

package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts

@@ -17,6 +17,7 @@ import {
   TypeOpenapiPermissions,
 } from 'zova-module-a-openapi';
 import { ApiApiHomeUserPassportloginOauthPath, OpenApiBaseURL } from 'zova-module-home-api';
+import { isRoleSiteAdmitted } from 'zova-module-home-base';
 
 import { matchPermissionAction } from '../lib/permissionActionMatcher.js';
 
@@ -143,8 +144,7 @@ export class ModelPassport extends BeanModelBase {
   }
 
   isPassportSiteAdmitted(passport?: ApiApiHomeUserPassportloginResponseBody['passport']) {
-    const siteId = this.sys.env.SITE_ID;
-    return !!siteId && !!passport?.roles.some(role => role.siteIds.includes(siteId));
+    return isRoleSiteAdmitted(this.sys.env.SITE_ID, passport?.roles);
   }
 
   logout() {

package/zova/src/suite/a-home/modules/home-passport/test/lib/roleSiteAdmission.test.ts

@@ -0,0 +1,23 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { isRoleSiteAdmitted } from 'zova-module-home-base';
+
+test('admits an exact site match', () => {
+  assert.equal(isRoleSiteAdmitted('web', [{ siteIds: ['web'] }]), true);
+  assert.equal(isRoleSiteAdmitted('admin', [{ siteIds: ['web'] }]), false);
+});
+
+test('admits every non-empty site through the wildcard', () => {
+  assert.equal(isRoleSiteAdmitted('web', [{ siteIds: ['*'] }]), true);
+  assert.equal(isRoleSiteAdmitted('admin', [{ siteIds: ['*'] }]), true);
+  assert.equal(isRoleSiteAdmitted(undefined, [{ siteIds: ['*'] }]), false);
+  assert.equal(isRoleSiteAdmitted('', [{ siteIds: ['*'] }]), false);
+});
+
+test('combines site admission across roles', () => {
+  assert.equal(isRoleSiteAdmitted('admin', [{ siteIds: ['web'] }, { siteIds: ['admin'] }]), true);
+  assert.equal(
+    isRoleSiteAdmitted('web', [{ siteIds: ['storefront'] }, { siteIds: ['admin'] }]),
+    false,
+  );
+});

package/zova/src/suite/a-training/modules/training-student/src/bean/tableCell.actionSummary.tsx

@@ -40,15 +40,38 @@ export class TableCellActionSummary extends BeanBase implements ITableCellRender
             true,
           )) as ModelStudent;
           const querySummary = modelStudent.summary(id);
-          await querySummary.refetch({ bypassPersister: true });
+          await querySummary.suspense();
           $host.$appModal.dialog(
             {
               title: this.scope.locale.Summary(),
-              slotDefault: () => (
-                <div class="student-summary-description">
-                  <ZMarkdownHtml html={querySummary.data?.descriptionHtml ?? ''} />
-                </div>
-              ),
+              slotDefault: () => {
+                const hasData = querySummary.data !== undefined;
+                const isLoading = !hasData && (querySummary.isPending || querySummary.isFetching);
+                const error = querySummary.error;
+                return (
+                  <>
+                    {hasData && error && (
+                      <div class="alert alert-warning mb-3" role="alert">
+                        <span>{this.scope.locale.SummaryRefreshFailed()}</span>
+                      </div>
+                    )}
+                    {error && (
+                      <div class="alert alert-error mb-3" role="alert">
+                        <span>{error.message}</span>
+                      </div>
+                    )}
+                    {hasData ? (
+                      <div class="student-summary-description">
+                        <ZMarkdownHtml html={querySummary.data?.descriptionHtml ?? ''} />
+                      </div>
+                    ) : isLoading ? (
+                      <div class="flex justify-center p-4" role="status">
+                        <span class="loading loading-spinner text-primary" />
+                      </div>
+                    ) : undefined}
+                  </>
+                );
+              },
             },
             {
               maxWidth: 720,

package/zova/src/suite/a-training/modules/training-student/src/config/locale/en-us.ts

@@ -1,5 +1,6 @@
 export default {
   Summary: 'Summary',
+  SummaryRefreshFailed: 'The latest Summary refresh failed. Displayed content may be outdated.',
   ForceDelete: 'Force Delete',
   ForceDeleteConfirm: 'Are you sure you want to permanently delete this student?',
   Id: 'ID',

package/zova/src/suite/a-training/modules/training-student/src/config/locale/zh-cn.ts

@@ -1,5 +1,6 @@
 export default {
   Summary: '摘要',
+  SummaryRefreshFailed: '最新摘要刷新失败，当前显示的内容可能不是最新的。',
   ForceDelete: '强制删除',
   ForceDeleteConfirm: '您确认要永久删除该学生吗？',
   Id: 'ID',

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

@@ -25,7 +25,7 @@ export class ModelStudent extends BeanModelBase {
         return res ?? null;
       },
       meta: {
-        disableSuspenseOnInit: true,
+        disableErrorEffect: true,
       },
     });
   }

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

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

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

@@ -0,0 +1,11 @@
+export interface IMutationSuccessOptions {
+  invalidateSelect?: () => Promise<void>;
+  invalidateItem?: () => Promise<void>;
+  onSuccess?: () => void | Promise<void>;
+}
+
+export async function runMutationSuccess(options: IMutationSuccessOptions) {
+  await options.invalidateSelect?.();
+  await options.invalidateItem?.();
+  await options.onSuccess?.();
+}

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

@@ -17,6 +17,7 @@ import { $QueryEnsureLoaded, BeanModelBase, Model } from 'zova-module-a-model';
 import { ScopeModuleAOpenapi, SymbolOpenapiSchemaName } from 'zova-module-a-openapi';
 
 import { prepareDeleteRequestConfig } from '../lib/deleteRequest.js';
+import { runMutationSuccess } from '../lib/mutationSuccess.js';
 
 export interface IModelOptionsResource extends IDecoratorModelOptions {}
 
@@ -154,8 +155,10 @@ export class ModelResource<
           this.sys.util.apiActionConfigPrepare(),
         );
       },
-      onSuccess: () => {
-        this.$invalidateQueries({ queryKey: ['select'] });
+      onSuccess: async () => {
+        await runMutationSuccess({
+          invalidateSelect: () => this.$invalidateQueries({ queryKey: ['select'] }),
+        });
       },
     });
   }
@@ -169,11 +172,13 @@ export class ModelResource<
       mutationKey: [...this.keyItem(id, action), 'mutation'],
       mutationFn,
       onSuccess: async (data, variables, context) => {
-        if (invalidateSelect) {
-          this.$invalidateQueries({ queryKey: ['select'] });
-        }
-        this.$invalidateQueries({ queryKey: this.keyItemRoot(id) });
-        await onSuccess?.(data, variables, context);
+        await runMutationSuccess({
+          invalidateSelect: invalidateSelect
+            ? () => this.$invalidateQueries({ queryKey: ['select'] })
+            : undefined,
+          invalidateItem: () => this.$invalidateQueries({ queryKey: this.keyItemRoot(id) }),
+          onSuccess: () => onSuccess?.(data, variables, context),
+        });
       },
     });
   }

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/test/lib/mutationSuccess.test.ts

@@ -0,0 +1,95 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { runMutationSuccess } from '../../src/lib/mutationSuccess.ts';
+
+function createDeferred() {
+  let resolve: (() => void) | undefined;
+  const promise = new Promise<void>(resolve_ => {
+    resolve = resolve_;
+  });
+  return { promise, resolve: () => resolve?.() };
+}
+
+async function flushAsyncWork() {
+  await new Promise<void>(resolve => setImmediate(resolve));
+}
+
+test('waits for select invalidation when used by a create mutation', async () => {
+  const select = createDeferred();
+  let completed = false;
+  const result = runMutationSuccess({
+    invalidateSelect: () => select.promise,
+  }).then(() => {
+    completed = true;
+  });
+
+  await flushAsyncWork();
+  assert.equal(completed, false);
+
+  select.resolve();
+  await result;
+  assert.equal(completed, true);
+});
+
+test('waits for select and item invalidation before custom success handling', async () => {
+  const select = createDeferred();
+  const item = createDeferred();
+  const calls: string[] = [];
+  let completed = false;
+  const result = runMutationSuccess({
+    invalidateSelect: async () => {
+      calls.push('select');
+      await select.promise;
+    },
+    invalidateItem: async () => {
+      calls.push('item');
+      await item.promise;
+    },
+    onSuccess: () => {
+      calls.push('success');
+    },
+  }).then(() => {
+    completed = true;
+  });
+
+  await flushAsyncWork();
+  assert.deepEqual(calls, ['select']);
+  assert.equal(completed, false);
+
+  select.resolve();
+  await flushAsyncWork();
+  assert.deepEqual(calls, ['select', 'item']);
+  assert.equal(completed, false);
+
+  item.resolve();
+  await result;
+  assert.deepEqual(calls, ['select', 'item', 'success']);
+  assert.equal(completed, true);
+});
+
+test('skips select invalidation while still waiting for item invalidation', async () => {
+  const item = createDeferred();
+  const calls: string[] = [];
+  let completed = false;
+  const result = runMutationSuccess({
+    invalidateItem: async () => {
+      calls.push('item');
+      await item.promise;
+    },
+    onSuccess: () => {
+      calls.push('success');
+    },
+  }).then(() => {
+    completed = true;
+  });
+
+  await flushAsyncWork();
+  assert.deepEqual(calls, ['item']);
+  assert.equal(completed, false);
+
+  item.resolve();
+  await result;
+  assert.deepEqual(calls, ['item', 'success']);
+  assert.equal(completed, true);
+});

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

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

package/vona/src/suite/a-commerce/modules/commerce-siteadmin/src/bean/meta.version.ts

@@ -1,32 +0,0 @@
-import type {
-  IMetaVersionInit,
-  IMetaVersionInitOptions,
-  IMetaVersionUpdate,
-  IMetaVersionUpdateOptions,
-} from 'vona-module-a-version';
-
-import { BeanBase } from 'vona';
-import { Meta } from 'vona-module-a-meta';
-
-const roleSiteIds = {
-  registeredUser: ['commerce'],
-  systemAdmin: ['commerce', 'commerceAdmin'],
-};
-
-@Meta()
-export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVersionInit {
-  async update(_options: IMetaVersionUpdateOptions) {}
-
-  async init(options: IMetaVersionInitOptions) {
-    if (options.version !== 1) return;
-    const modelRole = this.app.scope('home-user').model.role;
-    for (const [roleName, requiredSiteIds] of Object.entries(roleSiteIds)) {
-      const role = await modelRole.getByName(roleName);
-      if (!role) continue;
-
-      const siteIds = [...new Set([...role.siteIds, ...requiredSiteIds])];
-      if (siteIds.length === role.siteIds.length) continue;
-      await modelRole.updateById(role.id, { siteIds });
-    }
-  }
-}

package/vona/src/suite/a-commerce/modules/commerce-siteadmin/test/meta.version.test.ts

@@ -1,44 +0,0 @@
-import assert from 'node:assert';
-import { describe, it } from 'node:test';
-import { app } from 'vona-mock';
-
-describe('meta.version.test.ts', () => {
-  it('init:version:1 preserves existing grants and appends Commerce site access once', async () => {
-    await app.bean.executor.mockCtx(async () => {
-      const modelRole = app.scope('home-user').model.role;
-      const roleRegisteredUser = await modelRole.getByName('registeredUser');
-      const roleSystemAdmin = await modelRole.getByName('systemAdmin');
-      assert.ok(roleRegisteredUser);
-      assert.ok(roleSystemAdmin);
-      const registeredUserSiteIdsOriginal = roleRegisteredUser.siteIds;
-      const systemAdminSiteIdsOriginal = roleSystemAdmin.siteIds;
-      try {
-        await modelRole.updateById(roleRegisteredUser.id, { siteIds: ['web', 'customSite'] });
-        await modelRole.updateById(roleSystemAdmin.id, {
-          siteIds: ['web', 'admin', 'customSite', 'commerce'],
-        });
-
-        const metaVersion = app.scope('commerce-siteadmin').meta.version;
-        await metaVersion.init({ version: 1 });
-        await metaVersion.init({ version: 1 });
-
-        const registeredUser = await modelRole.getByName('registeredUser');
-        assert.deepEqual(registeredUser?.siteIds, ['web', 'customSite', 'commerce']);
-
-        const systemAdmin = await modelRole.getByName('systemAdmin');
-        assert.deepEqual(systemAdmin?.siteIds, [
-          'web',
-          'admin',
-          'customSite',
-          'commerce',
-          'commerceAdmin',
-        ]);
-      } finally {
-        await modelRole.updateById(roleRegisteredUser.id, {
-          siteIds: registeredUserSiteIdsOriginal,
-        });
-        await modelRole.updateById(roleSystemAdmin.id, { siteIds: systemAdminSiteIdsOriginal });
-      }
-    });
-  });
-});