@nocobase/client-v2 3.0.0-alpha.3 → 3.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.4",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,11 +27,11 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/evaluators": "3.0.0-alpha.3",
-    "@nocobase/flow-engine": "3.0.0-alpha.3",
-    "@nocobase/sdk": "3.0.0-alpha.3",
-    "@nocobase/shared": "3.0.0-alpha.3",
-    "@nocobase/utils": "3.0.0-alpha.3",
+    "@nocobase/evaluators": "3.0.0-alpha.4",
+    "@nocobase/flow-engine": "3.0.0-alpha.4",
+    "@nocobase/sdk": "3.0.0-alpha.4",
+    "@nocobase/shared": "3.0.0-alpha.4",
+    "@nocobase/utils": "3.0.0-alpha.4",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -48,5 +48,5 @@
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "9899cd799c070c7bd85140148ea5b100b046bdc7"
+  "gitHead": "6658768567378382de758c4e814ac510d688400c"
 }

package/src/__tests__/browserChecker.test.ts

@@ -136,6 +136,17 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
       expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/');
     });
 
+    it('redirects app root to modern entry for modern-only', () => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname: '/',
+        publicPath: '/',
+        modernClientPrefix: 'v',
+        appClientEntryMode: 'modern-only',
+      });
+
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/');
+    });
+
     it('does not redirect legacy deep links for modern-default', () => {
       const replace = executeBrowserChecker(scriptPath, {
         pathname: '/admin',
@@ -182,32 +193,36 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
   }
 
   if (scriptPath.includes('/app/client-v2/public/')) {
-    it.each(['/v', '/v/'])('redirects the main modern root %s to Settings', (pathname) => {
+    it.each([
+      ['/v', 'http://c.local.nocobase.com/v/'],
+      ['/v/', undefined],
+    ])('normalizes the modern client root %s without redirecting to Settings', (pathname, expectedRedirect) => {
       const replace = executeBrowserChecker(scriptPath, {
         pathname,
         publicPath: '/v/',
         modernClientPrefix: 'v',
       });
 
-      expect(replace).toHaveBeenCalledOnce();
-      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/settings');
+      if (expectedRedirect) {
+        expect(replace).toHaveBeenCalledOnce();
+        expect(replace).toHaveBeenCalledWith(expectedRedirect);
+      } else {
+        expect(replace).not.toHaveBeenCalled();
+      }
     });
 
-    it.each([
-      ['/v/apps/demo', '/settings/apps/demo'],
-      ['/v/apps/demo/', '/settings/apps/demo'],
-      ['/v/_app/demo', '/settings/_app/demo'],
-      ['/v/_app/demo/', '/settings/_app/demo'],
-    ])('redirects the scoped modern root %s to %s', (pathname, expectedPathname) => {
-      const replace = executeBrowserChecker(scriptPath, {
-        pathname,
-        publicPath: '/v/',
-        modernClientPrefix: 'v',
-      });
+    it.each(['/v/apps/demo', '/v/apps/demo/', '/v/_app/demo', '/v/_app/demo/'])(
+      'lets the scoped modern client handle its root %s',
+      (pathname) => {
+        const replace = executeBrowserChecker(scriptPath, {
+          pathname,
+          publicPath: '/v/',
+          modernClientPrefix: 'v',
+        });
 
-      expect(replace).toHaveBeenCalledOnce();
-      expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}`);
-    });
+        expect(replace).not.toHaveBeenCalled();
+      },
+    );
 
     it.each([
       ['/settings/apps/demo', '/', '/settings/apps/demo/', 'v'],
@@ -233,23 +248,19 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
     });
 
     it.each([
-      ['/tenant/apps/root/modern/apps/demo/', '/tenant/apps/root/modern/', '/tenant/apps/root/settings/apps/demo'],
-      ['/tenant/_app/root/modern/_app/demo/', '/tenant/_app/root/modern/', '/tenant/_app/root/settings/_app/demo'],
-    ])(
-      'preserves public path, query, and hash for %s without treating public-path segments as app scope',
-      (pathname, publicPath, expectedPathname) => {
-        const replace = executeBrowserChecker(scriptPath, {
-          pathname,
-          publicPath,
-          modernClientPrefix: 'modern',
-          search: '?tab=overview',
-          hash: '#panel',
-        });
+      ['/tenant/apps/root/modern/apps/demo/', '/tenant/apps/root/modern/'],
+      ['/tenant/_app/root/modern/_app/demo/', '/tenant/_app/root/modern/'],
+    ])('lets the modern client handle %s under a nested public path', (pathname, publicPath) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix: 'modern',
+        search: '?tab=overview',
+        hash: '#panel',
+      });
 
-        expect(replace).toHaveBeenCalledOnce();
-        expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}?tab=overview#panel`);
-      },
-    );
+      expect(replace).not.toHaveBeenCalled();
+    });
 
     it.each([
       ['/v/admin', '/v/'],

package/src/__tests__/nocobase-buildin-plugin-auth.test.tsx

@@ -72,6 +72,21 @@ class TestRootPortalPlugin extends Plugin {
   }
 }
 
+class TestScopedPortalPlugin extends Plugin {
+  async load() {
+    this.router.add('customer-portal', {
+      path: '/customer/*',
+      authCheck: true,
+      Component: () => <div>customer portal</div>,
+    });
+    this.router.add('customer-portal-signin', {
+      path: '/customer/signin',
+      skipAuthCheck: true,
+      Component: () => <div>customer portal signin</div>,
+    });
+  }
+}
+
 describe('nocobase buildin plugin auth redirect', () => {
   const originalLocation = globalThis.window.location;
 
@@ -187,6 +202,28 @@ describe('nocobase buildin plugin auth redirect', () => {
     });
   });
 
+  it('should use an explicitly registered Portal signin route when unauthenticated', async () => {
+    const app = createMockClient({
+      publicPath: '/v2/',
+      plugins: [NocoBaseBuildInPlugin as unknown as typeof Plugin, TestScopedPortalPlugin as typeof Plugin],
+      router: { type: 'memory', initialEntries: ['/v2/customer/dashboard?tab=overview#panel'] },
+    });
+    app.apiMock.onGet('app:getLang').reply(200, {
+      data: { lang: 'en-US', resources: { client: {} }, cron: {} },
+    });
+    app.apiMock.onGet('/auth:check').reply(200, { data: {} });
+
+    const Root = app.getRootComponent();
+    render(<Root />);
+
+    await waitFor(() => {
+      expect(app.router.router.state.location.pathname).toBe('/v2/customer/signin');
+      expect(app.router.router.state.location.search).toBe(
+        '?redirect=%2Fv2%2Fcustomer%2Fdashboard%3Ftab%3Doverview%23panel',
+      );
+    });
+  });
+
   it('should check current user after navigating from skipped route to v2 admin', async () => {
     const app = createMockClient({
       publicPath: '/v2/',

package/src/__tests__/settings-center.test.tsx

@@ -8,11 +8,12 @@
  */
 
 import { ACLRolesCheckProvider, Plugin } from '@nocobase/client-v2';
-import { render, screen, waitFor, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
 import React from 'react';
 import { message } from 'antd';
 import { AdminSettingsLayoutModel as ClientV2AdminSettingsLayoutModel } from '../settings-center';
 import { AdminSettingsLayoutModel as ClientV1AdminSettingsLayoutModel } from '../../../client/src/pm/AdminSettingsLayoutModel';
+import zhCN from '../../../client/src/locale/zh-CN.json';
 import { SettingsBuildInPlugin } from '../settings-app/SettingsBuildInPlugin';
 import { matchSettingsRoute, sortTopLevelSettings } from '../settings-center/utils';
 import { createMockSettingsClient } from './mockSettingsApplication';
@@ -44,12 +45,20 @@ const waitForGetRequests = async (app: MockClientApplication, urls: string[]) =>
 const mockAdminRuntime = (
   app: MockClientApplication,
   options: {
+    lang?: string;
     snippets?: string[];
     pmList?: any[];
+    resources?: Record<string, string>;
     systemSettings?: Record<string, any>;
   } = {},
 ) => {
-  const { snippets = ['pm', 'pm.system-settings.system-settings'], pmList = [], systemSettings = {} } = options;
+  const {
+    lang = 'en-US',
+    snippets = ['pm', 'pm.system-settings.system-settings'],
+    pmList = [],
+    resources = {},
+    systemSettings = {},
+  } = options;
 
   app.dataSourceManager.getCollection = ((name: string, collectionName: string) => {
     if (name === 'main' && collectionName === 'attachments') {
@@ -74,9 +83,9 @@ const mockAdminRuntime = (
   });
   app.apiMock.onGet('app:getLang').reply(200, {
     data: {
-      lang: 'en-US',
+      lang,
       resources: {
-        client: {},
+        client: resources,
       },
       cron: {},
     },
@@ -270,7 +279,11 @@ describe('settings center', () => {
     await renderApp(app);
     await waitForGetRequests(app, ['/auth:check', 'roles:check']);
 
-    expect(await screen.findByText('Current settings page is unavailable')).toBeInTheDocument();
+    const result = await screen.findByRole('status');
+    expect(within(result).getByRole('heading', { name: 'Settings page not found' })).toBeInTheDocument();
+    expect(
+      within(result).getByText('The settings page you requested does not exist or has been removed.'),
+    ).toBeInTheDocument();
   });
 
   it('should allow direct access to hidden page without showing menu entry', async () => {
@@ -319,16 +332,98 @@ describe('settings center', () => {
       router: { type: 'memory', initialEntries: ['/settings/secure-demo'] },
     });
     mockAdminRuntime(app, {
+      lang: 'zh-CN',
+      resources: zhCN,
       snippets: ['pm', 'pm.system-settings.system-settings', '!pm.secure-demo.index'],
     });
 
     await renderApp(app);
     await waitForGetRequests(app, ['/auth:check', 'roles:check']);
 
-    expect(await screen.findByText('Current settings page is unavailable')).toBeInTheDocument();
+    const result = await screen.findByRole('status');
+    expect(within(result).getByRole('heading', { name: '当前角色无权访问设置中心' })).toBeInTheDocument();
+    expect(within(result).getByText('请切换至有权限的角色，或联系管理员获取访问权限。')).toBeInTheDocument();
     expect(screen.queryByText('Secure settings page')).not.toBeInTheDocument();
   });
 
+  it('should deny a protected child page when a sibling remains visible', async () => {
+    class MixedAccessSettingsPlugin extends Plugin {
+      async load() {
+        this.pluginSettingsManager.addMenuItem({ key: 'mixed-access', title: 'Mixed access' });
+        this.pluginSettingsManager.addPageTabItem({
+          menuKey: 'mixed-access',
+          key: 'index',
+          title: 'Allowed settings',
+          Component: () => <div>Allowed settings page</div>,
+        });
+        this.pluginSettingsManager.addPageTabItem({
+          menuKey: 'mixed-access',
+          key: 'restricted',
+          title: 'Restricted settings',
+          aclSnippet: 'pm.mixed-access.restricted',
+          Component: () => <div>Restricted settings page</div>,
+        });
+      }
+    }
+
+    const app = createMockSettingsClient({
+      plugins: [SettingsBuildInPlugin, TestAclPlugin, MixedAccessSettingsPlugin],
+      router: { type: 'memory', initialEntries: ['/settings/mixed-access/restricted'] },
+    });
+    mockAdminRuntime(app, {
+      snippets: ['pm', 'pm.system-settings.system-settings', '!pm.mixed-access.restricted'],
+    });
+
+    await renderApp(app);
+    await waitForGetRequests(app, ['/auth:check', 'roles:check']);
+
+    expect(
+      await screen.findByRole('heading', { name: 'Your current role cannot access Settings' }),
+    ).toBeInTheDocument();
+    expect(screen.queryByText('Restricted settings page')).not.toBeInTheDocument();
+  });
+
+  it.each(['/settings/fallback-access', '/settings/fallback-access/'])(
+    'should redirect a denied index page to an accessible sibling from %s',
+    async (initialEntry) => {
+      class FallbackAccessSettingsPlugin extends Plugin {
+        async load() {
+          this.pluginSettingsManager.addMenuItem({ key: 'fallback-access', title: 'Fallback access' });
+          this.pluginSettingsManager.addPageTabItem({
+            menuKey: 'fallback-access',
+            key: 'index',
+            title: 'Restricted index settings',
+            aclSnippet: 'pm.fallback-access.index',
+            Component: () => <div>Restricted index settings page</div>,
+          });
+          this.pluginSettingsManager.addPageTabItem({
+            menuKey: 'fallback-access',
+            key: 'allowed',
+            title: 'Allowed fallback settings',
+            Component: () => <div>Allowed fallback settings page</div>,
+          });
+        }
+      }
+
+      const app = createMockSettingsClient({
+        plugins: [SettingsBuildInPlugin, TestAclPlugin, FallbackAccessSettingsPlugin],
+        router: { type: 'memory', initialEntries: [initialEntry] },
+      });
+      mockAdminRuntime(app, {
+        snippets: ['pm', 'pm.system-settings.system-settings', '!pm.fallback-access.index'],
+      });
+
+      await renderApp(app);
+      await waitForGetRequests(app, ['/auth:check', 'roles:check']);
+
+      expect(await screen.findByText('Allowed fallback settings page')).toBeInTheDocument();
+      expect(
+        screen.queryByRole('heading', { name: 'Your current role cannot access Settings' }),
+      ).not.toBeInTheDocument();
+      expect(screen.queryByText('Restricted index settings page')).not.toBeInTheDocument();
+    },
+  );
+
   it('should keep menu visible when menu acl is denied but child page is visible', async () => {
     class MenuAclPlugin extends Plugin {
       async load() {
@@ -358,10 +453,13 @@ describe('settings center', () => {
     await waitForGetRequests(app, ['/auth:check', 'roles:check']);
 
     expect(await screen.findByText('Menu ACL child page')).toBeInTheDocument();
-    expect(screen.getByRole('menuitem', { name: 'Menu ACL Demo' })).toBeInTheDocument();
+    // The sidebar is gone; this group is reached from the "other settings" hover
+    // dropdown in the top bar. The dropdown only renders on hover, so this just
+    // checks the group entry survived (ACL did not drop the whole menu).
+    expect(screen.getByRole('menuitem', { name: 'Other settings' })).toBeInTheDocument();
   });
 
-  it('should allow the settings sidebar menu to scroll independently', async () => {
+  it('should keep rendering the active page when a group has many settings', async () => {
     class ManySettingsPlugin extends Plugin {
       async load() {
         for (let index = 0; index < 30; index += 1) {
@@ -390,8 +488,10 @@ describe('settings center', () => {
 
     expect(await screen.findByText('Scroll demo page 29')).toBeInTheDocument();
 
-    const sidebar = screen.getByRole('menuitem', { name: 'Scroll demo 29' }).closest('.ant-layout-sider');
-    expect(sidebar).toHaveStyle({ overflowY: 'auto' });
+    // Without the sidebar there is no separate scroll area: all 30 settings live in
+    // the top bar dropdown and the page renders only the active one, so this just
+    // checks it still holds up.
+    expect(document.querySelector('.ant-layout-sider')).toBeNull();
   });
 
   it('should save system settings through systemSettings:put', async () => {