@gadmin2n/schematics 0.0.144 → 0.0.146

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/ExternalRequestConfigEditor.tsx

@@ -4,7 +4,6 @@ import {
   Button,
   Card,
   Input,
-  InputNumber,
   Radio,
   Space,
   Tag,
@@ -21,10 +20,10 @@ type ExternalRequestConfig = {
   method?: string;
   secret?: string;
   verificationMode?: 'HMAC' | 'NONE';
-  responseMode?: 'IMMEDIATE' | 'WAIT_FOR_RESULT';
-  responseTimeoutSeconds?: number;
 };
 
+const WEBHOOK_PATH_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9_-]*[A-Za-z0-9])?$/;
+
 export function ExternalRequestConfigEditor({
   value,
   onChange,
@@ -33,14 +32,12 @@ export function ExternalRequestConfigEditor({
   const { t } = useTranslation('workflow');
   const config = value ?? {};
   const verificationMode = config.verificationMode === 'NONE' ? 'NONE' : 'HMAC';
-  const responseMode =
-    config.responseMode === 'WAIT_FOR_RESULT' ? 'WAIT_FOR_RESULT' : 'IMMEDIATE';
   const [endpoint, setEndpoint] = useState('');
   const [endpointLoadFailed, setEndpointLoadFailed] = useState(false);
 
   useEffect(() => {
     const path = config.path?.trim();
-    if (!path) {
+    if (!path || !WEBHOOK_PATH_PATTERN.test(path)) {
       setEndpoint('');
       setEndpointLoadFailed(false);
       return;
@@ -71,15 +68,29 @@ export function ExternalRequestConfigEditor({
 
   return (
     <Space direction="vertical" size={12} style={{ width: '100%' }}>
-      <Alert
-        type="info"
-        showIcon
-        message={t('externalRequest.description')}
-        description={t('externalRequest.workflowData')}
-      />
-
       <Card size="small" title={t('externalRequest.endpoint')}>
         <Space direction="vertical" size={10} style={{ width: '100%' }}>
+          <div>
+            <Typography.Text className="workflow-node-config__field-label">
+              {t('externalRequest.path')}
+            </Typography.Text>
+            <Input
+              aria-label={t('externalRequest.path')}
+              value={config.path ?? ''}
+              disabled={disabled}
+              placeholder={t('externalRequest.pathPlaceholder')}
+              onChange={(event) =>
+                onChange({
+                  ...config,
+                  method: 'POST',
+                  path: event.target.value,
+                })
+              }
+            />
+            <Typography.Text type="secondary">
+              {t('externalRequest.pathHint')}
+            </Typography.Text>
+          </div>
           <Tag color="blue">POST</Tag>
           <Input
             value={endpoint}
@@ -106,78 +117,6 @@ export function ExternalRequestConfigEditor({
         </Space>
       </Card>
 
-      <Card size="small" title={t('externalRequest.response')}>
-        <Radio.Group
-          value={responseMode}
-          disabled={disabled}
-          onChange={(event) => {
-            const nextMode = event.target.value as
-              | 'IMMEDIATE'
-              | 'WAIT_FOR_RESULT';
-            onChange({
-              ...config,
-              method: 'POST',
-              responseMode: nextMode,
-              ...(nextMode === 'WAIT_FOR_RESULT' && {
-                responseTimeoutSeconds:
-                  config.responseTimeoutSeconds &&
-                  config.responseTimeoutSeconds >= 1 &&
-                  config.responseTimeoutSeconds <= 300
-                    ? config.responseTimeoutSeconds
-                    : 60,
-              }),
-            });
-          }}
-        >
-          <Space direction="vertical" size={12}>
-            <Radio value="IMMEDIATE">
-              <Space direction="vertical" size={0}>
-                <Typography.Text>
-                  {t('externalRequest.respondImmediately')}
-                </Typography.Text>
-                <Typography.Text type="secondary">
-                  {t('externalRequest.respondImmediatelyHint')}
-                </Typography.Text>
-              </Space>
-            </Radio>
-            <Radio value="WAIT_FOR_RESULT">
-              <Space direction="vertical" size={0}>
-                <Typography.Text>
-                  {t('externalRequest.waitForResult')}
-                </Typography.Text>
-                <Typography.Text type="secondary">
-                  {t('externalRequest.waitForResultHint')}
-                </Typography.Text>
-              </Space>
-            </Radio>
-          </Space>
-        </Radio.Group>
-        {responseMode === 'WAIT_FOR_RESULT' && (
-          <div style={{ marginTop: 16 }}>
-            <Typography.Text>
-              {t('externalRequest.responseTimeout')}
-            </Typography.Text>
-            <InputNumber
-              min={1}
-              max={300}
-              precision={0}
-              value={config.responseTimeoutSeconds ?? 60}
-              disabled={disabled}
-              addonAfter={t('externalRequest.seconds')}
-              onChange={(next) =>
-                onChange({
-                  ...config,
-                  method: 'POST',
-                  responseMode: 'WAIT_FOR_RESULT',
-                  responseTimeoutSeconds: next ?? 60,
-                })
-              }
-              style={{ display: 'block', marginTop: 6, width: '100%' }}
-            />
-          </div>
-        )}
-      </Card>
-
       <Card size="small" title={t('externalRequest.verification')}>
         <Radio.Group
           value={verificationMode}
@@ -253,13 +192,7 @@ export function ExternalRequestConfigEditor({
             <Typography.Text code>X-Workflow-Signature</Typography.Text>
           </Typography.Paragraph>
         </Card>
-      ) : (
-        <Alert
-          type="warning"
-          showIcon
-          message={t('externalRequest.directWarning')}
-        />
-      )}
+      ) : null}
     </Space>
   );
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/ExternalWaitConfigEditor.tsx

@@ -1,4 +1,4 @@
-import { Alert, Card, InputNumber, Radio, Space, Typography } from 'antd';
+import { Card, InputNumber, Radio, Space, Typography } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { ParameterBindingEditor } from '../../components/ParameterBindingEditor';
 import type { ParameterBinding } from '../../types/parameter-binding';
@@ -6,7 +6,7 @@ import type { WidgetProps } from '../schema-form/widget-registry';
 
 type TimeoutConfig =
   | { mode: 'DEADLINE'; deadlineBinding: ParameterBinding }
-  | { mode: 'DURATION'; durationSeconds: number }
+  | { mode: 'DURATION'; durationSeconds: number | null }
   | { mode: 'NONE' };
 
 type ExternalWaitConfig = {
@@ -47,13 +47,6 @@ export function ExternalWaitConfigEditor({
 
   return (
     <Space direction="vertical" size={12} style={{ width: '100%' }}>
-      <Alert
-        type="info"
-        showIcon
-        message={t('externalWait.description')}
-        description={t('externalWait.hint')}
-      />
-
       <Card size="small" title={t('externalWait.callbackToken')}>
         <ParameterBindingEditor
           name={t('externalWait.callbackToken')}
@@ -99,7 +92,6 @@ export function ExternalWaitConfigEditor({
         {timeout.mode === 'DURATION' && (
           <div style={{ marginTop: 12 }}>
             <InputNumber
-              min={1}
               precision={0}
               value={timeout.durationSeconds}
               disabled={disabled}
@@ -108,7 +100,7 @@ export function ExternalWaitConfigEditor({
                 update({
                   timeout: {
                     mode: 'DURATION',
-                    durationSeconds: durationSeconds ?? 86400,
+                    durationSeconds,
                   },
                 })
               }

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/ForEachConfigEditor.test.tsx

@@ -0,0 +1,58 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { useState } from 'react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import i18n from '../../../../i18n';
+import { ForEachConfigEditor } from './ForEachConfigEditor';
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: () => ({
+    matches: false,
+    addListener: () => undefined,
+    removeListener: () => undefined,
+    addEventListener: () => undefined,
+    removeEventListener: () => undefined,
+    dispatchEvent: () => false,
+  }),
+});
+
+describe('ForEachConfigEditor', () => {
+  beforeEach(async () => {
+    await i18n.changeLanguage('zh_CN');
+  });
+
+  it('configures loop execution without a separate Workflow mode', () => {
+    const onChange = vi.fn();
+    function Harness() {
+      const [value, setValue] = useState<
+        NonNullable<Parameters<typeof ForEachConfigEditor>[0]['value']>
+      >({
+        itemsBinding: { source: 'INPUT', path: 'rows' },
+        execution: { mode: 'SEQUENTIAL' },
+        errorPolicy: 'STOP',
+      });
+      return (
+        <ForEachConfigEditor
+          value={value}
+          onChange={(next) => {
+            if (!next) return;
+            setValue(next);
+            onChange(next);
+          }}
+          schema={{ type: 'object' }}
+        />
+      );
+    }
+    render(<Harness />);
+
+    expect(screen.queryByText('调用 Workflow 处理')).not.toBeInTheDocument();
+    fireEvent.click(screen.getByRole('radio', { name: '并行处理' }));
+
+    expect(onChange).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        itemsBinding: { source: 'INPUT', path: 'rows' },
+        execution: { mode: 'PARALLEL', concurrency: 3 },
+      }),
+    );
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/ForEachConfigEditor.tsx

@@ -0,0 +1,107 @@
+import { Card, InputNumber, Radio, Space } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { ParameterBindingEditor } from '../../components/ParameterBindingEditor';
+import type { ParameterBinding } from '../../types/parameter-binding';
+import type { WidgetProps } from '../schema-form/widget-registry';
+
+type ForEachConfig = {
+  itemsBinding: ParameterBinding;
+  execution:
+    | { mode: 'SEQUENTIAL' }
+    | { mode: 'PARALLEL'; concurrency: number | null };
+  errorPolicy: 'STOP' | 'CONTINUE';
+};
+
+const DEFAULT_CONFIG: ForEachConfig = {
+  itemsBinding: { source: 'INPUT', path: 'items' },
+  execution: { mode: 'SEQUENTIAL' },
+  errorPolicy: 'STOP',
+};
+
+export function ForEachConfigEditor({
+  value,
+  onChange,
+  disabled,
+}: WidgetProps<ForEachConfig | undefined>) {
+  const { t } = useTranslation('workflow');
+  const config = { ...DEFAULT_CONFIG, ...value } as ForEachConfig;
+
+  function update(patch: Partial<ForEachConfig>) {
+    onChange({ ...config, ...patch });
+  }
+
+  return (
+    <Space direction="vertical" size={12} style={{ width: '100%' }}>
+      <Card size="small" title={t('forEach.items')}>
+        <ParameterBindingEditor
+          name={t('forEach.items')}
+          defaultPath="items"
+          value={config.itemsBinding}
+          disabled={disabled}
+          onChange={(binding) =>
+            update({
+              itemsBinding:
+                binding.source === 'FIXED'
+                  ? { ...binding, valueType: 'JSON' }
+                  : binding,
+            })
+          }
+        />
+      </Card>
+
+      <Card size="small" title={t('forEach.execution')}>
+        <Radio.Group
+          value={config.execution.mode}
+          disabled={disabled}
+          onChange={(event) =>
+            update({
+              execution:
+                event.target.value === 'PARALLEL'
+                  ? { mode: 'PARALLEL', concurrency: 3 }
+                  : { mode: 'SEQUENTIAL' },
+            })
+          }
+        >
+          <Space direction="vertical">
+            <Radio value="SEQUENTIAL">{t('forEach.sequential')}</Radio>
+            <Radio value="PARALLEL">{t('forEach.parallel')}</Radio>
+          </Space>
+        </Radio.Group>
+        {config.execution.mode === 'PARALLEL' && (
+          <InputNumber
+            precision={0}
+            value={config.execution.concurrency}
+            disabled={disabled}
+            addonBefore={t('forEach.concurrency')}
+            onChange={(concurrency) =>
+              update({
+                execution: {
+                  mode: 'PARALLEL',
+                  concurrency,
+                },
+              })
+            }
+            style={{ width: '100%', marginTop: 12 }}
+          />
+        )}
+      </Card>
+
+      <Card size="small" title={t('forEach.failure')}>
+        <Radio.Group
+          value={config.errorPolicy}
+          disabled={disabled}
+          onChange={(event) =>
+            update({
+              errorPolicy: event.target.value as ForEachConfig['errorPolicy'],
+            })
+          }
+        >
+          <Space direction="vertical">
+            <Radio value="STOP">{t('forEach.stop')}</Radio>
+            <Radio value="CONTINUE">{t('forEach.continue')}</Radio>
+          </Space>
+        </Radio.Group>
+      </Card>
+    </Space>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/HttpRequestConfigEditor.test.tsx

@@ -1,5 +1,11 @@
 import React from 'react';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import {
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+  within,
+} from '@testing-library/react';
 import { Form } from 'antd';
 import type { FormInstance } from 'antd';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
@@ -51,7 +57,7 @@ const httpSchema = {
   required: ['connectionRef', 'method', 'path'],
 };
 
-function renderEditor() {
+function renderEditor(options?: Record<string, unknown>) {
   let form!: FormInstance;
 
   function TestForm() {
@@ -60,7 +66,7 @@ function renderEditor() {
       <Form form={form}>
         <SchemaForm
           schema={httpSchema}
-          uiSchema={{ widget: 'http-request-config' }}
+          uiSchema={{ widget: 'http-request-config', options }}
         />
       </Form>
     );
@@ -88,6 +94,40 @@ describe('HttpRequestConfigEditor', () => {
     ).toBeInTheDocument();
   });
 
+  it('uses contextual request data guidance when embedded in another node', async () => {
+    await i18n.changeLanguage('zh_CN');
+
+    renderEditor({
+      requestDataDescriptionKey:
+        'httpRequest.approvalLookupRequestDataDescription',
+    });
+
+    expect(
+      screen.getByText(
+        '设置查询审批人接口需要的数据。字段可以读取当前审批节点收到的内容、Workflow 启动数据或使用固定值。',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('shows the stable approval scope for external approval requests', async () => {
+    await i18n.changeLanguage('zh_CN');
+
+    renderEditor({
+      requestDataDescriptionKey:
+        'httpRequest.approvalExternalRequestDataDescription',
+      variableContext: 'approvalExternal',
+      bindingSources: ['INPUT', 'WORKFLOW', 'APPROVAL', 'FIXED'],
+    });
+
+    expect(
+      screen.getByText('人工审批节点从上一个节点收到的结果。'),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(/当前审批任务，包括 requestId、callbackToken/),
+    ).toBeInTheDocument();
+    expect(screen.getByText('approval')).toBeInTheDocument();
+  });
+
   it('stores a query field as a direct input binding', async () => {
     const form = renderEditor();
 
@@ -102,35 +142,161 @@ describe('HttpRequestConfigEditor', () => {
         },
       }),
     );
-    expect(screen.getByText('input.departmentId')).toBeInTheDocument();
+    const pathInput = screen.getByLabelText('departmentId field path');
+    expect(pathInput).toHaveValue('departmentId');
+    expect(pathInput.closest('.ant-input-affix-wrapper')).toHaveTextContent(
+      'input.',
+    );
   });
 
-  it('offers friendly system-provided values for request fields', async () => {
+  it('keeps the value path unchanged when the API field name changes', async () => {
     const form = renderEditor();
 
-    fireEvent.click(screen.getByRole('button', { name: /Add body field/ }));
-    fireEvent.mouseDown(
-      await screen.findByRole('combobox', {
-        name: /ticketId value source/,
+    fireEvent.click(
+      screen.getByRole('button', { name: /Add query parameter/ }),
+    );
+    const [fieldNameInput] = await screen.findAllByDisplayValue('departmentId');
+    fireEvent.change(fieldNameInput, { target: { value: 'user_id' } });
+
+    await waitFor(() =>
+      expect(form.getFieldValue('config')).toMatchObject({
+        queryBindings: {
+          user_id: { source: 'INPUT', path: 'departmentId' },
+        },
       }),
     );
-    fireEvent.click(await screen.findByText('System-provided'));
+    expect(screen.getByLabelText('user_id field path')).toHaveValue(
+      'departmentId',
+    );
+  });
+
+  it('allows an unfinished query field name and fixed value to be cleared', async () => {
+    const form = renderEditor();
+
+    fireEvent.click(
+      screen.getByRole('button', { name: /Add query parameter/ }),
+    );
+    const [fieldNameInput] = await screen.findAllByDisplayValue('departmentId');
 
     fireEvent.mouseDown(
-      screen.getByRole('combobox', { name: /System value for ticketId/ }),
+      screen.getByRole('combobox', {
+        name: 'departmentId value source',
+      }),
+    );
+    fireEvent.click(await screen.findByText('Fixed value'));
+    const fixedValueInput = await screen.findByLabelText(
+      'departmentId fixed value',
     );
-    const callbackTokenOptions = await screen.findAllByText(
-      'External result callback token',
+    fireEvent.change(fixedValueInput, { target: { value: 'temporary' } });
+    fireEvent.change(fixedValueInput, { target: { value: '' } });
+    fireEvent.change(fieldNameInput, { target: { value: '' } });
+
+    await waitFor(() =>
+      expect(
+        Object.entries(
+          form.getFieldValue(['config', 'queryBindings']) as Record<
+            string,
+            unknown
+          >,
+        ),
+      ).toEqual([[' ', { source: 'FIXED', valueType: 'STRING', value: '' }]]),
     );
-    fireEvent.click(callbackTokenOptions[callbackTokenOptions.length - 1]);
+    expect(fieldNameInput).toHaveValue('');
+  });
 
+  it('allows multiple unfinished query field names to be cleared', async () => {
+    const form = renderEditor();
+    fireEvent.click(
+      screen.getByRole('button', { name: /Add query parameter/ }),
+    );
+    await waitFor(() =>
+      expect(
+        Object.keys(
+          form.getFieldValue(['config', 'queryBindings']) as Record<
+            string,
+            unknown
+          >,
+        ),
+      ).toEqual(['departmentId']),
+    );
+    fireEvent.click(
+      screen.getByRole('button', { name: /Add query parameter/ }),
+    );
+    await waitFor(() =>
+      expect(
+        Object.keys(
+          form.getFieldValue(['config', 'queryBindings']) as Record<
+            string,
+            unknown
+          >,
+        ),
+      ).toEqual(['departmentId', 'departmentId_2']),
+    );
+
+    const fieldNameInputs =
+      await screen.findAllByPlaceholderText('departmentId');
+    fireEvent.change(fieldNameInputs[0], { target: { value: '' } });
+    await waitFor(() =>
+      expect(
+        Object.keys(
+          form.getFieldValue(['config', 'queryBindings']) as Record<
+            string,
+            unknown
+          >,
+        ),
+      ).toEqual([' ', 'departmentId_2']),
+    );
+    fireEvent.change(
+      (await screen.findAllByPlaceholderText('departmentId'))[1],
+      { target: { value: '' } },
+    );
+
+    await waitFor(() => {
+      const queryBindings = form.getFieldValue([
+        'config',
+        'queryBindings',
+      ]) as Record<string, unknown>;
+      expect(Object.keys(queryBindings)).toHaveLength(2);
+      expect(Object.keys(queryBindings).every((key) => key.trim() === '')).toBe(
+        true,
+      );
+    });
+    for (const input of screen.getAllByPlaceholderText('departmentId')) {
+      expect(input).toHaveValue('');
+    }
+  });
+
+  it('does not overwrite another field when a name is duplicated', async () => {
+    const form = renderEditor();
+    const addButton = screen.getByRole('button', {
+      name: /Add query parameter/,
+    });
+    fireEvent.click(addButton);
     await waitFor(() =>
       expect(form.getFieldValue('config')).toMatchObject({
-        bodyBindings: {
-          ticketId: { source: 'SYSTEM', path: 'callback.token' },
+        queryBindings: {
+          departmentId: { source: 'INPUT', path: 'departmentId' },
         },
       }),
     );
+    fireEvent.click(
+      screen.getByRole('button', { name: /Add query parameter/ }),
+    );
+
+    const secondField = (
+      await screen.findAllByDisplayValue('departmentId_2')
+    ).find((element) => !element.hasAttribute('aria-label'))!;
+    fireEvent.change(secondField, { target: { value: 'departmentId' } });
+
+    await waitFor(() =>
+      expect(form.getFieldValue('config')).toMatchObject({
+        queryBindings: {
+          departmentId: { source: 'INPUT', path: 'departmentId' },
+          departmentId_2: { source: 'INPUT', path: 'departmentId_2' },
+        },
+      }),
+    );
+    expect(secondField).toHaveValue('departmentId_2');
   });
 
   it('marks required request fields and rejects a missing Connection', async () => {
@@ -147,18 +313,23 @@ describe('HttpRequestConfigEditor', () => {
     });
   });
 
-  it('stores the visible Method and Path defaults in the form', async () => {
+  it('does not write visible defaults into an uninitialized form', async () => {
     const form = renderEditor();
 
-    await waitFor(() =>
-      expect(form.getFieldValue('config')).toMatchObject({
-        method: 'GET',
-        path: '/',
-      }),
-    );
+    expect(screen.getByText('GET')).toBeInTheDocument();
+    expect(screen.getByDisplayValue('/')).toBeInTheDocument();
+    await waitFor(() => expect(form.getFieldValue('config')).toBeUndefined());
   });
 
-  it('uses a large JSON editor with live validation, formatting, and expansion', async () => {
+  it('shows only the request timeout in execution settings', async () => {
+    renderEditor();
+
+    expect(screen.getByRole('spinbutton')).toHaveValue('30');
+    expect(screen.queryByRole('switch')).not.toBeInTheDocument();
+    expect(screen.queryByText('Retry on failure')).not.toBeInTheDocument();
+  });
+
+  it('saves unfinished JSON without showing an edit-time error', async () => {
     const form = renderEditor();
 
     fireEvent.click(screen.getByRole('button', { name: 'Advanced JSON' }));
@@ -168,13 +339,17 @@ describe('HttpRequestConfigEditor', () => {
     expect(
       screen.getByRole('button', { name: /Format JSON/ }),
     ).toBeInTheDocument();
-    expect(
-      screen.getByRole('button', { name: /Expand editor/ }),
-    ).toBeInTheDocument();
-    expect(screen.getByText('{{system.callback.token}}')).toBeInTheDocument();
-
+    const formatButton = screen.getByRole('button', { name: /Format JSON/ });
+    const expandButton = screen.getByRole('button', {
+      name: /Expand editor/,
+    });
+    expect(formatButton).toHaveClass('workflow-panel-action');
+    expect(expandButton).toHaveClass('workflow-panel-action');
     fireEvent.change(editor, { target: { value: '{' } });
-    expect(await screen.findByText(/line 1, column 2/i)).toBeInTheDocument();
+    await waitFor(() =>
+      expect(form.getFieldValue(['config', 'body'])).toBe('{'),
+    );
+    expect(screen.queryByText(/line 1, column 2/i)).not.toBeInTheDocument();
 
     fireEvent.change(editor, {
       target: { value: '{"title":"{{workflow.title}}"}' },
@@ -184,6 +359,12 @@ describe('HttpRequestConfigEditor', () => {
         title: '{{workflow.title}}',
       }),
     );
-    expect(screen.queryByText(/line 1, column 2/i)).not.toBeInTheDocument();
+    fireEvent.click(expandButton);
+    const dialog = await screen.findByRole('dialog');
+    expect(dialog).toHaveClass('workflow-json-editor-modal');
+    expect(within(dialog).getByLabelText('JSON code editor')).toHaveAttribute(
+      'data-height',
+      'calc(100% - 28px)',
+    );
   });
 });