cabloy 5.1.179 → 5.1.180

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/bean/bean.rbacScope.ts

@@ -11,10 +11,12 @@ import { getRbacDecision, hasRbacAllScope, rbacActionKey } from '../lib/rbac.ts'
 
 @Bean()
 export class BeanRbacScope extends BeanBase {
-  private _scopeAdapter: IRbacScopeAdapter | undefined;
+  private _scopeAdapter: IRbacScopeAdapter | null | undefined;
 
   async isUnrestricted(): Promise<boolean> {
-    return await this.scopeAdapter.isUnrestricted();
+    const scopeAdapter = this.scopeAdapter;
+    if (scopeAdapter) return await scopeAdapter.isUnrestricted();
+    return await this.bean.passport.isSystemAdmin();
   }
 
   async current(actionKey?: string): Promise<IRbacScopeAccess> {
@@ -26,19 +28,21 @@ export class BeanRbacScope extends BeanBase {
 
     const unrestricted = hasRbacAllScope(decision);
     const ownerValues =
-      action.action === 'create'
+      action.action === 'create' && action.options.dataScope
         ? await this.prepareOwnerValues(action, decision, unrestricted)
         : undefined;
     return this.createAccess(action, decision, unrestricted, ownerValues);
   }
 
-  private get scopeAdapter(): IRbacScopeAdapter {
-    if (!this._scopeAdapter) {
+  private get scopeAdapter(): IRbacScopeAdapter | null {
+    if (this._scopeAdapter === undefined) {
       const beanFullName = beanFullNameFromOnionName(
         this.scope.config.adapter.rbacScope,
         'service',
       );
-      this._scopeAdapter = this.bean._getBean(beanFullName) as unknown as IRbacScopeAdapter;
+      this._scopeAdapter =
+        (this.bean._getBean(beanFullName) as unknown as IRbacScopeAdapter | null | undefined) ??
+        null;
     }
     return this._scopeAdapter;
   }
@@ -48,7 +52,9 @@ export class BeanRbacScope extends BeanBase {
     decision: IRbacPolicyDecision,
     unrestricted: boolean,
   ): Promise<Record<string, TableIdentity | null | undefined>> {
-    const values = await this.scopeAdapter.ownerValues(action, decision);
+    const scopeAdapter = this.scopeAdapter;
+    if (!scopeAdapter) this.app.throw(403);
+    const values = await scopeAdapter.ownerValues(action, decision);
     const departmentField = action.options.dataScopeField ?? 'departmentId';
     const ownerField = action.options.dataScopeMineField ?? 'userIdOwner';
     const ownerValues = {

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/test/rbacScopeCurrent.test.ts

@@ -90,6 +90,21 @@ describe('rbacScopeCurrent.test.ts', { concurrency: false }, () => {
     access.checkEntries([{ departmentId: 'one' }, { departmentId: 'two' }]);
   });
 
+  it('falls back to the system-admin passport check without a configured adapter', async () => {
+    let systemAdmin = false;
+    const scope = Object.create(BeanRbacScope.prototype) as BeanRbacScope;
+    Object.defineProperties(scope, {
+      bean: {
+        value: { passport: { isSystemAdmin: async () => systemAdmin } },
+      },
+      _scopeAdapter: { value: null, writable: true },
+    });
+
+    assert.equal(await scope.isUnrestricted(), false);
+    systemAdmin = true;
+    assert.equal(await scope.isUnrestricted(), true);
+  });
+
   it('does not expose the decision to a child context sharing caller state', () => {
     const action = createAction();
     const ctx = { route: action.route, state: {} } as VonaContext;
@@ -146,6 +161,19 @@ describe('rbacScopeCurrent.test.ts', { concurrency: false }, () => {
     await assertForbidden(() => scope.current());
   });
 
+  it('does not require adapter owner values for an unscoped create action', async () => {
+    const action = { ...createAction('create'), options: {} };
+    const { scope, ctx } = createScope(action, null as never);
+    setRbacDecision(ctx, createDecision(action, [{ dataScope: 'all' }]));
+
+    const access = await scope.current();
+    assert.equal(access.unrestricted, true);
+    assert.throws(
+      () => access.ownerValues(),
+      error => (error as { code?: number }).code === 500,
+    );
+  });
+
   it('derives create owner values from the configured adapter', async () => {
     const action = createAction('create');
     const adapter: IRbacScopeAdapter = {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.54",
+  "version": "5.1.55",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -10,7 +10,7 @@
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-layoutprofile": "^5.0.2",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.6",
+    "vona-module-a-rbac": "^5.0.7",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.22",
+  "version": "5.1.23",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

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

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.91",
+  "version": "1.1.92",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.91"
+    "zova-core": "^5.1.92"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.165",
+  "version": "5.1.166",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.91",
-    "zova-suite-a-zova": "^5.1.164"
+    "zova-core": "^5.1.92",
+    "zova-suite-a-zova": "^5.1.165"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.91",
+  "version": "5.1.92",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/bean/type.ts

@@ -62,6 +62,7 @@ export type TypeAllErrorCodes = TypeScopesErrorCodes | keyof TypeErrorsInternal;
 
 export interface IControllerDataContext {
   slots?: object;
+  page?: boolean;
 }
 
 export interface IControllerData {

package/zova/packages-zova/zova-core/src/composables/useController.ts

@@ -39,7 +39,7 @@ export function useControllerPage(
   styleBeanFullName?: Constructable | string,
 ) {
   // controllerData
-  const controllerData = { context: {} };
+  const controllerData = { context: { page: true } };
   // use controller
   _useController(controllerData, controllerBeanFullName, renderBeanFullName, styleBeanFullName);
 }

package/zova/src/suite/a-home/modules/home-indexadmin/src/page/dashboard/controller.tsx

@@ -10,10 +10,17 @@ export class ControllerPageDashboard extends BeanControllerPageBase {
   protected __init__() {
     if (!this.$pageRoute) return;
     this.$ssr.handleDirectOrOnHydrated(() => {
-      this.currentTime = new Date().toLocaleTimeString();
-      this._timer = window.setInterval(() => {
-        this.currentTime = new Date().toLocaleTimeString();
-      }, 1000);
+      this.$watch(
+        () => this.$pageHost?.active,
+        active => {
+          if (active) {
+            this._startTimer();
+          } else {
+            this._stopTimer();
+          }
+        },
+        { immediate: true },
+      );
     });
     this.$router.setPageMeta(this.$pageRoute, {
       onCustomRenderIsolate: () => (
@@ -29,10 +36,22 @@ export class ControllerPageDashboard extends BeanControllerPageBase {
     });
   }
 
+  private _startTimer() {
+    if (this._timer !== undefined) return;
+    this.currentTime = new Date().toLocaleTimeString();
+    this._timer = window.setInterval(() => {
+      this.currentTime = new Date().toLocaleTimeString();
+    }, 1000);
+  }
+
+  private _stopTimer() {
+    if (this._timer === undefined) return;
+    window.clearInterval(this._timer);
+    this._timer = undefined;
+  }
+
   protected __dispose__() {
-    if (this._timer !== undefined) {
-      window.clearInterval(this._timer);
-    }
+    this._stopTimer();
   }
 
   protected render() {

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

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

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

@@ -1,2 +1,3 @@
 export const pageRouteKey = '$$pageRoute';
+export const pageHostKey = '$$pageHost';
 export const routerViewKey = '$$routerView';

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

@@ -18,14 +18,15 @@ import type {
 import type { ErrorSSR } from 'zova-module-a-ssr';
 
 import * as ModuleInfo from '@cabloy/module-info';
-import { shallowReactive } from 'vue';
+import { onActivated, onBeforeUnmount, onDeactivated, shallowReactive } from 'vue';
 import { BeanControllerPageBase, BeanSimple, cast, useComputed } from 'zova';
 
 import type { BeanRouter } from './bean/bean.router.js';
 import type { SysRouter } from './bean/sys.router.js';
+import type { IPageHost } from './types/pageHost.js';
 import type { TypePageSchema } from './types/router.js';
 
-import { routerViewKey } from './lib/const.js';
+import { pageHostKey, routerViewKey } from './lib/const.js';
 import { getCurrentRoute, getPageRoute, getRealRouteName, getRouteMatched } from './lib/utils.js';
 import { ServiceRouterGuards } from './service/routerGuards.js';
 import { SymbolRouterHistory } from './types/utils.js';
@@ -42,6 +43,7 @@ export class Monkey
 {
   private _beanRouter: BeanRouter;
   private _sysRouter: SysRouter;
+  private _pageHosts = new WeakMap<ZovaContext, IPageHost>();
   serviceRouterGuards: ServiceRouterGuards;
 
   private async _getSysRouter() {
@@ -149,6 +151,13 @@ export class Monkey
         });
       },
     });
+    bean.defineProperty(beanInstance, '$pageHost', {
+      enumerable: false,
+      configurable: true,
+      get() {
+        return bean._getBeanFromHost({ name: pageHostKey }) ?? undefined;
+      },
+    });
     bean.defineProperty(beanInstance, '$currentRoute', {
       enumerable: false,
       configurable: true,
@@ -161,9 +170,37 @@ export class Monkey
   }
 
   controllerDataPrepare(controllerData: IControllerData, ctx: ZovaContext) {
+    if (controllerData.context.page) {
+      this._initPageHost(ctx);
+    }
     controllerData.context.route = getPageRoute(ctx);
   }
 
+  private _initPageHost(ctx: ZovaContext) {
+    const existing = this._pageHosts.get(ctx);
+    if (existing) {
+      ctx.bean._setBean(pageHostKey, existing);
+      return;
+    }
+
+    const pageHost = shallowReactive({ active: true });
+    this._pageHosts.set(ctx, pageHost);
+    ctx.bean._setBean(pageHostKey, pageHost);
+    if (!process.env.CLIENT) return;
+
+    ctx.util.instanceScope(() => {
+      onActivated(() => {
+        pageHost.active = true;
+      });
+      onDeactivated(() => {
+        pageHost.active = false;
+      });
+      onBeforeUnmount(() => {
+        pageHost.active = false;
+      });
+    });
+  }
+
   controllerDataInit(controllerData: IControllerData, controller: BeanBase) {
     // only for controller page
     if (!(controller instanceof BeanControllerPageBase)) return;

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

@@ -1,3 +1,4 @@
+export * from './pageHost.js';
 export * from './pageMeta.js';
 export * from './router.js';
 export * from './routerView.js';

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

@@ -0,0 +1,9 @@
+export interface IPageHost {
+  /**
+   * Whether the concrete routed page instance is currently activated.
+   *
+   * This does not describe route selection, cache membership, visibility, or
+   * data readiness.
+   */
+  readonly active: boolean;
+}

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

@@ -17,6 +17,7 @@ import type {
 
 import type { BeanRouter } from '../bean/bean.router.js';
 import type { BeanRouterViewBase } from '../lib/routerViewBase.js';
+import type { IPageHost } from './pageHost.js';
 import type { IGetPagePathOptions, IGotoPageOptions } from './utils.js';
 import 'vue-router';
 
@@ -72,6 +73,7 @@ declare module 'zova' {
     $router: BeanRouter;
     $routerView: BeanRouterViewBase;
     $pageRoute: RouteLocationNormalizedLoadedGeneric | undefined;
+    $pageHost: IPageHost | undefined;
     $currentRoute: RouteLocationNormalizedLoadedGeneric | undefined;
   }
 

package/zova/src/suite-vendor/a-zova/modules/a-router/test/lib/pageHost.test.ts

@@ -0,0 +1,53 @@
+import type { BeanBase, BeanContainer } from 'zova';
+
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { pageHostKey } from '../../src/lib/const.js';
+import { Monkey } from '../../src/monkey.js';
+
+function createBean() {
+  const lookups: string[] = [];
+  let pageHost: object | undefined;
+  const beanContainer = {
+    defineProperty<T>(beanInstance: T, prop: string, attributes: PropertyDescriptor) {
+      return Object.defineProperty(beanInstance, prop, attributes);
+    },
+    _getBeanFromHost<T>({ name }: { name: string }) {
+      lookups.push(name);
+      return pageHost as T | undefined;
+    },
+  } as unknown as BeanContainer;
+  const beanInstance = {} as BeanBase;
+  const monkey = new Monkey();
+
+  return {
+    beanInstance,
+    beanContainer,
+    lookups,
+    monkey,
+    setPageHost(value: object | undefined) {
+      pageHost = value;
+    },
+  };
+}
+
+test('$pageHost reads the current page host from the bean host', async () => {
+  const { beanInstance, beanContainer, lookups, monkey, setPageHost } = createBean();
+  await monkey.beanInit(beanContainer, beanInstance);
+
+  assert.equal(beanInstance.$pageHost, undefined);
+
+  const firstPageHost = { active: true };
+  setPageHost(firstPageHost);
+  assert.equal(beanInstance.$pageHost, firstPageHost);
+
+  const secondPageHost = { active: false };
+  setPageHost(secondPageHost);
+  assert.equal(beanInstance.$pageHost, secondPageHost);
+
+  assert.deepEqual(lookups, [pageHostKey, pageHostKey, pageHostKey]);
+  const descriptor = Object.getOwnPropertyDescriptor(beanInstance, '$pageHost');
+  assert.equal(descriptor?.enumerable, false);
+  assert.equal(descriptor?.configurable, true);
+});

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.107",
+  "version": "5.1.108",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.91"
+    "zova-jsx": "^1.1.92"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.29",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.164",
+  "version": "5.1.165",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -22,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.40",
+    "zova-module-a-router": "^5.1.41",
     "zova-module-a-routerstack": "^5.1.29",
     "zova-module-a-routertabs": "^5.1.34",
     "zova-module-a-ssr": "^5.1.40",
@@ -31,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.107"
+    "zova-module-a-zova": "^5.1.108"
   },
   "title": "a-zova"
 }