cabloy 5.1.154 → 5.1.156

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.48",
+  "version": "5.1.49",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -9,7 +9,7 @@
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.2",
+    "vona-module-a-rbac": "^5.0.3",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.51",
+  "version": "5.1.52",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-queue",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-queue/src/lib/beanQueueBase.ts

@@ -11,7 +11,7 @@ export class BeanQueueBase<DATA = unknown, RESULT = unknown> extends BeanBase {
     );
   }
 
-  push(data: DATA, options?: IQueuePushOptions) {
+  push(data: DATA, options?: IQueuePushOptions): Promise<void> {
     return this.$scope.queue.service.queue.push(
       this.$scope.queue.service.queue.prepareJobInfo(this.$onionName as any, data, options),
     );

package/vona/src/suite-vendor/a-vona/modules/a-queue/src/service/queue.ts

@@ -24,9 +24,9 @@ export class ServiceQueue extends BeanBase {
   _queues: IQueueQueues = {};
   _queueCallbacks: IQueueCallbacks = {};
 
-  push<DATA>(info: IQueueJobContext<DATA>) {
+  push<DATA>(info: IQueueJobContext<DATA>): Promise<void> {
     if (!info.options?.dbInfo) throw new Error('should specify the options.dbInfo');
-    this._queuePush(info, false);
+    return this._queuePush(info, false);
   }
 
   // { locale, instanceName, module, queueName,queueNameSub,data }

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

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

package/vona/src/suite-vendor/a-vona/modules/a-user/src/.metadata/index.ts

@@ -174,6 +174,7 @@ export interface IModuleCacheRedis {
 export * from '../bean/event.activate.ts';
 export * from '../bean/event.createAnonymous.ts';
 export * from '../bean/event.register.ts';
+export * from '../bean/event.roleMembershipChanged.ts';
 export * from '../bean/event.signin.ts';
 export * from '../bean/event.signout.ts';
 
@@ -214,6 +215,16 @@ declare module 'vona-module-a-user' {
             get $onionName(): 'a-user:register';
           }
 
+        export interface EventRoleMembershipChanged {
+          /** @internal */
+          get scope(): ScopeModuleAUser;
+        }
+
+          export interface EventRoleMembershipChanged {
+            get $beanFullName(): 'a-user.event.roleMembershipChanged';
+            get $onionName(): 'a-user:roleMembershipChanged';
+          }
+
         export interface EventSignin {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -239,12 +250,14 @@ declare module 'vona-module-a-user' {
 import type { EventActivate } from '../bean/event.activate.ts';
 import type { EventCreateAnonymous } from '../bean/event.createAnonymous.ts';
 import type { EventRegister } from '../bean/event.register.ts';
+import type { EventRoleMembershipChanged } from '../bean/event.roleMembershipChanged.ts';
 import type { EventSignin } from '../bean/event.signin.ts';
 import type { EventSignout } from '../bean/event.signout.ts';
 export interface IModuleEvent {
   'activate': EventActivate;
 'createAnonymous': EventCreateAnonymous;
 'register': EventRegister;
+'roleMembershipChanged': EventRoleMembershipChanged;
 'signin': EventSignin;
 'signout': EventSignout;
 }
@@ -253,6 +266,7 @@ export interface IModuleEvent {
 import type { TypeEventActivateData, TypeEventActivateResult } from '../bean/event.activate.ts';
 import type { TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult } from '../bean/event.createAnonymous.ts';
 import type { TypeEventRegisterData, TypeEventRegisterResult } from '../bean/event.register.ts';
+import type { TypeEventRoleMembershipChangedData, TypeEventRoleMembershipChangedResult } from '../bean/event.roleMembershipChanged.ts';
 import type { TypeEventSigninData, TypeEventSigninResult } from '../bean/event.signin.ts';
 import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event.signout.ts';
 import type { EventOn } from 'vona-module-a-event';
@@ -261,6 +275,7 @@ declare module 'vona-module-a-event' {
     'a-user:activate': EventOn<TypeEventActivateData, TypeEventActivateResult>;
 'a-user:createAnonymous': EventOn<TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult>;
 'a-user:register': EventOn<TypeEventRegisterData, TypeEventRegisterResult>;
+'a-user:roleMembershipChanged': EventOn<TypeEventRoleMembershipChangedData, TypeEventRoleMembershipChangedResult>;
 'a-user:signin': EventOn<TypeEventSigninData, TypeEventSigninResult>;
 'a-user:signout': EventOn<TypeEventSignoutData, TypeEventSignoutResult>;
   }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/bean.role.ts

@@ -2,8 +2,9 @@ import type { TableIdentity } from 'table-identity';
 
 import { BeanBase, beanFullNameFromOnionName } from 'vona';
 import { Bean } from 'vona-module-a-bean';
+import { Core } from 'vona-module-a-core';
 
-import type { IRole, IRoleAdapter } from '../types/role.ts';
+import type { IRole, IRoleAdapter, IRoleMembershipReplaceResult } from '../types/role.ts';
 
 @Bean()
 export class BeanRole extends BeanBase {
@@ -33,7 +34,47 @@ export class BeanRole extends BeanBase {
     return this.roleAdapter.findAllByUserId(userId);
   }
 
-  addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity> {
-    return this.roleAdapter.addUserId(id, userId);
+  @Core.transaction()
+  async addUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean> {
+    const changed = await this.roleAdapter.addUserId(id, userId);
+    if (changed) await this.emitMembershipChanged(userId, [id]);
+    return changed;
+  }
+
+  @Core.transaction()
+  async removeUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean> {
+    const changed = await this.roleAdapter.removeUserId(id, userId);
+    if (changed) await this.emitMembershipChanged(userId, [id]);
+    return changed;
+  }
+
+  @Core.transaction()
+  async replaceUserRoleIds(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+    options?: { preserveRoleIds?: TableIdentity[] },
+  ): Promise<IRoleMembershipReplaceResult> {
+    const result = await this.roleAdapter.replaceUserRoleIds(userId, roleIds, options);
+    const changedRoleIds = [...result.addedRoleIds, ...result.removedRoleIds];
+    if (changedRoleIds.length) await this.emitMembershipChanged(userId, changedRoleIds);
+    return result;
+  }
+
+  private async emitMembershipChanged(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+  ): Promise<void> {
+    await this.scope.event.roleMembershipChanged.emit({
+      userIds: this.uniqueIds([userId]),
+      roleIds: this.uniqueIds(roleIds),
+    });
+  }
+
+  private uniqueIds(ids: TableIdentity[]): TableIdentity[] {
+    const values = new Map<string, TableIdentity>();
+    for (const id of ids) values.set(String(id), id);
+    return [...values.entries()]
+      .toSorted(([left], [right]) => left.localeCompare(right))
+      .map(([, id]) => id);
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/event.roleMembershipChanged.ts

@@ -0,0 +1,16 @@
+import type { TableIdentity } from 'table-identity';
+
+import { BeanEventBase, Event } from 'vona-module-a-event';
+
+export interface TypeEventRoleMembershipChangedData {
+  userIds: TableIdentity[];
+  roleIds: TableIdentity[];
+}
+
+export type TypeEventRoleMembershipChangedResult = void;
+
+@Event()
+export class EventRoleMembershipChanged extends BeanEventBase<
+  TypeEventRoleMembershipChangedData,
+  TypeEventRoleMembershipChangedResult
+> {}

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -18,9 +18,20 @@ export interface IRole {
   builtin?: boolean;
 }
 
+export interface IRoleMembershipReplaceResult {
+  addedRoleIds: TableIdentity[];
+  removedRoleIds: TableIdentity[];
+}
+
 export interface IRoleAdapter {
   findOneByName(name: string): Promise<IRole | undefined>;
   findOne(role: Partial<IRole>): Promise<IRole | undefined>;
   findAllByUserId(userId: TableIdentity): Promise<IRole[] | undefined>;
-  addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity>;
+  addUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean>;
+  removeUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean>;
+  replaceUserRoleIds(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+    options?: { preserveRoleIds?: TableIdentity[] },
+  ): Promise<IRoleMembershipReplaceResult>;
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.82",
+  "version": "5.1.83",
   "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.48
+        specifier: ^5.1.49
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/a-rbac:

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

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

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

@@ -0,0 +1,9 @@
+export const resourceRouteMeta = {
+  tabKey: resourceTabKey,
+  componentKey: resourceTabKey,
+  ssrProfile: 'session' as const,
+};
+
+export function resourceTabKey(route: { params: Record<string, string | string[]> }) {
+  return `/rest/resource/${encodeURIComponent(route.params.resource as string)}`;
+}

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

@@ -3,23 +3,21 @@ import type { IModuleRoute } from 'zova-module-a-router';
 import { ZPageEntry } from './.metadata/page/entry.js';
 import { ZPageEntryCreate } from './.metadata/page/entryCreate.js';
 import { ZPageResource } from './.metadata/page/resource.js';
+import { resourceRouteMeta, resourceTabKey } from './lib/resourceRouteMeta.js';
 
 export const routes: IModuleRoute[] = [
   {
     name: 'resource',
     path: ':resource',
     component: ZPageResource,
-    meta: {
-      tabKey,
-      ssrProfile: 'session',
-    },
+    meta: resourceRouteMeta,
   },
   {
     name: 'entryCreate',
     path: ':resource/create',
     component: ZPageEntryCreate,
     meta: {
-      tabKey,
+      tabKey: resourceTabKey,
       ssrProfile: 'session',
     },
   },
@@ -28,12 +26,8 @@ export const routes: IModuleRoute[] = [
     path: ':resource/:id/:formScene?',
     component: ZPageEntry,
     meta: {
-      tabKey,
+      tabKey: resourceTabKey,
       ssrProfile: 'session',
     },
   },
 ];
-
-function tabKey(route) {
-  return `/rest/resource/${encodeURIComponent(route.params.resource)}`;
-}

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

@@ -0,0 +1,37 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { resourceRouteMeta } from '../../src/lib/resourceRouteMeta.ts';
+
+function getResourceKey(url: string) {
+  const resource = decodeURIComponent(url.substring('/rest/resource/'.length));
+  const route = { params: { resource } };
+  return {
+    resource,
+    componentKey: resourceRouteMeta.componentKey(route),
+    tabKey: resourceRouteMeta.tabKey(route),
+  };
+}
+
+test('resource root canonicalizes colon URL spellings to one component key', () => {
+  const expectedKey = '/rest/resource/admin-user%3Auser';
+
+  for (const url of [
+    '/rest/resource/admin-user:user',
+    '/rest/resource/admin-user%3Auser',
+    '/rest/resource/admin-user%3auser',
+  ]) {
+    const actual = getResourceKey(url);
+    assert.equal(actual.resource, 'admin-user:user');
+    assert.equal(actual.componentKey, expectedKey);
+    assert.equal(actual.tabKey, expectedKey);
+  }
+});
+
+test('resource root keeps distinct resource workspaces separate', () => {
+  const user = getResourceKey('/rest/resource/admin-user:user');
+  const role = getResourceKey('/rest/resource/admin-user:role');
+
+  assert.notEqual(user.componentKey, role.componentKey);
+  assert.notEqual(user.tabKey, role.tabKey);
+});

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

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

package/test-results/cabloy-basic-ATP-BASIC-SUM-58d8a-ry-states-and-Markdown-HTML/error-context.md

@@ -1,195 +0,0 @@
-# Instructions
-
-- Following Playwright test failed.
-- Explain why, be concise, respect Playwright best practices.
-- Provide a snippet of code with the fix, if possible.
-
-# Test info
-
-- Name: cabloy-basic.spec.ts >> ATP-BASIC-SUMMARY-01: Training Student summary dialog renders query states and Markdown HTML
-- Location: repo-e2e/specs/cabloy-basic.spec.ts:416:1
-
-# Error details
-
-```
-Error: expect(page).not.toHaveURL(expected) failed
-
-Expected pattern: not /\/admin\/login(?:\?|$)/
-Received string: "http://127.0.0.1:7102/admin/login"
-Timeout: 5000ms
-
-Call log:
-  - Expect "not toHaveURL" with timeout 5000ms
-    14 × locator resolved to <html lang="en-us" data-zova-hydrated="admin">…</html>
-       - unexpected value "http://127.0.0.1:7102/admin/login"
-
-```
-
-```yaml
-- heading "Zova" [level=1]
-- heading "Less is more, while more is less" [level=5]
-- heading "Login" [level=2]
-- textbox:
-  - /placeholder: Your Username
-  - text: admin
-- textbox:
-  - /placeholder: Your Password
-  - text: "123456"
-- textbox:
-  - /placeholder: Please input captcha
-  - text: TrAs
-- img
-- button "Login"
-- button "Create account"
-- button "Forgot password?"
-- text: OR
-- button "Sign in with GitHub"
-- dialog:
-  - heading "Cabloy Basic" [level=3]
-  - paragraph: "select `aAuthProvider`.`id` from `aAuthProvider` where `providerName` = 'auth-simple:simple' and `clientName` = 'default' and `aAuthProvider`.`iid` = 1 - no such table: aAuthProvider"
-  - button "Close"
-```
-
-# Test source
-
-```ts
-  1   | import type { Locator, Page, Route } from '@playwright/test';
-  2   | 
-  3   | import { expect, test } from '@playwright/test';
-  4   | 
-  5   | const studentResourceUrl =
-  6   |   /\/admin\/rest\/resource\/training-student(?:%3A|:|%253A)student(?:[/?#]|$)/;
-  7   | 
-  8   | interface IFieldGeometry {
-  9   |   container: {
-  10  |     display: string;
-  11  |     flexWrap: string;
-  12  |     left: number;
-  13  |     right: number;
-  14  |   };
-  15  |   field: {
-  16  |     top: number;
-  17  |     left: number;
-  18  |     right: number;
-  19  |     bottom: number;
-  20  |   };
-  21  | }
-  22  | 
-  23  | function collectPageErrors(page: Page) {
-  24  |   const errors: Error[] = [];
-  25  |   page.on('pageerror', error => {
-  26  |     errors.push(error);
-  27  |   });
-  28  |   return errors;
-  29  | }
-  30  | 
-  31  | async function loginAsAdmin(page: Page) {
-  32  |   await page.goto('/admin/', { waitUntil: 'load' });
-  33  |   if (page.url().includes('/admin/login')) {
-  34  |     await page.getByPlaceholder('Your Username').fill('admin');
-  35  |     await page.getByPlaceholder('Your Password').fill('123456');
-  36  |     await expect(page.getByPlaceholder('Please input captcha')).not.toHaveValue('');
-  37  |     await page.getByRole('button', { name: 'Login', exact: true }).click();
-> 38  |     await expect(page).not.toHaveURL(/\/admin\/login(?:\?|$)/);
-      |                            ^ Error: expect(page).not.toHaveURL(expected) failed
-  39  |   }
-  40  | 
-  41  |   await expect(page.locator('html')).toHaveAttribute('data-zova-hydrated', 'admin');
-  42  |   const dashboardResponse = await page.goto('/admin/', { waitUntil: 'load' });
-  43  |   await expect(page.locator('html')).toHaveAttribute('data-zova-hydrated', 'admin');
-  44  |   return dashboardResponse;
-  45  | }
-  46  | 
-  47  | function waitForStudentSelect(page: Page) {
-  48  |   return page.waitForResponse(response => {
-  49  |     const url = new URL(response.url());
-  50  |     return (
-  51  |       response.request().method() === 'GET' &&
-  52  |       response.ok() &&
-  53  |       url.pathname === '/api/training/student' &&
-  54  |       !response.request().headers()['x-vona-openapi-schema']
-  55  |     );
-  56  |   });
-  57  | }
-  58  | 
-  59  | function installStudentCreateResponseCapture(page: Page) {
-  60  |   let studentId: string | number | undefined;
-  61  |   const handler = async (route: Route) => {
-  62  |     const request = route.request();
-  63  |     const url = new URL(request.url());
-  64  |     if (
-  65  |       request.method() !== 'POST' ||
-  66  |       url.pathname !== '/api/training/student' ||
-  67  |       request.headers()['x-vona-openapi-schema']
-  68  |     ) {
-  69  |       await route.continue();
-  70  |       return;
-  71  |     }
-  72  |     const response = await route.fetch();
-  73  |     const payload = await response.json();
-  74  |     if (response.ok() && ['string', 'number'].includes(typeof payload.data)) {
-  75  |       studentId = payload.data;
-  76  |     }
-  77  |     await route.fulfill({ response });
-  78  |   };
-  79  |   return {
-  80  |     async install() {
-  81  |       await page.route('**/api/training/student', handler);
-  82  |     },
-  83  |     async uninstall() {
-  84  |       await page.unroute('**/api/training/student', handler);
-  85  |     },
-  86  |     get studentId() {
-  87  |       return studentId;
-  88  |     },
-  89  |   };
-  90  | }
-  91  | 
-  92  | async function getFieldGeometry(locator: Locator): Promise<IFieldGeometry> {
-  93  |   return locator.evaluate(element => {
-  94  |     const field = element.closest('label')?.parentElement;
-  95  |     const container = field?.parentElement;
-  96  |     if (!field || !container) throw new Error('Could not resolve the filter field layout');
-  97  | 
-  98  |     const fieldRect = field.getBoundingClientRect();
-  99  |     const containerRect = container.getBoundingClientRect();
-  100 |     const containerStyle = getComputedStyle(container);
-  101 |     return {
-  102 |       container: {
-  103 |         display: containerStyle.display,
-  104 |         flexWrap: containerStyle.flexWrap,
-  105 |         left: containerRect.left,
-  106 |         right: containerRect.right,
-  107 |       },
-  108 |       field: {
-  109 |         top: fieldRect.top,
-  110 |         left: fieldRect.left,
-  111 |         right: fieldRect.right,
-  112 |         bottom: fieldRect.bottom,
-  113 |       },
-  114 |     };
-  115 |   });
-  116 | }
-  117 | 
-  118 | async function getFlowGeometry(name: Locator, level: Locator, createdAtStart: Locator) {
-  119 |   return Promise.all([
-  120 |     getFieldGeometry(name),
-  121 |     getFieldGeometry(level),
-  122 |     getFieldGeometry(createdAtStart),
-  123 |   ]);
-  124 | }
-  125 | 
-  126 | function assertVisualOrder(geometry: IFieldGeometry[]) {
-  127 |   for (let index = 1; index < geometry.length; index++) {
-  128 |     const previous = geometry[index - 1].field;
-  129 |     const current = geometry[index].field;
-  130 |     expect(
-  131 |       current.top > previous.top + 2 ||
-  132 |         (Math.abs(current.top - previous.top) <= 2 && current.left > previous.left),
-  133 |     ).toBeTruthy();
-  134 |   }
-  135 | }
-  136 | 
-  137 | async function getDocumentHorizontalOverflow(page: Page) {
-  138 |   return page.evaluate(() => {
-```