@nocobase/client-v2 2.2.0-alpha.7 → 2.2.0-beta.10

package/es/components/category-tabs/SortableCategoryTabs.d.ts

@@ -1,55 +0,0 @@
-/**
- * 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 React from 'react';
-/**
- * A category descriptor for {@link SortableCategoryTabs}. The component is
- * i18n-agnostic: `label` is rendered verbatim, so consumers pass an
- * already-compiled/translated node. `color` is an antd preset color name or a
- * hex string; `'default'` / `undefined` renders no badge color.
- */
-export type SortableCategoryTabItem = {
-    id: string | number;
-    label: React.ReactNode;
-    color?: string;
-};
-export type SortableCategoryTabsProps = {
-    activeKey: string;
-    onChange: (key: string) => void;
-    /** Draggable category tabs (the fixed leading tab is configured via `allTab`). */
-    categories: SortableCategoryTabItem[];
-    /** The fixed, non-draggable leading tab, e.g. "All". */
-    allTab: {
-        key: string;
-        label: React.ReactNode;
-    };
-    /** Show the "+" add button and handle its click. */
-    onAdd?: () => void;
-    /** Per-category edit menu item handler; menu is hidden when omitted. */
-    onEdit?: (id: string | number) => void;
-    /** Per-category delete menu item handler; menu is hidden when omitted. */
-    onDelete?: (id: string | number) => void;
-    /** Reorder handler. Receives the dragged and dropped category ids. */
-    onSort?: (sourceId: string | number, targetId: string | number) => void | Promise<void>;
-    /** Consumer-translated labels for the per-category dropdown menu. */
-    menuLabels?: {
-        edit?: string;
-        delete?: string;
-    };
-    className?: string;
-};
-/**
- * A draggable, editable category tab bar. Renders only the tab bar (no content
- * panes) — the page renders its content below and reacts to `activeKey`.
- *
- * Shared by settings pages that group records under reorderable categories
- * (data-source collections, workflows, …). Drag-to-reorder is powered by
- * `@dnd-kit`; the "+" / per-tab edit-delete affordances are optional.
- */
-export declare function SortableCategoryTabs(props: SortableCategoryTabsProps): React.JSX.Element;
-export default SortableCategoryTabs;

package/es/components/category-tabs/index.d.ts

@@ -1,9 +0,0 @@
-/**
- * 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.
- */
-export * from './SortableCategoryTabs';

package/es/utils/getRouteRuntimeVersion.d.ts

@@ -1,23 +0,0 @@
-/**
- * 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.
- */
-export type RouteRuntimeVersion = 'legacy' | 'modern';
-declare global {
-    interface Window {
-        __nocobase_modern_client_prefix__?: string;
-        __nocobase_public_path__?: string;
-    }
-}
-/** Resolve which client shell currently owns the route.
- *
- * - returns `modern` when the current page is actually mounted under the modern
- *   client base path (`/v/`, `/nocobase/v/`, ...)
- * - returns `legacy` when the route is still under the legacy shell, even if the
- *   modern prefix global has been injected into the page
- */
-export declare function getRouteRuntimeVersion(): RouteRuntimeVersion;

package/src/__tests__/getRouteRuntimeVersion.test.ts

