@nocobase/client-v2 2.1.0-alpha.31 → 2.1.0-alpha.33

package/src/flow/admin-shell/admin-layout/AdminLayoutSlotModels.tsx

@@ -14,6 +14,7 @@ import { Result, theme as antdTheme } from 'antd';
 import React, { FC, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Outlet, useLocation } from 'react-router-dom';
+import { isV2AdminRuntime, isV2MenuRoute } from './resolveAdminRouteRuntimeTarget';
 
 type AdminLayoutContentProps = {
   onContentElementChange?: (element: HTMLDivElement | null) => void;
@@ -67,9 +68,12 @@ const ShowTipWhenNoPages = observer(() => {
   const { t } = useTranslation();
   const location = useLocation();
   const allAccessRoutes = flowEngine.context.routeRepository?.listAccessible?.() || [];
+  const visibleRoutes = isV2AdminRuntime(flowEngine.context.app)
+    ? allAccessRoutes.filter((route) => isV2MenuRoute(route))
+    : allAccessRoutes;
   const designable = !!flowEngine.context.flowSettingsEnabled;
 
-  if (allAccessRoutes.length === 0 && !designable && ['/admin', '/admin/'].includes(location.pathname)) {
+  if (visibleRoutes.length === 0 && !designable && ['/admin', '/admin/'].includes(location.pathname)) {
     return (
       <Result
         icon={<HighlightOutlined style={{ fontSize: '8em', color: token.colorText }} />}

package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutMenuModels.test.ts

@@ -18,6 +18,7 @@ import {
   AdminLayoutMenuItemRenderer,
   AdminLayoutMenuItemModel,
   AdminLayoutModel,
+  ADMIN_LAYOUT_MODEL_UID,
   getAdminLayoutMenuMovePositionOptions,
   normalizeAdminLayoutMenuLegacyVariables,
   openAdminLayoutMenuLink,
@@ -211,7 +212,7 @@ describe('AdminLayoutModel menu items', () => {
             id: 11,
             title: 'Page 1',
             schemaUid: 'page-1',
-            type: NocoBaseDesktopRouteType.page,
+            type: NocoBaseDesktopRouteType.flowPage,
           },
         ],
       },
@@ -264,7 +265,7 @@ describe('AdminLayoutModel menu items', () => {
             id: 11,
             title: 'Page 1',
             schemaUid: 'page-1',
-            type: NocoBaseDesktopRouteType.page,
+            type: NocoBaseDesktopRouteType.flowPage,
           },
         ],
       },
@@ -285,21 +286,21 @@ describe('AdminLayoutModel menu items', () => {
     expect(route.children).toHaveLength(2);
     expect(route.children[0].path).toBe('/admin/1');
     expect(route.children[0].redirect).toBe('/admin/page-1');
-    expect(route.children[0]._runtimePath).toBe('/apps/demo/admin/page-1');
-    expect(route.children[0]._navigationMode).toBe('document');
-    expect(route.children[0]._isLegacy).toBe(true);
+    expect(route.children[0]._runtimePath).toBe('/apps/demo/v2/admin/page-1');
+    expect(route.children[0]._navigationMode).toBe('spa');
+    expect(route.children[0]._isLegacy).toBe(false);
     expect(route.children[0]._depth).toBe(0);
     expect(route.children[0]._route).toMatchObject({ id: 1, type: NocoBaseDesktopRouteType.group });
     expect(route.children[0]._model).toBe(adminLayoutModel.subModels.menuItems?.[0]);
     expect(route.children[0].routes).toHaveLength(1);
     expect(route.children[0].routes?.[0].path).toBe('/admin/page-1');
     expect(route.children[0].routes?.[0].redirect).toBe('/admin/page-1');
-    expect(route.children[0].routes?.[0]._runtimePath).toBe('/apps/demo/admin/page-1');
-    expect(route.children[0].routes?.[0]._navigationMode).toBe('document');
+    expect(route.children[0].routes?.[0]._runtimePath).toBe('/apps/demo/v2/admin/page-1');
+    expect(route.children[0].routes?.[0]._navigationMode).toBe('spa');
     expect(route.children[0].routes?.[0]._depth).toBe(1);
     expect(route.children[0].routes?.[0]._route).toMatchObject({
       schemaUid: 'page-1',
-      type: NocoBaseDesktopRouteType.page,
+      type: NocoBaseDesktopRouteType.flowPage,
     });
     expect(route.children[0].routes?.[0]._model).toBe(
       adminLayoutModel.subModels.menuItems?.[0].subModels.menuItems?.[0],
@@ -310,6 +311,84 @@ describe('AdminLayoutModel menu items', () => {
     expect(route.children[1]._model).toBe(adminLayoutModel.subModels.menuItems?.[1]);
   });
 
+  it('should filter legacy page menu routes in v2 admin layout', () => {
+    const adminLayoutModel = engine.createModel<AdminLayoutModel>({
+      uid: 'admin-layout-model',
+      use: AdminLayoutModel,
+    });
+
+    adminLayoutModel.syncMenuRoutes([
+      {
+        id: 1,
+        title: 'Legacy page',
+        schemaUid: 'legacy-page',
+        type: NocoBaseDesktopRouteType.page,
+      },
+      {
+        id: 2,
+        title: 'Legacy only group',
+        type: NocoBaseDesktopRouteType.group,
+        children: [
+          {
+            id: 21,
+            title: 'Nested legacy page',
+            schemaUid: 'nested-legacy-page',
+            type: NocoBaseDesktopRouteType.page,
+          },
+        ],
+      },
+      {
+        id: 3,
+        title: 'Mixed group',
+        type: NocoBaseDesktopRouteType.group,
+        children: [
+          {
+            id: 31,
+            title: 'Nested legacy page',
+            schemaUid: 'nested-legacy-page-2',
+            type: NocoBaseDesktopRouteType.page,
+          },
+          {
+            id: 32,
+            title: 'Nested flow page',
+            schemaUid: 'nested-flow-page',
+            type: NocoBaseDesktopRouteType.flowPage,
+          },
+        ],
+      },
+      {
+        id: 4,
+        title: 'Link',
+        type: NocoBaseDesktopRouteType.link,
+      },
+    ]);
+
+    const route = adminLayoutModel.toProLayoutRoute({
+      designable: false,
+      isMobile: false,
+      t: (title) => title,
+    });
+
+    expect(route.children).toHaveLength(2);
+    expect(route.children[0]).toMatchObject({
+      path: '/admin/3',
+      redirect: '/admin/nested-flow-page',
+      _runtimePath: '/apps/demo/v2/admin/nested-flow-page',
+      _navigationMode: 'spa',
+      _isLegacy: false,
+    });
+    expect(route.children[0].routes).toHaveLength(1);
+    expect(route.children[0].routes?.[0]).toMatchObject({
+      path: '/admin/nested-flow-page',
+      _runtimePath: '/apps/demo/v2/admin/nested-flow-page',
+      _navigationMode: 'spa',
+      _isLegacy: false,
+    });
+    expect(route.children[1]).toMatchObject({
+      path: '/admin/__admin_layout__/link/4',
+    });
+  });
+
   it('should resolve modern flowPage menu runtime target to v2 path', () => {
     const model = engine.createModel<AdminLayoutMenuItemModel>({
       uid: 'menu-item-flow-page',
@@ -406,7 +485,7 @@ describe('AdminLayoutModel menu items', () => {
     );
   });
 
-  it('should render legacy menu item as native anchor and use assign on left click', () => {
+  it('should render document menu item as native anchor and use assign on left click', () => {
     const assign = vi.fn();
     Object.defineProperty(window, 'location', {
       configurable: true,
@@ -452,15 +531,8 @@ describe('AdminLayoutModel menu items', () => {
     fireEvent.click(link, { button: 0 });
 
     return waitFor(() => {
-      expect(modalConfirmMock).toHaveBeenCalledWith(
-        expect.objectContaining({
-          title: 'Open classic page access',
-          content: 'This page requires the classic version to open properly. Do you want to go there now?',
-          okText: 'Yes',
-          cancelText: 'Cancel',
-        }),
-      );
       expect(assign).toHaveBeenCalledWith('/apps/demo/admin/legacy-page');
+      expect(modalConfirmMock).not.toHaveBeenCalled();
       expect(navigateMock).not.toHaveBeenCalled();
     });
   });
@@ -518,7 +590,7 @@ describe('AdminLayoutModel menu items', () => {
     }
   });
 
-  it('should not navigate to legacy page when user cancels confirm dialog', async () => {
+  it('should not ask for confirmation before document navigation', async () => {
     modalConfirmMock.mockResolvedValue(false);
     const assign = vi.fn();
     Object.defineProperty(window, 'location', {
@@ -562,9 +634,9 @@ describe('AdminLayoutModel menu items', () => {
     fireEvent.click(screen.getByRole('link', { name: 'Legacy page' }), { button: 0 });
 
     await waitFor(() => {
-      expect(modalConfirmMock).toHaveBeenCalledTimes(1);
+      expect(assign).toHaveBeenCalledWith('/apps/demo/admin/legacy-page');
     });
-    expect(assign).not.toHaveBeenCalled();
+    expect(modalConfirmMock).not.toHaveBeenCalled();
     expect(navigateMock).not.toHaveBeenCalled();
   });
 
@@ -684,8 +756,8 @@ describe('AdminLayoutModel menu items', () => {
 
     fireEvent.click(screen.getByRole('link', { name: 'Legacy group-landing-entry' }), { button: 0 });
     return waitFor(() => {
-      expect(modalConfirmMock).toHaveBeenCalledTimes(1);
       expect(assign).toHaveBeenCalledWith('/apps/demo/admin/legacy-page');
+      expect(modalConfirmMock).not.toHaveBeenCalled();
     });
   });
 
@@ -741,7 +813,7 @@ describe('AdminLayoutModel menu items', () => {
             id: 11,
             title: 'Page 1',
             schemaUid: 'page-1',
-            type: NocoBaseDesktopRouteType.page,
+            type: NocoBaseDesktopRouteType.flowPage,
           },
         ],
       },
@@ -801,7 +873,7 @@ describe('AdminLayoutModel menu items', () => {
           id: 1,
           title: 'Page 1',
           schemaUid: 'page-1',
-          type: NocoBaseDesktopRouteType.page,
+          type: NocoBaseDesktopRouteType.flowPage,
         },
       ]);
     });
@@ -837,6 +909,195 @@ describe('AdminLayoutModel menu items', () => {
     });
   });
 
+  it('should expose menu linkage rules only for existing menu items', async () => {
+    const menuSettingsFlow = AdminLayoutMenuItemModel.globalFlowRegistry.getFlow('menuSettings');
+    expect(menuSettingsFlow?.steps?.linkageRules?.use).toBe('menuLinkageRules');
+
+    const model = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-linkage-settings',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        route: createRoute(),
+      },
+    });
+    const creationModel = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-linkage-creation-settings',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        creationMeta: {
+          menuType: 'link',
+          source: 'header',
+        },
+      },
+    });
+    const hideInSettings = menuSettingsFlow?.steps?.linkageRules?.hideInSettings as
+      | ((ctx: any) => Promise<boolean>)
+      | undefined;
+
+    await expect(hideInSettings?.({ model })).resolves.toBe(false);
+    await expect(hideInSettings?.({ model: creationModel })).resolves.toBe(true);
+  });
+
+  it('should persist menu linkage rules through flowModels and route flag', async () => {
+    const saveModel = vi.spyOn(engine, 'saveModel').mockResolvedValue(undefined as any);
+    const updateRoute = vi.fn().mockResolvedValue(undefined);
+    engine.context.routeRepository.updateRoute = updateRoute;
+
+    const model = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-linkage-persist',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        route: createRoute(),
+      },
+    });
+
+    model.setStepParams('menuSettings', 'linkageRules', {
+      value: [
+        { key: 'r1', title: 'Hide menu item', enable: true, condition: { logic: '$and', items: [] }, actions: [] },
+      ],
+    });
+
+    await model.saveStepParams();
+
+    expect(saveModel).toHaveBeenCalledWith(model, { onlyStepParams: true });
+    expect(updateRoute).toHaveBeenCalledWith(1, {
+      options: {
+        hasPersistedMenuInstanceFlow: true,
+      },
+    });
+  });
+
+  it('should clear persisted menu linkage rules when no persisted state remains', async () => {
+    const saveModel = vi.spyOn(engine, 'saveModel').mockResolvedValue(undefined as any);
+    const destroy = vi.fn().mockResolvedValue(true);
+    const updateRoute = vi.fn().mockResolvedValue(undefined);
+    engine.setModelRepository({ destroy } as any);
+    engine.context.routeRepository.updateRoute = updateRoute;
+
+    const model = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-linkage-clear',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        route: createRoute({
+          options: {
+            hasPersistedMenuInstanceFlow: true,
+          },
+        }),
+      },
+    });
+
+    model.setStepParams('menuSettings', 'linkageRules', { value: [] });
+    await model.saveStepParams();
+
+    expect(saveModel).not.toHaveBeenCalled();
+    expect(destroy).toHaveBeenCalledWith('menu-item-linkage-clear');
+    expect(updateRoute).toHaveBeenCalledWith(1, {
+      options: undefined,
+    });
+  });
+
+  it('should restore menu linkage rules and rerender after hydrate', async () => {
+    engine.context.defineProperty('flowSettingsEnabled', {
+      value: true,
+    });
+    engine.setModelRepository({
+      findOne: vi.fn().mockResolvedValue({
+        uid: 'menu-item-linkage-hydrate',
+        use: 'AdminLayoutMenuItemModel',
+        stepParams: {
+          menuSettings: {
+            linkageRules: {
+              value: [
+                {
+                  key: 'r1',
+                  title: 'Persisted linkage',
+                  enable: true,
+                  condition: { logic: '$and', items: [] },
+                  actions: [],
+                },
+              ],
+            },
+          },
+        },
+      }),
+    } as any);
+    const rerenderSpy = vi.spyOn(AdminLayoutMenuItemModel.prototype, 'rerender').mockResolvedValue(undefined as any);
+
+    const model = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-linkage-hydrate',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        route: createRoute(),
+      },
+    });
+
+    await waitFor(() => {
+      expect(model.getStepParams('menuSettings', 'linkageRules')).toMatchObject({
+        value: [{ key: 'r1' }],
+      });
+    });
+    expect(rerenderSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('should hide menu route dynamically in runtime mode and refresh layout route tree', () => {
+    const adminLayoutModel = engine.createModel<AdminLayoutModel>({
+      uid: ADMIN_LAYOUT_MODEL_UID,
+      use: AdminLayoutModel,
+    });
+    const model = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-dynamic-hidden',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        route: createRoute(),
+      },
+    });
+
+    const refreshBefore = adminLayoutModel.menuRouteRefreshVersion;
+
+    model.setHidden(true);
+    const runtimeRoute = model.toProLayoutRoute({
+      designable: false,
+      isMobile: false,
+      t: (title) => title,
+    });
+    const designableRoute = model.toProLayoutRoute({
+      designable: true,
+      isMobile: false,
+      t: (title) => title,
+    });
+
+    expect(runtimeRoute).toBeNull();
+    expect(designableRoute?.hideInMenu).toBeFalsy();
+    expect(adminLayoutModel.menuRouteRefreshVersion).toBe(refreshBefore + 1);
+  });
+
+  it('should render hidden menu item with opacity and keep original title in config mode', () => {
+    const model = engine.createModel<AdminLayoutMenuItemModel>({
+      uid: 'menu-item-hidden-in-config',
+      use: AdminLayoutMenuItemModel,
+      props: {
+        route: createRoute(),
+      },
+    });
+
+    model.setProps({
+      item: {
+        name: 'Page 1',
+        path: '/admin/page-1',
+        _route: createRoute(),
+        _model: model,
+      },
+      dom: React.createElement('span', null, 'Page 1'),
+      options: { isMobile: false, collapsed: false },
+      renderType: 'item',
+    });
+
+    const rendered = (model as any).renderHiddenInConfig();
+
+    expect(rendered?.props?.style).toMatchObject({ opacity: 0.3 });
+    expect(rendered?.props?.children?.props?.dom?.props?.children).toBe('Page 1');
+  });
+
   it('should keep variable-aware editors for link menu settings', async () => {
     const model = engine.createModel<AdminLayoutMenuItemModel>({
       uid: 'menu-item-link-edit',
@@ -1630,7 +1891,7 @@ describe('AdminLayoutModel menu items', () => {
         id: 2,
         title: 'Next page',
         schemaUid: 'next-page',
-        type: NocoBaseDesktopRouteType.page,
+        type: NocoBaseDesktopRouteType.flowPage,
       },
     ];
     engine.context.api.resource = vi.fn(() => ({
@@ -1655,8 +1916,8 @@ describe('AdminLayoutModel menu items', () => {
 
     expect(deleteRoute).toHaveBeenCalledWith(1);
     expect(removeSchema).not.toHaveBeenCalled();
-    expect(assign).toHaveBeenCalledWith('/apps/demo/admin/next-page');
-    expect(navigate).not.toHaveBeenCalled();
+    expect(assign).not.toHaveBeenCalled();
+    expect(navigate).toHaveBeenCalledWith('/apps/demo/v2/admin/next-page');
   });
 
   it('should match current route with router basename before navigating away after delete', async () => {
@@ -1684,16 +1945,16 @@ describe('AdminLayoutModel menu items', () => {
         id: 2,
         title: 'Next page',
         schemaUid: 'next-page',
-        type: NocoBaseDesktopRouteType.page,
+        type: NocoBaseDesktopRouteType.flowPage,
       },
     ];
     engine.context.api.resource = vi.fn(() => ({
       'remove/current-page': removeSchema,
     }));
-    engine.context.location.pathname = '/apps/demo/admin/current-page';
+    engine.context.location.pathname = '/apps/demo/v2/admin/current-page';
     engine.context.defineProperty('router', {
       value: {
-        basename: '/apps/demo',
+        basename: '/apps/demo/v2',
         navigate,
       },
     });
@@ -1715,8 +1976,8 @@ describe('AdminLayoutModel menu items', () => {
 
     expect(deleteRoute).toHaveBeenCalledWith(1);
     expect(removeSchema).not.toHaveBeenCalled();
-    expect(assign).toHaveBeenCalledWith('/apps/demo/admin/next-page');
-    expect(navigate).not.toHaveBeenCalled();
+    expect(assign).not.toHaveBeenCalled();
+    expect(navigate).toHaveBeenCalledWith('/admin/next-page');
   });
 
   it('should reject inner move when target is not a group', async () => {

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

@@ -10,6 +10,8 @@
 import { NocoBaseDesktopRouteType, type NocoBaseDesktopRoute } from '../../../flow-compat';
 import {
   findFirstAccessiblePageRoute,
+  findFirstV2LandingRoute,
+  isV2MenuRoute,
   resolveAdminRouteRuntimeTarget,
   toRouterNavigationPath,
 } from './resolveAdminRouteRuntimeTarget';
@@ -35,10 +37,11 @@ describe('resolveAdminRouteRuntimeTarget', () => {
       runtimePath: '/nocobase/v2/admin/flow-page-1',
       navigationMode: 'spa',
       isLegacy: false,
+      reason: 'ok',
     });
   });
 
-  it('should resolve page to legacy document runtime target', () => {
+  it('should mark page unsupported in v2 admin runtime', () => {
     expect(
       resolveAdminRouteRuntimeTarget({
         app,
@@ -48,9 +51,10 @@ describe('resolveAdminRouteRuntimeTarget', () => {
         },
       }),
     ).toEqual({
-      runtimePath: '/nocobase/admin/legacy-page-1',
-      navigationMode: 'document',
-      isLegacy: true,
+      runtimePath: null,
+      navigationMode: 'spa',
+      isLegacy: false,
+      reason: 'unsupportedV2Runtime',
     });
   });
 
@@ -74,10 +78,11 @@ describe('resolveAdminRouteRuntimeTarget', () => {
       runtimePath: '/apps/demo/admin/legacy-page-1',
       navigationMode: 'spa',
       isLegacy: false,
+      reason: 'ok',
     });
   });
 
-  it('should preserve current search and hash for direct legacy correction', () => {
+  it('should not preserve current search and hash when direct legacy page is unsupported', () => {
     expect(
       resolveAdminRouteRuntimeTarget({
         app,
@@ -93,13 +98,14 @@ describe('resolveAdminRouteRuntimeTarget', () => {
         preserveLocationState: true,
       }),
     ).toEqual({
-      runtimePath: '/nocobase/admin/legacy-page-1/tabs/tab-1/popups/detail?from=direct#dialog',
-      navigationMode: 'document',
-      isLegacy: true,
+      runtimePath: null,
+      navigationMode: 'spa',
+      isLegacy: false,
+      reason: 'unsupportedV2Runtime',
     });
   });
 
-  it('should resolve group by DFS first accessible route', () => {
+  it('should resolve group by DFS first v2 landing route in v2 runtime', () => {
     const route: NocoBaseDesktopRoute = {
       type: NocoBaseDesktopRouteType.group,
       children: [
@@ -124,9 +130,10 @@ describe('resolveAdminRouteRuntimeTarget', () => {
     };
 
     expect(resolveAdminRouteRuntimeTarget({ app, route })).toEqual({
-      runtimePath: '/nocobase/admin/legacy-page-2',
-      navigationMode: 'document',
-      isLegacy: true,
+      runtimePath: '/nocobase/v2/admin/flow-page-2',
+      navigationMode: 'spa',
+      isLegacy: false,
+      reason: 'ok',
     });
   });
 
@@ -158,6 +165,35 @@ describe('resolveAdminRouteRuntimeTarget', () => {
     });
   });
 
+  it('should find v2 landing route and skip legacy page routes', () => {
+    const routes = [
+      {
+        type: NocoBaseDesktopRouteType.page,
+        schemaUid: 'legacy-page',
+      },
+      {
+        type: NocoBaseDesktopRouteType.group,
+        children: [
+          {
+            type: NocoBaseDesktopRouteType.page,
+            schemaUid: 'nested-legacy-page',
+          },
+          {
+            type: NocoBaseDesktopRouteType.flowPage,
+            schemaUid: 'nested-flow-page',
+          },
+        ],
+      },
+    ];
+
+    expect(findFirstV2LandingRoute(routes)).toMatchObject({
+      type: NocoBaseDesktopRouteType.flowPage,
+      schemaUid: 'nested-flow-page',
+    });
+    expect(isV2MenuRoute(routes[0])).toBe(false);
+    expect(isV2MenuRoute(routes[1])).toBe(true);
+  });
+
   it('should return empty target when group has no accessible landing page', () => {
     expect(
       resolveAdminRouteRuntimeTarget({
@@ -181,6 +217,7 @@ describe('resolveAdminRouteRuntimeTarget', () => {
       runtimePath: null,
       navigationMode: 'spa',
       isLegacy: false,
+      reason: 'emptyGroup',
     });
   });
 
@@ -199,6 +236,7 @@ describe('resolveAdminRouteRuntimeTarget', () => {
       runtimePath: null,
       navigationMode: 'spa',
       isLegacy: false,
+      reason: 'missingSchemaUid',
     });
     expect(log).toHaveBeenCalledWith(
       '[NocoBase] Admin route runtime target:',