@nocobase/client-v2 2.3.0-alpha.1 → 3.0.0-alpha.2

package/lib/locale/languageCodes.js

@@ -64,6 +64,7 @@ const languageCodes = {
   "ml-IN": { label: "\u0D2E\u0D32\u0D2F\u0D3E\u0D33\u0D02" },
   "mn-MN": { label: "\u041C\u043E\u043D\u0433\u043E\u043B \u0445\u044D\u043B" },
   "ms-MY": { label: "\u0628\u0647\u0627\u0633 \u0645\u0644\u0627\u064A\u0648" },
+  "my-MM": { label: "\u1019\u103C\u1014\u103A\u1019\u102C\u1018\u102C\u101E\u102C" },
   "nb-NO": { label: "Norsk bokm\xE5l" },
   "ne-NP": { label: "\u0928\u0947\u092A\u093E\u0932\u0940" },
   "nl-BE": { label: "Vlaams" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.3.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "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": "2.3.0-alpha.1",
-    "@nocobase/flow-engine": "2.3.0-alpha.1",
-    "@nocobase/sdk": "2.3.0-alpha.1",
-    "@nocobase/shared": "2.3.0-alpha.1",
-    "@nocobase/utils": "2.3.0-alpha.1",
+    "@nocobase/evaluators": "3.0.0-alpha.2",
+    "@nocobase/flow-engine": "3.0.0-alpha.2",
+    "@nocobase/sdk": "3.0.0-alpha.2",
+    "@nocobase/shared": "3.0.0-alpha.2",
+    "@nocobase/utils": "3.0.0-alpha.2",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -44,8 +44,9 @@
     "json5": "^2.2.3",
     "jsqr": "^1.4.0",
     "lodash": "4.17.21",
+    "react-device-detect": "2.2.3",
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "2377df8ceb12549149017f7f14a61207bf6e49a2"
+  "gitHead": "a3faea21082b30989301de04591ee1b91fd4e6a5"
 }

package/src/__tests__/authRedirect.test.ts

@@ -17,12 +17,18 @@ import {
 
 describe('auth redirect helpers', () => {
   const originalLocation = globalThis.window.location;
+  const originalModernClientPrefix = window.__nocobase_modern_client_prefix__;
 
   afterEach(() => {
     Object.defineProperty(globalThis.window, 'location', {
       configurable: true,
       value: originalLocation,
     });
+    if (originalModernClientPrefix === undefined) {
+      delete window.__nocobase_modern_client_prefix__;
+    } else {
+      window.__nocobase_modern_client_prefix__ = originalModernClientPrefix;
+    }
     vi.restoreAllMocks();
   });
 
@@ -84,6 +90,107 @@ describe('auth redirect helpers', () => {
     expect(buildV2SigninHref(app, '/v2/admin/7vu4c2sdk6h')).toBe('/v2/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
   });
 
+  it('should keep validated standalone settings redirects outside the v2 basename', () => {
+    const app = {
+      getPublicPath: () => '/nocobase/v2/',
+      router: {
+        getBasename: () => '/nocobase/v2',
+      },
+    } as any;
+
+    expect(normalizeV2RedirectPath(app, '/nocobase/settings/workflow?tab=list#recent')).toBe(
+      '/nocobase/settings/workflow?tab=list#recent',
+    );
+  });
+
+  it('should build the standalone settings signin URL for a standalone settings app', () => {
+    const app = {
+      name: 'main',
+      getPublicPath: () => '/nocobase/',
+      router: {
+        getBasename: () => '/nocobase',
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/settings/',
+      },
+    } satisfies Parameters<typeof buildV2SigninHref>[0];
+    expect(buildV2SigninHref(app, '/nocobase/settings/workflow?tab=list#recent')).toBe(
+      '/nocobase/settings/signin?redirect=%2Fnocobase%2Fsettings%2Fworkflow%3Ftab%3Dlist%23recent',
+    );
+  });
+
+  it('should keep an apps segment inside the main public path out of the Settings application scope', () => {
+    const app = {
+      name: 'main',
+      getPublicPath: () => '/tenant/apps/root/',
+      router: {
+        getBasename: () => '/tenant/apps/root/',
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/settings/',
+      },
+    } satisfies Parameters<typeof buildV2SigninHref>[0];
+
+    expect(buildV2SigninHref(app, '/tenant/apps/root/settings/workflow')).toBe(
+      '/tenant/apps/root/settings/signin?redirect=%2Ftenant%2Fapps%2Froot%2Fsettings%2Fworkflow',
+    );
+  });
+
+  it.each([
+    ['/nocobase/settings/apps/test-app/', '/nocobase/settings/apps/test-app/signin'],
+    ['/nocobase/settings/_app/test-app/', '/nocobase/settings/_app/test-app/signin'],
+  ])('should keep the standalone settings signin in the current sub-app scope: %s', (basename, signinPath) => {
+    const app = {
+      name: 'test-app',
+      getPublicPath: () => '/nocobase/',
+      router: {
+        getBasename: () => basename,
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/',
+      },
+    } as any;
+
+    expect(buildV2SigninHref(app, `${basename}workflow`)).toBe(
+      `${signinPath}?redirect=${encodeURIComponent(`${basename}workflow`)}`,
+    );
+  });
+
+  it('should accept the current standalone settings signin URL only', () => {
+    Object.defineProperty(globalThis.window, 'location', {
+      configurable: true,
+      value: {
+        ...originalLocation,
+        origin: 'http://localhost:20000',
+      },
+    });
+    const app = {
+      name: 'test-app',
+      getPublicPath: () => '/nocobase/',
+      router: {
+        getBasename: () => '/nocobase/settings/apps/test-app/',
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/',
+      },
+    } as any;
+
+    expect(
+      resolveV2SigninRedirect(
+        '/nocobase/settings/apps/test-app/signin?redirect=%2Fnocobase%2Fsettings%2Fapps%2Ftest-app',
+        app,
+      ),
+    ).toBe(
+      'http://localhost:20000/nocobase/settings/apps/test-app/signin?redirect=%2Fnocobase%2Fsettings%2Fapps%2Ftest-app',
+    );
+    expect(resolveV2SigninRedirect('/nocobase/v/apps/test-app/signin', app)).toBeNull();
+    expect(resolveV2SigninRedirect('/nocobase/settings/apps/other-app/signin', app)).toBeNull();
+  });
+
   it('should redirect with window.location.replace by default', () => {
     const replace = vi.fn();
     Object.defineProperty(globalThis.window, 'location', {
@@ -134,6 +241,36 @@ describe('auth redirect helpers', () => {
   });
 
   describe('v2 sub-app context (router basename contains /apps/<id>/)', () => {
+    it('should keep only the current sub-app standalone settings redirect', () => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(normalizeV2RedirectPath(app, '/nocobase/settings/apps/test-app/workflow')).toBe(
+        '/nocobase/settings/apps/test-app/workflow',
+      );
+      expect(normalizeV2RedirectPath(app, '/nocobase/settings/apps/other-app/workflow')).toBe(
+        '/nocobase/v2/apps/test-app/admin/',
+      );
+    });
+
+    it.each([
+      '/nocobase/settings/apps/test-app/../../other-app/settings',
+      '/nocobase/settings/apps/test-app/%2e%2e/%2E%2e/other-app/settings',
+    ])('should reject a standalone settings redirect that resolves outside the current sub-app: %s', (target) => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(normalizeV2RedirectPath(app, target)).toBe('/nocobase/v2/apps/test-app/admin/');
+    });
+
     it('should normalize signin redirect fallback under the current sub-app basename', () => {
       const app = {
         getPublicPath: () => '/v/',

package/src/__tests__/browserChecker.test.ts

@@ -15,8 +15,11 @@ import { fileURLToPath } from 'node:url';
 type BrowserCheckerCase = {
   pathname: string;
   publicPath: string;
+  search?: string;
+  hash?: string;
   modernClientPrefix?: string;
   appClientEntryMode?: string;
+  scriptSrc?: string;
   expectedRedirect?: string;
 };
 
@@ -47,8 +50,8 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
       location: {
         origin: 'http://c.local.nocobase.com',
         pathname: input.pathname,
-        search: '',
-        hash: '',
+        search: input.search || '',
+        hash: input.hash || '',
         replace,
       },
       console: consoleMock,
@@ -58,6 +61,13 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
       onresize: undefined,
     },
     document: {
+      currentScript: {
+        src:
+          input.scriptSrc ||
+          (scriptPath.includes('/app/client-v2/public/')
+            ? 'http://assets.local.nocobase.com/v/browser-checker.js?v=1'
+            : 'http://assets.local.nocobase.com/browser-checker.js?v=1'),
+      },
       documentElement: {
         className: '',
         clientWidth: 1280,
@@ -80,11 +90,11 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
 describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
   it('normalizes a relative public path before redirecting to the trailing-slash entry', () => {
     const replace = executeBrowserChecker(scriptPath, {
-      pathname: '/nocobase/v',
-      publicPath: 'nocobase/v/',
+      pathname: '/nocobase/console',
+      publicPath: 'nocobase/console/',
     });
 
-    expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/');
+    expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/console/');
   });
 
   it('prefixes outside paths with a root-relative basename instead of duplicating a relative segment', () => {
@@ -98,7 +108,7 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
 
   it('does not redirect when the current path is already under the normalized basename', () => {
     const replace = executeBrowserChecker(scriptPath, {
-      pathname: '/nocobase/v/',
+      pathname: '/nocobase/v/admin',
       publicPath: 'nocobase/v/',
     });
 
@@ -170,4 +180,112 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
       expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/apps/a_31itq60q4kg/admin');
     });
   }
+
+  if (scriptPath.includes('/app/client-v2/public/')) {
+    it.each(['/v', '/v/'])('redirects the main modern root %s to Settings', (pathname) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath: '/v/',
+        modernClientPrefix: 'v',
+      });
+
+      expect(replace).toHaveBeenCalledOnce();
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/settings');
+    });
+
+    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',
+      });
+
+      expect(replace).toHaveBeenCalledOnce();
+      expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}`);
+    });
+
+    it.each([
+      ['/settings/apps/demo', '/', '/settings/apps/demo/', 'v'],
+      ['/settings/_app/demo', '/', '/settings/_app/demo/', 'v'],
+      ['/nocobase/settings/apps/demo', '/nocobase/', '/nocobase/settings/apps/demo/', 'v'],
+      ['/nocobase/settings/_app/demo', '/nocobase/', '/nocobase/settings/_app/demo/', 'v'],
+      ['/tenant/apps/root/settings/apps/demo', '/tenant/apps/root/', '/tenant/apps/root/settings/apps/demo/', 'v'],
+      ['/tenant/_app/root/settings/_app/demo', '/tenant/_app/root/', '/tenant/_app/root/settings/_app/demo/', 'v'],
+      ['/tenant/v/settings/apps/demo', '/tenant/v/', '/tenant/v/settings/apps/demo/', 'v'],
+      ['/tenant/modern/settings/_app/demo', '/tenant/modern/', '/tenant/modern/settings/_app/demo/', 'modern'],
+    ])('normalizes the scoped Settings root %s to %s', (pathname, publicPath, expectedPathname, modernClientPrefix) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix,
+        scriptSrc: 'https://cdn.example.com/ui/settings/browser-checker.js?v=1',
+        search: '?tab=overview',
+        hash: '#panel',
+      });
+
+      expect(replace).toHaveBeenCalledOnce();
+      expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}?tab=overview#panel`);
+    });
+
+    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',
+        });
+
+        expect(replace).toHaveBeenCalledOnce();
+        expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}?tab=overview#panel`);
+      },
+    );
+
+    it.each([
+      ['/v/admin', '/v/'],
+      ['/v/apps/demo/admin', '/v/'],
+      ['/v/_app/demo/admin', '/v/'],
+      ['/v/_apps/demo', '/v/'],
+      ['/v/settings/apps/demo', '/v/'],
+      ['/nocobase/modern/settings/_app/demo', '/nocobase/modern/', 'modern'],
+    ])('does not redirect a non-root modern path %s to Settings', (pathname, publicPath, modernClientPrefix = 'v') => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix,
+      });
+
+      expect(replace).not.toHaveBeenCalled();
+    });
+
+    it.each([
+      ['/settings', '/'],
+      ['/settings/', '/'],
+      ['/settings/apps/demo/', '/'],
+      ['/settings/_app/demo/', '/'],
+      ['/settings/apps/demo/multi-portal', '/'],
+      ['/settings/_app/demo/multi-portal', '/'],
+      ['/settings/_apps/demo', '/'],
+      ['/nocobase/settings/apps/demo/multi-portal', '/nocobase/'],
+    ])('does not redirect a non-target Settings path %s', (pathname, publicPath) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix: 'v',
+        scriptSrc: 'https://cdn.example.com/ui/settings/browser-checker.js?v=1',
+      });
+
+      expect(replace).not.toHaveBeenCalled();
+    });
+  }
 });

