@nocobase/client-v2 2.1.0-beta.33 → 2.1.0-beta.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.35",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -20,14 +20,17 @@
   },
   "dependencies": {
     "@ant-design/icons": "^5.6.1",
+    "@dnd-kit/core": "^6.0.0",
+    "@dnd-kit/sortable": "^7.0.0",
     "@emotion/css": "^11.7.1",
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/evaluators": "2.1.0-beta.33",
-    "@nocobase/flow-engine": "2.1.0-beta.33",
-    "@nocobase/sdk": "2.1.0-beta.33",
-    "@nocobase/shared": "2.1.0-beta.33",
+    "@nocobase/evaluators": "2.1.0-beta.35",
+    "@nocobase/flow-engine": "2.1.0-beta.35",
+    "@nocobase/sdk": "2.1.0-beta.35",
+    "@nocobase/shared": "2.1.0-beta.35",
+    "@nocobase/utils": "2.1.0-beta.35",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -41,5 +44,5 @@
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }

package/src/APIClient.ts

@@ -0,0 +1,68 @@
+/**
+ * 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 { APIClient as APIClientSDK, type APIClientOptions, hasHeaderValue } from '@nocobase/sdk';
+
+function offsetToTimeZone(offset: number) {
+  const hours = Math.floor(Math.abs(offset));
+  const minutes = Math.abs((offset % 1) * 60);
+  const formattedHours = String(hours).padStart(2, '0');
+  const formattedMinutes = String(minutes).padStart(2, '0');
+  const sign = offset >= 0 ? '+' : '-';
+  return `${sign}${formattedHours}:${formattedMinutes}`;
+}
+
+function getCurrentTimezone() {
+  return offsetToTimeZone(new Date().getTimezoneOffset() / -60);
+}
+
+export class APIClient extends APIClientSDK {
+  appName?: string;
+
+  constructor(options?: APIClientOptions) {
+    super(options);
+    if (options && typeof options !== 'function') {
+      this.appName = options.appName;
+    }
+  }
+
+  getHostname() {
+    if (process.env.API_BASE_URL) {
+      try {
+        return new URL(process.env.API_BASE_URL).hostname;
+      } catch {
+        // fall through to window.location.hostname
+      }
+    }
+    return window?.location?.hostname;
+  }
+
+  getHeaders() {
+    const headers = super.getHeaders();
+    if (this.appName) {
+      headers['X-App'] = this.appName;
+    }
+    headers['X-Timezone'] = getCurrentTimezone();
+    headers['X-Hostname'] = this.getHostname();
+    return headers;
+  }
+
+  interceptors() {
+    this.axios.interceptors.request.use((config) => {
+      const headers = this.getHeaders();
+      Object.keys(headers).forEach((key) => {
+        if (!hasHeaderValue(config.headers, key)) {
+          config.headers[key] = headers[key];
+        }
+      });
+      return config;
+    });
+    super.interceptors();
+  }
+}

package/src/Application.tsx

@@ -7,10 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { APIClient, type APIClientOptions } from '@nocobase/sdk';
+import { type APIClientOptions, getSubAppName } from '@nocobase/sdk';
 import { createInstance, type i18n as i18next } from 'i18next';
 import { initReactI18next } from 'react-i18next';
 
+import { APIClient } from './APIClient';
 import { BaseApplication, type BaseApplicationOptions } from './BaseApplication';
 import { CollectionFieldInterfaceManager } from './collection-field-interface/CollectionFieldInterfaceManager';
 import type { PluginType } from './PluginManager';
@@ -43,7 +44,10 @@ export class Application extends BaseApplication<
   public declare dataSourceManager: any;
 
   protected createApiClient(options: ApplicationOptions) {
-    return new APIClient(options.apiClient);
+    return new APIClient({
+      ...options.apiClient,
+      appName: options.name || getSubAppName(options.publicPath),
+    });
   }
 
   protected configureRuntimeAdapters() {

package/src/BaseApplication.tsx

@@ -40,6 +40,7 @@ import type {
   RouterOptions,
 } from './RouterManager';
 import { WebSocketClient, type WebSocketClientOptions } from './WebSocketClient';
+import { getOperators } from './json-logic/globalOperators';
 import { compose, normalizeContainer } from './utils';
 import { defineGlobalDeps } from './utils/globalDeps';
 import { getRequireJs } from './utils/requirejs';
@@ -57,6 +58,11 @@ type AuthTokenPayload = {
   token: string;
   authenticator: string | null;
 };
+export type JsonLogic = {
+  apply: (logic: any, data?: any) => any;
+  addOperation: (name: string, fn?: any) => void;
+  rmOperation: (name: string) => void;
+};
 
 const LEADING_SLASHES_REGEXP = /^\/+/;
 const TRAILING_SLASHES_REGEXP = /\/+$/;
@@ -123,6 +129,7 @@ export abstract class BaseApplication<
   public favicon!: string;
   public flowEngine: FlowEngine;
   public dataSourceManager: any;
+  public jsonLogic!: JsonLogic;
   public context: FlowEngineContext & {
     routeRepository: RouteRepository;
     appInfo: Promise<Record<string, any>>;
@@ -220,6 +227,7 @@ export abstract class BaseApplication<
 
   protected afterManagersInitialized() {
     this.aiManager = new AIManager(this);
+    this.jsonLogic = getOperators();
   }
 
   protected configureContext() {

package/src/PluginManager.ts

@@ -26,6 +26,8 @@ export type PluginData = {
   version: string;
   url: string;
   clientV2Url?: string;
+  devMode?: 'esm';
+  appDevDependencies?: string[];
   type: 'local' | 'upload' | 'npm';
 };
 

package/src/__tests__/app.test.tsx

@@ -48,6 +48,14 @@ describe('app', () => {
       expect(app.getHref('/test')).toBe('/test');
     });
 
+    it('should initialize shared jsonLogic operators', () => {
+      const app = new Application({ router });
+
+      expect(app.jsonLogic.apply({ $eq: [1, '1'] })).toBe(true);
+      app.jsonLogic.addOperation('$testAlwaysTrue', () => true);
+      expect(app.jsonLogic.apply({ $testAlwaysTrue: [] })).toBe(true);
+    });
+
     it('should apply the provided favicon immediately', () => {
       const app = new Application({ router });
 

package/src/__tests__/authRedirect.test.ts

@@ -8,11 +8,10 @@
  */
 
 import {
-  buildLegacySigninHref,
-  convertV2AdminPathToLegacy,
+  buildV2SigninHref,
   getCurrentV2RedirectPath,
-  redirectToLegacySignin,
-  resolveLegacySigninRedirect,
+  redirectToV2Signin,
+  resolveV2SigninRedirect,
 } from '../authRedirect';
 
 describe('auth redirect helpers', () => {
@@ -60,7 +59,7 @@ describe('auth redirect helpers', () => {
     ).toBe('/nocobase/v2/admin/7vu4c2sdk6h?from=menu#tab-1');
   });
 
-  it('should derive legacy signin href from root public path', () => {
+  it('should derive v2 signin href from v2 public path', () => {
     const app = {
       getPublicPath: () => '/nocobase/v2/',
       router: {
@@ -68,12 +67,12 @@ describe('auth redirect helpers', () => {
       },
     } as any;
 
-    expect(buildLegacySigninHref(app, '/nocobase/v2/admin/7vu4c2sdk6h')).toBe(
-      '/nocobase/signin?redirect=%2Fnocobase%2Fv2%2Fadmin%2F7vu4c2sdk6h',
+    expect(buildV2SigninHref(app, '/nocobase/v2/admin/7vu4c2sdk6h')).toBe(
+      '/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin%2F7vu4c2sdk6h',
     );
   });
 
-  it('should convert v2 admin path to legacy root-relative path', () => {
+  it('should derive v2 signin href when root public path is "/"', () => {
     const app = {
       getPublicPath: () => '/v2/',
       router: {
@@ -81,53 +80,7 @@ describe('auth redirect helpers', () => {
       },
     } as any;
 
-    expect(convertV2AdminPathToLegacy(app, '/v2/admin/page-1')).toBe('/admin/page-1');
-    expect(convertV2AdminPathToLegacy(app, '/v2/admin/page-1/tab/tab-1')).toBe('/admin/page-1/tabs/tab-1');
-    expect(convertV2AdminPathToLegacy(app, '/v2/admin/page-1/view/detail')).toBe('/admin/page-1/popups/detail');
-    expect(convertV2AdminPathToLegacy(app, '/v2/admin/page-1/tab/tab-1/view/detail')).toBe(
-      '/admin/page-1/tabs/tab-1/popups/detail',
-    );
-  });
-
-  it('should preserve basename search and hash when converting current legacy path', () => {
-    const app = {
-      getPublicPath: () => '/nocobase/v2/',
-      router: {
-        getBasename: () => '/nocobase/v2',
-      },
-    } as any;
-
-    expect(
-      convertV2AdminPathToLegacy(app, {
-        pathname: '/nocobase/v2/admin/page-1/tab/tab-1/view/detail',
-        search: '?from=menu',
-        hash: '#dialog',
-      }),
-    ).toBe('/nocobase/admin/page-1/tabs/tab-1/popups/detail?from=menu#dialog');
-  });
-
-  it('should normalize duplicated slashes during legacy path conversion', () => {
-    const app = {
-      getPublicPath: () => '/nocobase/v2/',
-      router: {
-        getBasename: () => '/nocobase/v2/',
-      },
-    } as any;
-
-    expect(convertV2AdminPathToLegacy(app, '/nocobase//v2//admin//page-1//tab//tab-1')).toBe(
-      '/nocobase/admin/page-1/tabs/tab-1',
-    );
-  });
-
-  it('should return null for non-admin runtime paths', () => {
-    const app = {
-      getPublicPath: () => '/v2/',
-      router: {
-        getBasename: () => '/v2',
-      },
-    } as any;
-
-    expect(convertV2AdminPathToLegacy(app, '/v2/settings')).toBeNull();
+    expect(buildV2SigninHref(app, '/v2/admin/7vu4c2sdk6h')).toBe('/v2/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
   });
 
   it('should redirect with window.location.replace by default', () => {
@@ -147,12 +100,12 @@ describe('auth redirect helpers', () => {
       },
     } as any;
 
-    redirectToLegacySignin(app, '/v2/admin/7vu4c2sdk6h');
+    redirectToV2Signin(app, '/v2/admin/7vu4c2sdk6h');
 
-    expect(replace).toHaveBeenCalledWith('/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
+    expect(replace).toHaveBeenCalledWith('/v2/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
   });
 
-  it('should accept same-origin legacy signin urls only', () => {
+  it('should accept same-origin v2 signin urls only', () => {
     Object.defineProperty(globalThis.window, 'location', {
       configurable: true,
       value: {
@@ -168,14 +121,167 @@ describe('auth redirect helpers', () => {
       },
     } as any;
 
-    expect(resolveLegacySigninRedirect('/nocobase/signin?redirect=%2Fnocobase%2Fv2%2Fadmin#hash', app)).toBe(
-      'http://localhost:20000/nocobase/signin?redirect=%2Fnocobase%2Fv2%2Fadmin#hash',
+    expect(resolveV2SigninRedirect('/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin#hash', app)).toBe(
+      'http://localhost:20000/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin#hash',
     );
-    expect(resolveLegacySigninRedirect('/signin?redirect=%2Fv2%2Fadmin', app)).toBe(
+    expect(resolveV2SigninRedirect('/signin?redirect=%2Fv2%2Fadmin', app)).toBe(
       'http://localhost:20000/signin?redirect=%2Fv2%2Fadmin',
     );
-    expect(resolveLegacySigninRedirect('/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin', app)).toBeNull();
-    expect(resolveLegacySigninRedirect('https://evil.example.com/signin?redirect=%2Fv2%2Fadmin', app)).toBeNull();
-    expect(resolveLegacySigninRedirect('/nocobase/admin', app)).toBeNull();
+    expect(resolveV2SigninRedirect('/nocobase/signin?redirect=%2Fnocobase%2Fv2%2Fadmin', app)).toBeNull();
+    expect(resolveV2SigninRedirect('https://evil.example.com/signin?redirect=%2Fv2%2Fadmin', app)).toBeNull();
+    expect(resolveV2SigninRedirect('/nocobase/admin', app)).toBeNull();
+  });
+
+  describe('v2 sub-app context (router basename contains /apps/<id>/)', () => {
+    it('should preserve sub-app segment when building current redirect path under simple public path', () => {
+      const app = {
+        getPublicPath: () => '/v2/',
+        router: {
+          getBasename: () => '/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(
+        getCurrentV2RedirectPath(app, {
+          pathname: '/v2/apps/test-app/admin/7vu4c2sdk6h',
+          search: '?tab=overview',
+          hash: '#section-a',
+        }),
+      ).toBe('/v2/apps/test-app/admin/7vu4c2sdk6h?tab=overview#section-a');
+    });
+
+    it('should preserve sub-app segment when building current redirect path under nested public path', () => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(
+        getCurrentV2RedirectPath(app, {
+          pathname: '/nocobase/v2/apps/test-app/admin/al5yj9t81of',
+          search: '?from=menu',
+          hash: '#tab-1',
+        }),
+      ).toBe('/nocobase/v2/apps/test-app/admin/al5yj9t81of?from=menu#tab-1');
+    });
+
+    it('should derive sub-app signin href under nested public path', () => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(buildV2SigninHref(app, '/nocobase/v2/apps/test-app/admin/al5yj9t81of')).toBe(
+        '/nocobase/v2/apps/test-app/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app%2Fadmin%2Fal5yj9t81of',
+      );
+    });
+
+    it('should derive sub-app signin href under simple public path', () => {
+      const app = {
+        getPublicPath: () => '/v2/',
+        router: {
+          getBasename: () => '/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(buildV2SigninHref(app, '/v2/apps/test-app/admin/7vu4c2sdk6h')).toBe(
+        '/v2/apps/test-app/signin?redirect=%2Fv2%2Fapps%2Ftest-app%2Fadmin%2F7vu4c2sdk6h',
+      );
+    });
+
+    it('should redirect to sub-app signin with window.location.replace', () => {
+      const replace = vi.fn();
+      Object.defineProperty(globalThis.window, 'location', {
+        configurable: true,
+        value: {
+          ...originalLocation,
+          replace,
+        },
+      });
+
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      redirectToV2Signin(app, '/nocobase/v2/apps/test-app/admin/al5yj9t81of');
+
+      expect(replace).toHaveBeenCalledWith(
+        '/nocobase/v2/apps/test-app/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app%2Fadmin%2Fal5yj9t81of',
+      );
+    });
+
+    it('should whitelist sub-app signin only and reject main / other-app / v1 signin urls', () => {
+      Object.defineProperty(globalThis.window, 'location', {
+        configurable: true,
+        value: {
+          ...originalLocation,
+          origin: 'http://localhost:20000',
+        },
+      });
+
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      // own sub-app signin: accepted
+      expect(
+        resolveV2SigninRedirect(
+          '/nocobase/v2/apps/test-app/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app%2Fadmin',
+          app,
+        ),
+      ).toBe(
+        'http://localhost:20000/nocobase/v2/apps/test-app/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app%2Fadmin',
+      );
+      // bare /signin: still accepted (universal fallback)
+      expect(resolveV2SigninRedirect('/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app%2Fadmin', app)).toBe(
+        'http://localhost:20000/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app%2Fadmin',
+      );
+      // main v2 signin: rejected (would lose sub-app context)
+      expect(resolveV2SigninRedirect('/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin', app)).toBeNull();
+      // another sub-app signin: rejected (cross-app injection)
+      expect(
+        resolveV2SigninRedirect('/nocobase/v2/apps/other-app/signin?redirect=%2Fnocobase%2Fv2%2Fapps%2Ftest-app', app),
+      ).toBeNull();
+      // v1 root signin: rejected
+      expect(resolveV2SigninRedirect('/nocobase/signin?redirect=%2Fnocobase%2Fv2', app)).toBeNull();
+      // cross-origin: rejected
+      expect(resolveV2SigninRedirect('https://evil.example.com/nocobase/v2/apps/test-app/signin', app)).toBeNull();
+    });
+  });
+
+  describe('fallback when router or basename is missing', () => {
+    it('should fall back to v2 public path when app.router is undefined', () => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: undefined,
+      } as any;
+
+      expect(buildV2SigninHref(app, '/nocobase/v2/admin/X')).toBe(
+        '/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin%2FX',
+      );
+    });
+
+    it('should fall back to v2 public path when router.getBasename returns undefined', () => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => undefined,
+        },
+      } as any;
+
+      expect(buildV2SigninHref(app, '/nocobase/v2/admin/X')).toBe(
+        '/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin%2FX',
+      );
+    });
   });
 });

package/src/__tests__/globalDeps.test.ts

@@ -26,6 +26,8 @@ describe('client-v2 defineGlobalDeps', () => {
     expect(define).toHaveBeenCalledWith('@nocobase/client-v2', expect.any(Function));
     expect(define).toHaveBeenCalledWith('@nocobase/flow-engine', expect.any(Function));
     expect(define).toHaveBeenCalledWith('@nocobase/evaluators/client', expect.any(Function));
+    expect(define).toHaveBeenCalledWith('@dnd-kit/core', expect.any(Function));
+    expect(define).toHaveBeenCalledWith('@dnd-kit/sortable', expect.any(Function));
     expect(define).toHaveBeenCalledWith('ahooks', expect.any(Function));
     expect(define).toHaveBeenCalledWith('dayjs', expect.any(Function));
     expect(define).toHaveBeenCalledWith('lodash', expect.any(Function));

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

@@ -39,7 +39,7 @@ describe('nocobase buildin plugin auth redirect', () => {
     vi.restoreAllMocks();
   });
 
-  it('should redirect unauthenticated admin access to legacy signin with replace', async () => {
+  it('should redirect unauthenticated admin access to v2 signin with replace', async () => {
     const replace = vi.fn();
     Object.defineProperty(globalThis.window, 'location', {
       configurable: true,
@@ -70,11 +70,11 @@ describe('nocobase buildin plugin auth redirect', () => {
     render(<Root />);
 
     await waitFor(() => {
-      expect(replace).toHaveBeenCalledWith('/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
+      expect(replace).toHaveBeenCalledWith('/v2/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
     });
   });
 
-  it('should redirect unauthenticated v2 root access to legacy signin with default admin redirect', async () => {
+  it('should redirect unauthenticated v2 root access to v2 signin with default admin redirect', async () => {
     const replace = vi.fn();
     Object.defineProperty(globalThis.window, 'location', {
       configurable: true,
@@ -104,11 +104,11 @@ describe('nocobase buildin plugin auth redirect', () => {
     render(<Root />);
 
     await waitFor(() => {
-      expect(replace).toHaveBeenCalledWith('/nocobase/signin?redirect=%2Fnocobase%2Fv2%2Fadmin');
+      expect(replace).toHaveBeenCalledWith('/nocobase/v2/signin?redirect=%2Fnocobase%2Fv2%2Fadmin');
     });
   });
 
-  it('should render v2 admin root without redirecting to legacy default page', async () => {
+  it('should render v2 admin root without redirecting away', async () => {
     const replace = vi.fn();
     Object.defineProperty(globalThis.window, 'location', {
       configurable: true,
@@ -157,7 +157,7 @@ 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 legacy v2 page access: %s',
+    'should show 404 for authenticated direct v1-style v2 page access: %s',
     async (pathname) => {
       const replace = vi.fn();
       Object.defineProperty(globalThis.window, 'location', {