@@ -1,68 +0,0 @@
-/**
- * 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 { afterEach, describe, expect, it } from 'vitest';
-import { getRouteRuntimeVersion } from '../utils/getRouteRuntimeVersion';
-
-function replacePathname(pathname: string) {
-  Object.defineProperty(window, 'location', {
-    configurable: true,
-    value: {
-      ...window.location,
-      pathname,
-    },
-  });
-}
-
-describe('getRouteRuntimeVersion', () => {
-  afterEach(() => {
-    delete window.__nocobase_modern_client_prefix__;
-    delete window.__nocobase_public_path__;
-    replacePathname('/');
-  });
-
-  it('returns modern when the current pathname is inside the modern client prefix', () => {
-    window.__nocobase_modern_client_prefix__ = 'v';
-    window.__nocobase_public_path__ = '/nocobase/v/';
-    replacePathname('/nocobase/v/admin/settings/workflow');
-
-    expect(getRouteRuntimeVersion()).toBe('modern');
-  });
-
-  it('returns legacy when reused v2 components run under the v1 settings page', () => {
-    window.__nocobase_modern_client_prefix__ = 'v';
-    window.__nocobase_public_path__ = '/nocobase/';
-    replacePathname('/nocobase/admin/settings/workflow/workflows/123');
-
-    expect(getRouteRuntimeVersion()).toBe('legacy');
-  });
-
-  it('returns legacy when root public path is "/"', () => {
-    window.__nocobase_modern_client_prefix__ = 'v';
-    window.__nocobase_public_path__ = '/';
-    replacePathname('/admin/settings/workflow/workflows/123');
-
-    expect(getRouteRuntimeVersion()).toBe('legacy');
-  });
-
-  it('returns modern when root public path is "/v/"', () => {
-    window.__nocobase_modern_client_prefix__ = 'v';
-    window.__nocobase_public_path__ = '/v/';
-    replacePathname('/v/admin/workflow/workflows/123');
-
-    expect(getRouteRuntimeVersion()).toBe('modern');
-  });
-
-  it('falls back to pathname matching when public path is unavailable', () => {
-    window.__nocobase_modern_client_prefix__ = 'v';
-    replacePathname('/v/admin/workflow/workflows/123');
-
-    expect(getRouteRuntimeVersion()).toBe('modern');
-  });
-});

package/src/components/category-tabs/SortableCategoryTabs.tsx

@@ -1,210 +0,0 @@
-/**
- * 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 { MenuOutlined } from '@ant-design/icons';
-import {
-  DndContext,
-  DragOverlay,
-  MouseSensor,
-  useDraggable,
-  useDroppable,
-  useSensor,
-  useSensors,
-  type DragEndEvent,
-  type DragStartEvent,
-} from '@dnd-kit/core';
-import { Badge, Button, Dropdown, Space, Tabs } from 'antd';
-import type { TabsProps } from 'antd';
-import React, { useCallback, useMemo, useState } from 'react';
-
-/**
- * A category descriptor for {@link SortableCategoryTabs}. The component is
- * i18n-agnostic: `label` is rendered verbatim, so consumers pass an
- * already-compiled/translated node. `color` is an antd preset color name or a
- * hex string; `'default'` / `undefined` renders no badge color.
- */
-export type SortableCategoryTabItem = {
-  id: string | number;
-  label: React.ReactNode;
-  color?: string;
-};
-
-export type SortableCategoryTabsProps = {
-  activeKey: string;
-  onChange: (key: string) => void;
-  /** Draggable category tabs (the fixed leading tab is configured via `allTab`). */
-  categories: SortableCategoryTabItem[];
-  /** The fixed, non-draggable leading tab, e.g. "All". */
-  allTab: { key: string; label: React.ReactNode };
-  /** Show the "+" add button and handle its click. */
-  onAdd?: () => void;
-  /** Per-category edit menu item handler; menu is hidden when omitted. */
-  onEdit?: (id: string | number) => void;
-  /** Per-category delete menu item handler; menu is hidden when omitted. */
-  onDelete?: (id: string | number) => void;
-  /** Reorder handler. Receives the dragged and dropped category ids. */
-  onSort?: (sourceId: string | number, targetId: string | number) => void | Promise<void>;
-  /** Consumer-translated labels for the per-category dropdown menu. */
-  menuLabels?: { edit?: string; delete?: string };
-  className?: string;
-};
-
-function DraggableTab(props: { id: string; children: React.ReactNode }) {
-  const { attributes, listeners, setNodeRef } = useDraggable({ id: props.id });
-  return (
-    <div ref={setNodeRef} {...listeners} {...attributes}>
-      {props.children}
-    </div>
-  );
-}
-
-function DroppableTab(props: { id: string; children: React.ReactNode }) {
-  const { isOver, setNodeRef } = useDroppable({ id: props.id });
-  return (
-    <div ref={setNodeRef} style={isOver ? { color: 'green' } : undefined}>
-      {props.children}
-    </div>
-  );
-}
-
-function CategoryTabContent(props: {
-  item: SortableCategoryTabItem;
-  onEdit?: (id: string | number) => void;
-  onDelete?: (id: string | number) => void;
-  menuLabels?: { edit?: string; delete?: string };
-}) {
-  const { item, onEdit, onDelete, menuLabels } = props;
-  const hasMenu = Boolean(onEdit || onDelete);
-  const editLabel = menuLabels?.edit ?? 'Edit';
-  const deleteLabel = menuLabels?.delete ?? 'Delete';
-
-  return (
-    <Space size={6}>
-      <Badge color={item.color === 'default' ? undefined : item.color} />
-      {item.label}
-      {hasMenu ? (
-        <Dropdown
-          trigger={['click']}
-          menu={{
-            items: [
-              onEdit ? { key: 'edit', label: editLabel } : null,
-              onDelete ? { key: 'delete', label: deleteLabel } : null,
-            ].filter(Boolean) as { key: string; label: string }[],
-            onClick({ key, domEvent }) {
-              domEvent.stopPropagation();
-              if (key === 'edit') {
-                onEdit?.(item.id);
-                return;
-              }
-              onDelete?.(item.id);
-            },
-          }}
-        >
-          <Button
-            aria-label={editLabel}
-            icon={<MenuOutlined />}
-            size="small"
-            type="text"
-            onClick={(event) => event.stopPropagation()}
-          />
-        </Dropdown>
-      ) : null}
-    </Space>
-  );
-}
-
-/**
- * A draggable, editable category tab bar. Renders only the tab bar (no content
- * panes) — the page renders its content below and reacts to `activeKey`.
- *
- * Shared by settings pages that group records under reorderable categories
- * (data-source collections, workflows, …). Drag-to-reorder is powered by
- * `@dnd-kit`; the "+" / per-tab edit-delete affordances are optional.
- */
-export function SortableCategoryTabs(props: SortableCategoryTabsProps) {
-  const { activeKey, onChange, categories, allTab, onAdd, onEdit, onDelete, onSort, menuLabels, className } = props;
-  const [activeDragId, setActiveDragId] = useState<string | null>(null);
-  const sensors = useSensors(useSensor(MouseSensor, { activationConstraint: { distance: 10 } }));
-
-  const handleDragStart = useCallback((event: DragStartEvent) => {
-    setActiveDragId(String(event.active.id));
-  }, []);
-
-  const handleDragEnd = useCallback(
-    async (event: DragEndEvent) => {
-      const { active, over } = event;
-      setActiveDragId(null);
-      if (!over || over.id === active.id) {
-        return;
-      }
-      await onSort?.(active.id as string | number, over.id as string | number);
-    },
-    [onSort],
-  );
-
-  const items = useMemo<TabsProps['items']>(
-    () => [
-      { key: allTab.key, label: allTab.label, closable: false },
-      ...categories.map((item) => ({
-        key: String(item.id),
-        closable: false,
-        label: onSort ? (
-          <DroppableTab id={String(item.id)}>
-            <DraggableTab id={String(item.id)}>
-              <CategoryTabContent item={item} onEdit={onEdit} onDelete={onDelete} menuLabels={menuLabels} />
-            </DraggableTab>
-          </DroppableTab>
-        ) : (
-          <CategoryTabContent item={item} onEdit={onEdit} onDelete={onDelete} menuLabels={menuLabels} />
-        ),
-      })),
-    ],
-    [allTab.key, allTab.label, categories, onSort, onEdit, onDelete, menuLabels],
-  );
-
-  const activeDragItem = useMemo(
-    () => categories.find((item) => String(item.id) === activeDragId),
-    [categories, activeDragId],
-  );
-
-  const tabs = (
-    <Tabs
-      className={className}
-      activeKey={activeKey}
-      type="editable-card"
-      hideAdd={!onAdd}
-      items={items}
-      onChange={onChange}
-      onEdit={(_, action) => {
-        if (action === 'add') {
-          onAdd?.();
-        }
-      }}
-    />
-  );
-
-  if (!onSort) {
-    return tabs;
-  }
-
-  return (
-    <DndContext sensors={sensors} onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
-      {tabs}
-      <DragOverlay dropAnimation={null}>
-        {activeDragItem ? (
-          <span style={{ whiteSpace: 'nowrap' }}>
-            <CategoryTabContent item={activeDragItem} menuLabels={menuLabels} />
-          </span>
-        ) : null}
-      </DragOverlay>
-    </DndContext>
-  );
-}
-
-export default SortableCategoryTabs;