package/src/__tests__/mockSettingsApplication.ts

@@ -0,0 +1,29 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import MockAdapter from 'axios-mock-adapter';
+import type { ApplicationOptions } from '../Application';
+import { SettingsApplication } from '../settings-app/SettingsApplication';
+
+class MockSettingsApplication extends SettingsApplication {
+  readonly apiMock: MockAdapter;
+
+  constructor(options: ApplicationOptions = {}) {
+    super({
+      router: { type: 'memory', initialEntries: ['/settings'] },
+      ws: false,
+      ...options,
+    });
+    this.apiMock = new MockAdapter(this.apiClient.axios);
+  }
+}
+
+export function createMockSettingsClient(options?: ApplicationOptions) {
+  return new MockSettingsApplication(options);
+}

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

@@ -51,6 +51,27 @@ class AuthBootstrapRoutePlugin extends Plugin {
   }
 }
 
+class TestAdminPortalPlugin extends Plugin {
+  async load() {
+    this.app.layoutManager.registerLayout({
+      routeName: 'admin',
+      routePath: '/admin',
+      uid: 'admin-layout-model',
+      layoutModelClass: 'AdminLayoutModel',
+    });
+  }
+}
+
+class TestRootPortalPlugin extends Plugin {
+  async load() {
+    this.router.add('root', {
+      path: '/',
+      authCheck: true,
+      Component: () => <div>portal landing</div>,
+    });
+  }
+}
+
 describe('nocobase buildin plugin auth redirect', () => {
   const originalLocation = globalThis.window.location;
 
@@ -85,6 +106,16 @@ describe('nocobase buildin plugin auth redirect', () => {
     vi.restoreAllMocks();
   });
 
+  it('should leave Admin portal registration to runtime plugins', async () => {
+    const app = createMockClient();
+    const plugin = new NocoBaseBuildInPlugin({}, app);
+
+    await plugin.load();
+
+    expect(app.layoutManager.hasLayout('admin')).toBe(false);
+    expect(app.router.has('root')).toBe(false);
+  });
+
   it('should navigate to v2 signin when /auth:check returns no user', async () => {
     // Aligns with v1: use react-router navigate (virtual) rather than
     // `window.location.replace`, so a `window.location.href` queued elsewhere
@@ -92,7 +123,7 @@ describe('nocobase buildin plugin auth redirect', () => {
     // overridden.
     const app = createMockClient({
       publicPath: '/v2/',
-      plugins: [NocoBaseBuildInPlugin as any],
+      plugins: [NocoBaseBuildInPlugin as any, TestAdminPortalPlugin as typeof Plugin],
       router: { type: 'memory', initialEntries: ['/v2/admin/7vu4c2sdk6h'] },
     });
     app.apiMock.onGet('app:getLang').reply(200, {
@@ -115,7 +146,7 @@ describe('nocobase buildin plugin auth redirect', () => {
     // and race the 2FA response interceptor with its own signin redirect.
     const app = createMockClient({
       publicPath: '/v2/',
-      plugins: [NocoBaseBuildInPlugin as any],
+      plugins: [NocoBaseBuildInPlugin as any, TestAdminPortalPlugin as typeof Plugin],
       router: { type: 'memory', initialEntries: ['/v2/admin'] },
     });
     app.apiClient.auth.setToken('test-token');
@@ -136,29 +167,34 @@ describe('nocobase buildin plugin auth redirect', () => {
     expect(app.apiMock.history.post.filter((request) => request.url === 'auth:syncCookies')).toHaveLength(0);
   });
 
-  it('should redirect unauthenticated v2 root access to v2 signin via <Navigate />', async () => {
+  it('should redirect an unauthenticated Portal root to v2 signin', async () => {
     const app = createMockClient({
       publicPath: '/nocobase/v2/',
-      plugins: [NocoBaseBuildInPlugin as any],
+      plugins: [NocoBaseBuildInPlugin as any, TestRootPortalPlugin as typeof Plugin],
       router: { type: 'memory', initialEntries: ['/nocobase/v2/'] },
     });
     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('/nocobase/v2/signin');
-      expect(app.router.router.state.location.search).toBe('?redirect=%2Fnocobase%2Fv2%2Fadmin');
+      expect(app.router.router.state.location.search).toBe('?redirect=%2Fnocobase%2Fv2');
     });
   });
 
   it('should check current user after navigating from skipped route to v2 admin', async () => {
     const app = createMockClient({
       publicPath: '/v2/',
-      plugins: [NocoBaseBuildInPlugin as any, SkippedPublicRoutePlugin as any],
+      plugins: [
+        NocoBaseBuildInPlugin as any,
+        TestAdminPortalPlugin as typeof Plugin,
+        SkippedPublicRoutePlugin as typeof Plugin,
+      ],
       router: { type: 'memory', initialEntries: ['/v2/public'] },
     });
     app.apiMock.onGet('app:getLang').reply(200, {
@@ -385,7 +421,7 @@ describe('nocobase buildin plugin auth redirect', () => {
   it('should render v2 admin root without redirecting away', async () => {
     const app = createMockClient({
       publicPath: '/v2/',
-      plugins: [NocoBaseBuildInPlugin as any],
+      plugins: [NocoBaseBuildInPlugin as any, TestAdminPortalPlugin as typeof Plugin],
       router: { type: 'memory', initialEntries: ['/v2/admin'] },
     });
     app.apiMock.onGet('app:getLang').reply(200, {
@@ -415,11 +451,11 @@ describe('nocobase buildin plugin auth redirect', () => {
   });
 
   it.each(['/v2/admin/legacy-page/tab/tab-1', '/v2/admin/legacy-page/view/detail'])(
-    'should show 404 for authenticated direct v1-style v2 page access: %s',
+    'should explain authenticated direct v1-style v2 page access: %s',
     async (pathname) => {
       const app = createMockClient({
         publicPath: '/v2/',
-        plugins: [NocoBaseBuildInPlugin as any],
+        plugins: [NocoBaseBuildInPlugin as any, TestAdminPortalPlugin as typeof Plugin],
         router: { type: 'memory', initialEntries: [pathname] },
       });
       app.apiMock.onGet('app:getLang').reply(200, {
@@ -441,7 +477,12 @@ describe('nocobase buildin plugin auth redirect', () => {
       const Root = app.getRootComponent();
       render(<Root />);
 
-      expect(await screen.findByText('404')).toBeInTheDocument();
+      expect(await screen.findByText('This page is not supported in the /v2/ branch')).toBeInTheDocument();
+      expect(screen.queryByText('404')).not.toBeInTheDocument();
+      expect(screen.getByRole('link', { name: 'Open from the original entry' })).toHaveAttribute(
+        'href',
+        pathname.replace(/^\/v2/, ''),
+      );
       expect(app.router.router.state.location.pathname).toBe(pathname);
     },
   );

package/src/__tests__/plugin-manager.test.tsx

@@ -7,10 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ACLRolesCheckProvider, createMockClient, Plugin } from '@nocobase/client-v2';
+import { ACLRolesCheckProvider, Plugin } from '@nocobase/client-v2';
 import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
 import React from 'react';
-import { NocoBaseBuildInPlugin } from '../nocobase-buildin-plugin';
+import { SettingsBuildInPlugin } from '../settings-app/SettingsBuildInPlugin';
+import { createMockSettingsClient } from './mockSettingsApplication';
 
 class TestAclPlugin extends Plugin {
   async load() {
@@ -31,7 +32,7 @@ class TestSettingsLinkPlugin extends Plugin {
   }
 }
 
-type MockClientApplication = ReturnType<typeof createMockClient>;
+type MockClientApplication = ReturnType<typeof createMockSettingsClient>;
 
 const renderApp = (app: MockClientApplication) => {
   const Root = app.getRootComponent();
@@ -49,9 +50,9 @@ const waitForGetRequests = async (app: MockClientApplication, urls: string[]) =>
 };
 
 const setupApp = (pmList: any[], plugins: Array<typeof Plugin> = []) => {
-  const app = createMockClient({
-    plugins: [NocoBaseBuildInPlugin, TestAclPlugin, ...plugins],
-    router: { type: 'memory', initialEntries: ['/admin/settings/plugin-manager'] },
+  const app = createMockSettingsClient({
+    plugins: [SettingsBuildInPlugin, TestAclPlugin, ...plugins],
+    router: { type: 'memory', initialEntries: ['/settings/plugin-manager'] },
   });
 
   app.apiMock.onGet('/auth:check').reply(200, {