@nocobase/client-v2 2.2.0-beta.3 → 2.2.0-beta.6

package/src/flow/admin-shell/admin-layout/__tests__/TopbarActionsBar.test.tsx

@@ -8,12 +8,20 @@
  */
 
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-const { allowMock, flowModelRendererSpy } = vi.hoisted(() => {
+const { allowMock, appMock, flowModelRendererSpy } = vi.hoisted(() => {
   return {
     allowMock: vi.fn(),
+    appMock: {
+      current: {
+        router: {
+          getBasename: () => '/nocobase/v',
+        },
+      },
+    },
     flowModelRendererSpy: vi.fn(),
   };
 });
@@ -32,6 +40,12 @@ vi.mock('../HelpLite', () => {
   };
 });
 
+vi.mock('../../../../hooks/useApp', () => {
+  return {
+    useApp: () => appMock.current,
+  };
+});
+
 vi.mock('@nocobase/flow-engine', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@nocobase/flow-engine')>();
   return {
@@ -63,10 +77,19 @@ const createAction = (options: Record<string, any>) => {
   } as any;
 };
 
+const renderSettingsLabel = (label: React.ReactNode, pathname: string) => {
+  return render(<MemoryRouter initialEntries={[pathname]}>{label}</MemoryRouter>);
+};
+
 describe('TopbarActionsBar helpers', () => {
   beforeEach(() => {
     allowMock.mockReset();
     flowModelRendererSpy.mockClear();
+    appMock.current = {
+      router: {
+        getBasename: () => '/nocobase/v',
+      },
+    };
   });
 
   afterEach(() => {
@@ -149,6 +172,147 @@ describe('TopbarActionsBar helpers', () => {
     });
   });
 
+  it('should open regular admin settings in a new tab outside admin runtime', () => {
+    const items = getTopbarPluginSettingsItems({
+      canManagePlugins: false,
+      t: (key) => key,
+      settings: [
+        {
+          key: 'system-settings',
+          name: 'system-settings',
+          title: 'System settings',
+          path: '/admin/settings/system-settings',
+          icon: null,
+          componentLoader: async () => null,
+        },
+      ] as any,
+    });
+
+    renderSettingsLabel((items as any[])[0].label, '/sales/p1');
+
+    const link = screen.getByRole('link', { name: 'System settings' });
+    expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/system-settings');
+    expect(link).toHaveAttribute('target', '_blank');
+    expect(link).toHaveAttribute('rel', expect.stringContaining('noopener'));
+    expect(link).toHaveAttribute('rel', expect.stringContaining('noreferrer'));
+  });
+
+  it('should open plugin manager in a new tab outside admin runtime', () => {
+    const items = getTopbarPluginSettingsItems({
+      canManagePlugins: true,
+      t: (key) => key,
+      settings: [
+        {
+          key: 'plugin-manager',
+          name: 'plugin-manager',
+          title: 'Plugin manager',
+          path: '/admin/settings/plugin-manager',
+          icon: null,
+          componentLoader: async () => null,
+        },
+      ] as any,
+    });
+
+    renderSettingsLabel((items as any[])[0].label, '/sales/p1');
+
+    const link = screen.getByRole('link', { name: 'Plugin manager' });
+    expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/plugin-manager');
+    expect(link).toHaveAttribute('target', '_blank');
+    expect(link).toHaveAttribute('rel', expect.stringContaining('noopener'));
+    expect(link).toHaveAttribute('rel', expect.stringContaining('noreferrer'));
+  });
+
+  it('should keep regular admin settings as SPA links inside admin runtime', () => {
+    const items = getTopbarPluginSettingsItems({
+      canManagePlugins: false,
+      t: (key) => key,
+      settings: [
+        {
+          key: 'routes',
+          name: 'routes',
+          title: 'Routes',
+          path: '/admin/settings/routes',
+          icon: null,
+          componentLoader: async () => null,
+        },
+      ] as any,
+    });
+
+    renderSettingsLabel((items as any[])[0].label, '/admin/settings/routes');
+
+    const link = screen.getByRole('link', { name: 'Routes' });
+    expect(link).toHaveAttribute('href', '/admin/settings/routes');
+    expect(link).not.toHaveAttribute('target', '_blank');
+  });
+
+  it('should not treat admin-like paths as admin runtime', () => {
+    const items = getTopbarPluginSettingsItems({
+      canManagePlugins: false,
+      t: (key) => key,
+      settings: [
+        {
+          key: 'system-settings',
+          name: 'system-settings',
+          title: 'System settings',
+          path: '/admin/settings/system-settings',
+          icon: null,
+          componentLoader: async () => null,
+        },
+      ] as any,
+    });
+
+    renderSettingsLabel((items as any[])[0].label, '/admin2/foo');
+
+    const link = screen.getByRole('link', { name: 'System settings' });
+    expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/system-settings');
+    expect(link).toHaveAttribute('target', '_blank');
+  });
+
+  it('should not duplicate the basename when building new-tab settings hrefs', () => {
+    const items = getTopbarPluginSettingsItems({
+      canManagePlugins: false,
+      t: (key) => key,
+      settings: [
+        {
+          key: 'system-settings',
+          name: 'system-settings',
+          title: 'System settings',
+          path: '/nocobase/v/admin/settings/system-settings',
+          icon: null,
+          componentLoader: async () => null,
+        },
+      ] as any,
+    });
+
+    renderSettingsLabel((items as any[])[0].label, '/sales/p1');
+
+    const link = screen.getByRole('link', { name: 'System settings' });
+    expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/system-settings');
+  });
+
+  it('should keep external settings opening in a new tab', () => {
+    const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
+    const items = getTopbarPluginSettingsItems({
+      canManagePlugins: false,
+      t: (key) => key,
+      settings: [
+        {
+          key: 'docs',
+          name: 'docs',
+          title: 'Docs',
+          link: 'https://www.nocobase.com/docs',
+          icon: null,
+          componentLoader: async () => null,
+        },
+      ] as any,
+    });
+
+    renderSettingsLabel((items as any[])[0].label, '/sales/p1');
+    fireEvent.click(screen.getByText('Docs'));
+
+    expect(openSpy).toHaveBeenCalledWith('https://www.nocobase.com/docs', '_blank', 'noopener,noreferrer');
+  });
+
   it('should return empty dropdown items when plugin manager and settings are both unavailable', () => {
     const items = getTopbarPluginSettingsItems({
       canManagePlugins: false,

package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.test.ts

@@ -52,6 +52,26 @@ describe('resolveAdminRouteRuntimeTarget', () => {
     });
   });
 
+  it('should resolve flowPage under a custom admin layout route path', () => {
+    expect(
+      resolveAdminRouteRuntimeTarget({
+        app,
+        layout: {
+          routePath: '/admin2',
+        },
+        route: {
+          type: NocoBaseDesktopRouteType.flowPage,
+          schemaUid: 'flow-page-1',
+        },
+      }),
+    ).toEqual({
+      runtimePath: '/nocobase/v2/admin2/flow-page-1',
+      navigationMode: 'spa',
+      isLegacy: false,
+      reason: 'ok',
+    });
+  });
+
   it('should mark page unsupported in v2 admin runtime', () => {
     expect(
       resolveAdminRouteRuntimeTarget({

package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.ts

@@ -10,6 +10,7 @@
 import { getModernClientPrefix, getV2EffectiveBasePath } from '../../../authRedirect';
 import type { BaseApplication } from '../../../BaseApplication';
 import { NocoBaseDesktopRouteType, type NocoBaseDesktopRoute } from '../../../flow-compat';
+import type { LayoutDefinition } from '../../../layout-manager/types';
 
 export type AdminRouteNavigationMode = 'spa' | 'document';
 export type AdminRouteRuntimeTargetReason =
@@ -32,6 +33,8 @@ type LocationLike = {
   hash?: string;
 };
 
+export type AdminLayoutRoutePathLike = Pick<LayoutDefinition, 'routePath'>;
+
 type ResolveAdminRouteRuntimeTargetOptions = {
   app: Pick<BaseApplication<any>, 'getPublicPath'> & {
     router?: {
@@ -39,12 +42,14 @@ type ResolveAdminRouteRuntimeTargetOptions = {
     };
   };
   route?: NocoBaseDesktopRoute;
+  layout?: AdminLayoutRoutePathLike;
   location?: LocationLike;
   preserveLocationState?: boolean;
   log?: (message?: any, ...optionalParams: any[]) => void;
 };
 
 const LOG_PREFIX = '[NocoBase] Admin route runtime target:';
+export const DEFAULT_ADMIN_LAYOUT_ROUTE_PATH = '/admin';
 
 const EMPTY_TARGET: AdminRouteRuntimeTarget = {
   runtimePath: null,
@@ -61,6 +66,25 @@ function normalizeRootRelativePath(pathname: string) {
   return normalized;
 }
 
+export function getAdminLayoutRoutePath(layout?: AdminLayoutRoutePathLike | null) {
+  const routePath = typeof layout?.routePath === 'string' ? layout.routePath.trim() : '';
+  return routePath.startsWith('/') ? normalizeRootRelativePath(routePath) : DEFAULT_ADMIN_LAYOUT_ROUTE_PATH;
+}
+
+export function joinAdminLayoutRoutePath(
+  layout: AdminLayoutRoutePathLike | null | undefined,
+  pathname?: string | number | null,
+) {
+  const layoutRoutePath = getAdminLayoutRoutePath(layout);
+  const routePath = pathname == null ? '' : String(pathname).replace(/^\/+/, '');
+
+  if (!routePath) {
+    return layoutRoutePath;
+  }
+
+  return normalizeRootRelativePath(`${layoutRoutePath}/${routePath}`);
+}
+
 function normalizePublicPath(value = '/') {
   const normalized = normalizeRootRelativePath(value || '/');
   return normalized.endsWith('/') ? normalized : `${normalized}/`;
@@ -104,8 +128,12 @@ function joinRootRelativePath(basePath: string, pathname: string) {
   return normalizeRootRelativePath(`${normalizedBasePath}${normalizedPathname.slice(1)}`);
 }
 
-function getV2AdminPath(app: ResolveAdminRouteRuntimeTargetOptions['app'], schemaUid: string) {
-  return joinRootRelativePath(getV2EffectiveBasePath(app), `/admin/${schemaUid}`);
+function getV2AdminPath(
+  app: ResolveAdminRouteRuntimeTargetOptions['app'],
+  schemaUid: string,
+  layout?: AdminLayoutRoutePathLike,
+) {
+  return joinRootRelativePath(getV2EffectiveBasePath(app), joinAdminLayoutRoutePath(layout, schemaUid));
 }
 
 function appendLocationState(pathname: string, location?: LocationLike) {
@@ -212,7 +240,7 @@ function resolvePageRuntimeTarget(
 
   if (route.type === NocoBaseDesktopRouteType.flowPage) {
     return {
-      runtimePath: getV2AdminPath(app, route.schemaUid),
+      runtimePath: getV2AdminPath(app, route.schemaUid, options.layout),
       navigationMode: 'spa' as const,
       isLegacy: false,
       reason: 'ok' as const,
@@ -229,8 +257,8 @@ function resolvePageRuntimeTarget(
   return {
     runtimePath:
       preserveLocationState && location
-        ? appendLocationState(getV2AdminPath(app, route.schemaUid), location)
-        : getV2AdminPath(app, route.schemaUid),
+        ? appendLocationState(getV2AdminPath(app, route.schemaUid, options.layout), location)
+        : getV2AdminPath(app, route.schemaUid, options.layout),
     navigationMode: 'spa' as const,
     isLegacy: false,
     reason: 'ok' as const,

package/src/flow/components/DefaultValue.tsx

@@ -18,7 +18,6 @@ import {
   parseValueToPath,
   isRunJSValue,
   normalizeRunJSValue,
-  runjsWithSafeGlobals,
   useFlowContext,
   extractPropertyPath,
   FlowModel,
@@ -240,7 +239,7 @@ export const DefaultValue = connect((props: Props) => {
       if (isRunJSValue(out)) {
         try {
           const { code, version } = normalizeRunJSValue(out);
-          const ret = await runjsWithSafeGlobals(model?.context, code, { version });
+          const ret = await model?.context?.runjs(code, undefined, { version });
           out = ret?.success ? ret.value : undefined;
         } catch {
           out = undefined;