@nocobase/app-template-default 1.0.0-beta.88 → 1.0.0-beta.89

package/client/routing/route-leave-boundary.tsx

@@ -95,6 +95,7 @@ class LeaveController {
 class LeaveScope {
   private readonly entries = new Set<LeaveController>();
   private hidden = false;
+  private generation = 0;
   constructor(private readonly dirtyChanged: (dirty: boolean) => void) {}
 
   changed = (): void => {
@@ -118,7 +119,12 @@ class LeaveScope {
     this.changed();
   }
   update(hidden: boolean, pathname: string): void {
-    this.hidden = hidden;
+    if (this.hidden !== hidden) {
+      this.generation += 1;
+      this.hidden = hidden;
+      // A confirmation started before concealment must not discard or resume its old navigation on recovery.
+      if (hidden) for (const entry of this.entries) entry.cancel();
+    }
     for (const entry of this.entries) {
       if (pathname !== entry.origin && !pathname.startsWith(`${entry.origin}/`))
         this.remove(entry);
@@ -130,8 +136,14 @@ class LeaveScope {
       for (const entry of this.entries) if (!entry.active) this.remove(entry);
   }
   guard = (): Decision => {
+    const generation = this.generation;
     const remaining = [...this.entries];
     const next = (): Decision => {
+      if (
+        generation !== this.generation ||
+        (this.hidden && this.entries.size > 0)
+      )
+        return false;
       const entry = remaining.shift();
       if (!entry) return true;
       const value = entry.guard();

package/client/styles.css

@@ -252,9 +252,26 @@ label:has(> .sr-only:focus-visible),
 :is([data-slot='dialog-description'], [data-slot='alert-dialog-description']) {
   line-height: 1.65;
 }
-:is([data-slot='dialog-footer'], [data-slot='alert-dialog-footer']) > button {
+/* Size semantic actions equally, including Button render={<Link />} and the
+   AlertDialog wrappers, which replace Button's slot. Footer sizing takes
+   precedence over primitive size utilities; long labels may grow and wrap. */
+:is([data-slot='dialog-footer'], [data-slot='alert-dialog-footer'])
+  > :is(
+    [data-slot='button'],
+    [data-slot='dialog-close'],
+    [data-slot='alert-dialog-action'],
+    [data-slot='alert-dialog-cancel']
+  ) {
+  height: auto;
   min-height: calc(var(--spacing) * 10);
+  min-width: 0;
+  align-self: stretch;
+  flex-shrink: 1;
+  padding-block: calc(var(--spacing) * 2);
   padding-inline: calc(var(--spacing) * 4);
+  white-space: normal;
+  overflow-wrap: anywhere;
+  text-align: center;
 }
 /* Route overlays compose the dialog primitives, so their close button sits where a dialog's does. */
 :is([data-slot='dialog-content'], [data-slot='route-overlay-content'])

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nocobase/app-template-default",
   "displayName": "Default Template",
-  "version": "1.0.0-beta.88",
+  "version": "1.0.0-beta.89",
   "type": "module",
   "prettier": "@nocobase/dev-config/prettier",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "nocobase": {
     "templateKind": "app",
-    "defaultTemplateVersion": "1.0.0-beta.88"
+    "defaultTemplateVersion": "1.0.0-beta.89"
   },
   "devDependencies": {
     "@ai-sdk/react": "4.0.131",
@@ -74,9 +74,9 @@
     "elkjs": "^0.10.2",
     "@types/jsdom": "^30.0.0",
     "@noble/hashes": "2.3.0",
-    "@nocobase/app-client": "^4.0.0-beta.8",
+    "@nocobase/app-client": "^4.0.0-beta.9",
     "@nocobase/app-plugin-template-print": "0.0.2-beta.2",
-    "@nocobase/app-skills": "0.1.0-beta.59",
+    "@nocobase/app-skills": "0.1.0-beta.60",
     "@nocobase/app-testing": "0.1.0-beta.8",
     "@nocobase/app-websocket": "^0.1.0-beta.1",
     "@nocobase/dev-config": "0.1.0-beta.25",
@@ -144,13 +144,13 @@
     "hono": "^4.13.2",
     "@nocobase/concurrency": "^0.1.0-beta.1",
     "@nocobase/app-plugin-concurrency": "^0.1.0-beta.2",
-    "@nocobase/app-plugin-agents": "^2.0.0-beta.4",
+    "@nocobase/app-plugin-agents": "^2.0.0-beta.6",
     "@nocobase/app-plugin-api-keys": "^1.0.0-beta.21",
     "@nocobase/app-plugin-authentication": "^2.0.0-beta.19",
     "@nocobase/app-plugin-authorization": "^1.0.0-beta.36",
     "@nocobase/app-plugin-database-explorer": "^1.0.0-beta.19",
     "@nocobase/app-plugin-file": "^1.0.0-beta.29",
-    "@nocobase/app-plugin-foundation": "^0.1.0-beta.14",
+    "@nocobase/app-plugin-foundation": "^0.1.0-beta.16",
     "@nocobase/app-plugin-i18n": "^1.0.0-beta.21",
     "@nocobase/app-plugin-knowledge": "^0.1.0-beta.17",
     "@nocobase/app-plugin-mail": "^1.0.0-beta.21",
@@ -158,7 +158,7 @@
     "@nocobase/app-plugin-notification-in-app": "^2.0.0-beta.2",
     "@nocobase/app-plugin-notification-providers": "^1.0.0-beta.18",
     "@nocobase/app-plugin-scheduler": "^1.0.0-beta.23",
-    "@nocobase/app-plugin-users": "^2.0.0-beta.15",
+    "@nocobase/app-plugin-users": "^2.0.0-beta.16",
     "@nocobase/app-server": "^5.0.0-beta.1",
     "@nocobase/config": "^0.1.0-beta.3",
     "@nocobase/db": "^1.0.0-beta.25",
@@ -176,7 +176,7 @@
     "@nocobase/caching": "^1.0.0-beta.4",
     "@nocobase/repository-input": "^0.1.0-beta.3",
     "@nocobase/app-cli": "^1.0.0-beta.32",
-    "@nocobase/realtime": "^1.0.0-beta.0"
+    "@nocobase/realtime": "^1.0.0-beta.1"
   },
   "description": "NocoBase 3 application template with the standard product capabilities.",
   "imports": {

package/tests/client/auth-i18n.test.tsx

@@ -149,6 +149,6 @@ describe('authentication translations', () => {
     await act(() => value.changeLanguage('zh-CN'));
     expect(screen.getByText('此密码重置链接无效或已过期。')).toBeVisible();
     expect(screen.getByText('如果账户存在，重置链接已发送。')).toBeVisible();
-    expect(screen.getByRole('status', { name: '加载中' })).toBeVisible();
+    expect(await screen.findByRole('status', { name: '加载中' })).toBeVisible();
   });
 });

package/tests/client/authenticated-client-fixture.test.tsx

@@ -0,0 +1,37 @@
+import { expect, it } from 'vitest';
+import { createAuthenticatedClientRenderer } from '../helpers/authenticated-client.js';
+
+const render = createAuthenticatedClientRenderer();
+const identities = new Set<string>();
+const permissionSets = new Set<string>();
+const resource = { type: 'settings', id: 'authorization.default-access' };
+
+it.each([
+  { name: 'administrator', member: false, granted: false },
+  { name: 'permitted member', member: true, granted: true },
+  { name: 'unpermitted member', member: true, granted: false },
+])(
+  'isolates the $name session and grants in a reused application',
+  async ({ member, granted }) => {
+    const view = await render(<span>Isolated client</span>, {
+      member,
+      grants: granted ? [{ resource, actions: [{ action: 'read' }] }] : [],
+    });
+    expect(identities.has(view.session.user.id)).toBe(false);
+    expect(permissionSets.has(view.permissionSetKey)).toBe(false);
+    identities.add(view.session.user.id);
+    permissionSets.add(view.permissionSetKey);
+    expect(view.identity().session?.user.id).toBe(view.session.user.id);
+
+    const response = await view.session.fetch('/authorization/permissions');
+    expect(response.status).toBe(200);
+    const { data } = await response.json();
+    expect(data.unrestricted).toBe(!member);
+    const permission = expect.objectContaining({
+      resource,
+      actions: expect.arrayContaining(['read']),
+    });
+    if (granted) expect(data.permissions).toContainEqual(permission);
+    else expect(data.permissions).not.toContainEqual(permission);
+  },
+);

package/tests/client/back-button.test.tsx

@@ -8,6 +8,8 @@ import type { ReactElement, ReactNode } from 'react';
 import { createMemoryRouter, Outlet, RouterProvider } from 'react-router';
 import { describe, expect, it } from 'vitest';
 
+import type { AppClientRegisteredRoute } from '@nocobase/app-client/plugins';
+import { RouteTreeProvider } from '../../client/routing/route-context.js';
 import { BackButton } from '#components/back-button';
 
 import enUS from '../../client/locales/en-US.js';
@@ -41,6 +43,25 @@ function renderAt(url: string, child: ReactElement) {
     ],
     { initialEntries: [url] },
   );
+  const registered = ['/projects', '/overview'].map(
+    (path) =>
+      ({
+        path,
+        id: path,
+        name: path,
+        packageName: 'test',
+        auth: 'required',
+        authz: 'skip',
+        componentLoader: async () => ({ default: () => null }),
+      }) as AppClientRegisteredRoute,
+  );
+  // The provider needs to be within the router, so wrap each route's page.
+  const routes = router.routes;
+  for (const entry of routes) {
+    entry.element = (
+      <RouteTreeProvider routes={registered}>{entry.element}</RouteTreeProvider>
+    );
+  }
   render(<RouterProvider router={router} />, { wrapper: I18n });
   return router;
 }
@@ -77,4 +98,17 @@ describe('BackButton', () => {
       screen.getByRole('link', { name: 'Back to the overview' }),
     ).toHaveAttribute('href', '/overview');
   });
+  it.each(['https://example.com/overview', '//example.com', '/missing'])(
+    'falls back safely for %s without naming the invalid destination',
+    (to) => {
+      renderAt(
+        '/projects/12',
+        <BackButton to={to}>Private destination</BackButton>,
+      );
+      expect(
+        screen.getByRole('link', { name: enUS.navigation.back }),
+      ).toHaveAttribute('href', '/projects');
+      expect(screen.queryByText('Private destination')).not.toBeInTheDocument();
+    },
+  );
 });

package/tests/client/client-route-recovery.test.tsx

@@ -2,7 +2,8 @@ import type {
   AppClientRegisteredRoute,
   AppClientRouteComponentModule,
 } from '@nocobase/app-client/plugins';
-import { act, screen } from '@testing-library/react';
+import { act, fireEvent, screen, waitFor } from '@testing-library/react';
+import { Activity, useState } from 'react';
 import { describe, expect, it } from 'vitest';
 
 import { ClientRoute } from '../../client/routing/client-route.tsx';
@@ -49,6 +50,97 @@ const healthyModule: AppClientRouteComponentModule = {
 };
 
 describe('client route loading recovery', () => {
+  it('keeps a loaded wrapped component when an ancestor Activity reconnects its effects', async () => {
+    let loads = 0;
+    const componentLoader = async () => {
+      loads += 1;
+      return {
+        default: function Editor() {
+          const [draft, setDraft] = useState('');
+          return (
+            <input
+              aria-label='Draft'
+              value={draft}
+              onChange={(event) => setDraft(event.target.value)}
+            />
+          );
+        },
+      };
+    };
+    const definition = { ...route, componentLoader };
+    const view = (hidden: boolean) => (
+      <Activity mode={hidden ? 'hidden' : 'visible'}>
+        <ClientRoute route={definition} />
+      </Activity>
+    );
+    const { rerender } = await renderWithApp(view(false), options);
+    const input = await screen.findByRole(
+      'textbox',
+      { name: 'Draft' },
+      ROUTE_LOAD_TIMEOUT,
+    );
+    fireEvent.change(input, { target: { value: 'Keep this draft' } });
+    rerender(view(true));
+    await waitFor(() => expect(input).not.toBeVisible());
+    rerender(view(false));
+    await waitFor(() => expect(input).toBeVisible());
+    expect(screen.getByRole('textbox', { name: 'Draft' })).toBe(input);
+    expect(input).toHaveValue('Keep this draft');
+    expect(loads).toBe(1);
+  });
+
+  it('loads a replacement after a successful module and ignores a superseded successful response', async () => {
+    const pending = Promise.withResolvers<AppClientRouteComponentModule>();
+    const { rerender } = await renderWithApp(
+      <ClientRoute
+        route={{ ...route, componentLoader: async () => healthyModule }}
+      />,
+      options,
+    );
+    await screen.findByText('Recovered page', {}, ROUTE_LOAD_TIMEOUT);
+    rerender(
+      <ClientRoute
+        route={{ ...route, componentLoader: () => pending.promise }}
+      />,
+    );
+    const replacement = { default: () => <h2>Replacement page</h2> };
+    rerender(
+      <ClientRoute
+        route={{ ...route, componentLoader: async () => replacement }}
+      />,
+    );
+    await screen.findByText('Replacement page', {}, ROUTE_LOAD_TIMEOUT);
+    await act(async () =>
+      pending.resolve({ default: () => <h2>Stale page</h2> }),
+    );
+    expect(screen.getByText('Replacement page')).toBeVisible();
+    expect(screen.queryByText('Stale page')).toBeNull();
+  });
+
+  it('invokes the same loader again on retry after a failed attempt', async () => {
+    let loads = 0;
+    const componentLoader = async () => {
+      loads += 1;
+      if (loads === 1) throw new Error('Temporary failure');
+      return healthyModule;
+    };
+    await renderWithApp(
+      <ClientRoute route={{ ...route, componentLoader }} />,
+      options,
+    );
+    fireEvent.click(
+      await screen.findByRole(
+        'button',
+        { name: 'Retry', exact: true },
+        ROUTE_LOAD_TIMEOUT,
+      ),
+    );
+    expect(
+      await screen.findByText('Recovered page', {}, ROUTE_LOAD_TIMEOUT),
+    ).toBeVisible();
+    expect(loads).toBe(2);
+  });
+
   it('clears a previous failure when the same mounted route loads successfully', async () => {
     const { rerender } = await renderWithApp(
       <ClientRoute route={route} />,

package/tests/client/list-feedback.test.tsx

@@ -97,7 +97,7 @@ describe('shared table and card feedback', () => {
       />,
       options,
     );
-    expect(screen.getByRole('status').textContent).toBe(
+    expect((await screen.findByRole('status')).textContent).toBe(
       enUS.listFeedback.loading,
     );
     expect(screen.getByRole('columnheader', { name: 'ID' })).toBeVisible();
@@ -159,7 +159,7 @@ describe('shared table and card feedback', () => {
       expect(
         screen.getByRole('button', { name: 'Search tools' }),
       ).toBeVisible();
-      expect(screen.getByRole(role).closest('td')).not.toBeNull();
+      expect((await screen.findByRole(role)).closest('td')).not.toBeNull();
     }
 
     view.rerender(
@@ -178,9 +178,8 @@ describe('shared table and card feedback', () => {
   });
 
   it('renders each built-in state as one icon and one short line without inline actions', async () => {
-    const view = await renderWithApp(<ListFeedback state='loading' />, options);
+    const view = await renderWithApp(<ListFeedback state='empty' />, options);
     const states = [
-      ['loading', 'status'],
       ['empty', 'status'],
       ['no-results', 'status'],
       ['forbidden', 'alert'],
@@ -273,8 +272,9 @@ describe('shared table and card feedback', () => {
     expect(screen.getByRole('alert').textContent).toBe(
       enUS.listFeedback.failed,
     );
+    expect(screen.getByRole('button')).toBeDisabled();
     expect(
-      screen.getByRole('button', { name: enUS.listFeedback.retrying }),
+      await screen.findByRole('button', { name: enUS.listFeedback.retrying }),
     ).toBeDisabled();
   });