package/src/components/category-tabs/index.ts

@@ -1,10 +0,0 @@
-/**
- * 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.
- */
-
-export * from './SortableCategoryTabs';

package/src/components/form/filter/__tests__/useFilterActionProps.test.tsx

@@ -1,95 +0,0 @@
-/**
- * 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 { FlowEngine, FlowEngineProvider, type Collection } from '@nocobase/flow-engine';
-import { renderHook } from '@testing-library/react';
-import React from 'react';
-import { describe, expect, it, vi } from 'vitest';
-import { useFilterActionProps } from '../useFilterActionProps';
-
-vi.mock('../../../flow/components/filter/useFilterOptions', () => ({
-  useFilterOptions: () => [],
-}));
-
-vi.mock('../CollectionFilterItem', () => ({
-  createCollectionFilterItem: () => undefined,
-}));
-
-function makeCollection(): Collection {
-  return {
-    getFields: () => [{ name: 'title' }, { name: 'type' }],
-  } as unknown as Collection;
-}
-
-function makeWrapper() {
-  const engine = new FlowEngine();
-  const Wrapper: React.FC = ({ children }) => <FlowEngineProvider engine={engine}>{children}</FlowEngineProvider>;
-  return Wrapper;
-}
-
-describe('useFilterActionProps', () => {
-  it('seeds the editable group from defaultValue when initialValue is missing', () => {
-    const { result } = renderHook(
-      () =>
-        useFilterActionProps({
-          collection: makeCollection(),
-          defaultValue: { $and: [{ title: { $includes: '' } }, { type: { $eq: undefined } }] },
-          onApply: () => undefined,
-        }),
-      { wrapper: makeWrapper() },
-    );
-
-    expect(result.current.value).toMatchObject({
-      logic: '$and',
-      items: [
-        { path: 'title', operator: '$includes', value: '' },
-        { path: 'type', operator: '$eq', value: undefined },
-      ],
-    });
-  });
-
-  it('reset restores defaultValue and emits its compiled filter', () => {
-    const onApply = vi.fn();
-    const { result } = renderHook(
-      () =>
-        useFilterActionProps({
-          collection: makeCollection(),
-          defaultValue: { $and: [{ title: { $includes: '' } }, { type: { $eq: undefined } }] },
-          initialValue: { $and: [{ title: { $includes: 'abc' } }] },
-          onApply,
-        }),
-      { wrapper: makeWrapper() },
-    );
-
-    result.current.onReset();
-
-    expect(result.current.value).toMatchObject({
-      logic: '$and',
-      items: [
-        { path: 'title', operator: '$includes', value: '' },
-        { path: 'type', operator: '$eq', value: undefined },
-      ],
-    });
-    expect(onApply).toHaveBeenCalledWith(undefined, 'reset');
-  });
-
-  it('counts only effective compiled conditions, so empty default rows do not highlight the button', () => {
-    const { result } = renderHook(
-      () =>
-        useFilterActionProps({
-          collection: makeCollection(),
-          defaultValue: { $and: [{ title: { $includes: '' } }, { type: { $eq: undefined } }] },
-          onApply: () => undefined,
-        }),
-      { wrapper: makeWrapper() },
-    );
-
-    expect(result.current.conditionCount).toBe(0);
-  });
-});

package/src/utils/getRouteRuntimeVersion.ts

@@ -1,185 +0,0 @@
-/**
- * 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.
- */
-
-export type RouteRuntimeVersion = 'legacy' | 'modern';
-
-declare global {
-  interface Window {
-    __nocobase_modern_client_prefix__?: string;
-    __nocobase_public_path__?: string;
-  }
-}
-
-function hasModernClientPrefix() {
-  return (
-    typeof window !== 'undefined' &&
-    typeof window.__nocobase_modern_client_prefix__ === 'string' &&
-    window.__nocobase_modern_client_prefix__.trim().length > 0
-  );
-}
-
-function hasConfiguredPublicPath() {
-  return typeof window !== 'undefined' && typeof window.__nocobase_public_path__ === 'string';
-}
-
-/** Normalize any app/public-path-like input into a root-relative pathname:
- *
- * - `nocobase//v/` -> `/nocobase/v`
- * - `/` -> `/`
- */
-function normalizeRootRelativePath(value = '/') {
-  const normalized = `/${String(value || '/').trim() || '/'}`.replace(/\/{2,}/g, '/');
-  if (normalized !== '/' && normalized.endsWith('/')) {
-    return normalized.replace(/\/+$/g, '');
-  }
-  return normalized;
-}
-
-/** Public-path form always ends with `/`, so it can be compared as a base path:
- *
- * - `/nocobase/v` -> `/nocobase/v/`
- * - `/` -> `/`
- */
-function normalizePublicPath(value = '/') {
-  const normalized = normalizeRootRelativePath(value);
-  return normalized.endsWith('/') ? normalized : `${normalized}/`;
-}
-
-/** Check whether a concrete pathname is rendered under a runtime base path:
- *
- * - pathname `/nocobase/v/admin/workflow/workflows/1`
- *   basePath `/nocobase/v/`
- *   => true
- *
- * - pathname `/nocobase/admin/settings/workflow/workflows/1`
- *   basePath `/nocobase/v/`
- *   => false
- */
-function isPathnameInsideBasePath(pathname: string, basePath: string) {
-  const normalizedPathname = normalizeRootRelativePath(pathname);
-  const normalizedBasePath = normalizePublicPath(basePath);
-  const trimmedBasePath = normalizedBasePath.replace(/\/+$/g, '') || '/';
-
-  if (trimmedBasePath === '/') {
-    return true;
-  }
-
-  return normalizedPathname === trimmedBasePath || normalizedPathname.startsWith(`${trimmedBasePath}/`);
-}
-
-function getNormalizedModernClientPrefix() {
-  if (typeof window === 'undefined') {
-    return '';
-  }
-
-  const prefix = window.__nocobase_modern_client_prefix__?.trim();
-  return prefix ? prefix.replace(/^\/+|\/+$/g, '') : '';
-}
-
-/** Derive the actual modern-client base path from injected globals.
- *
- * Only returns a value when `__nocobase_public_path__` itself already points to
- * the modern client shell:
- *
- * - legacy shell:
- *   `__nocobase_public_path__ = "/nocobase/"`
- *   `__nocobase_modern_client_prefix__ = "v"`
- *   => `""`
- *
- * - modern shell:
- *   `__nocobase_public_path__ = "/nocobase/v/"`
- *   `__nocobase_modern_client_prefix__ = "v"`
- *   => `"/nocobase/v/"`
- */
-function getModernClientBasePath() {
-  const normalizedPrefix = getNormalizedModernClientPrefix();
-  if (!normalizedPrefix) {
-    return '';
-  }
-
-  if (typeof window === 'undefined') {
-    return '';
-  }
-
-  const publicPath = window.__nocobase_public_path__?.trim();
-  if (publicPath && normalizePublicPath(publicPath).endsWith(`/${normalizedPrefix}/`)) {
-    return normalizePublicPath(publicPath);
-  }
-
-  return '';
-}
-
-/** True only when the current page is actually running under the resolved
- * modern-client base path.
- *
- * Example:
- * - pathname `/v/admin/workflow/workflows/1`, modern base `/v/` => true
- * - pathname `/admin/settings/workflow/workflows/1`, modern base `/v/` => false
- */
-function isPathnameInModernClientRuntime() {
-  if (typeof window === 'undefined') {
-    return false;
-  }
-
-  const pathname = window.location?.pathname ?? '';
-  const modernClientBasePath = getModernClientBasePath();
-  if (!pathname || !modernClientBasePath) {
-    return false;
-  }
-
-  return isPathnameInsideBasePath(pathname, modernClientBasePath);
-}
-
-/** Fallback for incomplete/mocked environments where public path was not
- * injected but the modern prefix still exists.
- *
- * Example:
- * - pathname `/v/admin/workflow/workflows/1`
- *   `__nocobase_modern_client_prefix__ = "v"`
- *   `__nocobase_public_path__` missing
- *   => true
- */
-function isPathnameInModernClientRuntimeByPrefix() {
-  if (typeof window === 'undefined') {
-    return false;
-  }
-
-  const normalizedPrefix = getNormalizedModernClientPrefix();
-  const pathname = window.location?.pathname ?? '';
-  if (!normalizedPrefix || !pathname) {
-    return false;
-  }
-
-  return isPathnameInsideBasePath(pathname, normalizePublicPath(normalizedPrefix));
-}
-
-/** Resolve which client shell currently owns the route.
- *
- * - returns `modern` when the current page is actually mounted under the modern
- *   client base path (`/v/`, `/nocobase/v/`, ...)
- * - returns `legacy` when the route is still under the legacy shell, even if the
- *   modern prefix global has been injected into the page
- */
-export function getRouteRuntimeVersion(): RouteRuntimeVersion {
-  if (typeof window === 'undefined') {
-    return hasModernClientPrefix() ? 'modern' : 'legacy';
-  }
-
-  if (hasConfiguredPublicPath()) {
-    return isPathnameInModernClientRuntime() ? 'modern' : 'legacy';
-  }
-
-  // Defensive fallback for incomplete test/mocked environments where public
-  // path was not injected but the modern prefix still exists.
-  if (isPathnameInModernClientRuntimeByPrefix()) {
-    return 'modern';
-  }
-
-  return 'legacy';
-}