@gadmin2n/schematics 0.0.142 → 0.0.143

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

@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import i18n from '../../../../i18n';
 import { ReturnResultConfigEditor } from './ReturnResultConfigEditor';
@@ -10,72 +10,25 @@ describe('ReturnResultConfigEditor', () => {
     await i18n.changeLanguage('en');
   });
 
-  it('uses the connected previous node by default without asking for a path', () => {
+  it('explains its fixed behavior without exposing result configuration', () => {
     const onChange = vi.fn();
     render(
       <ReturnResultConfigEditor
-        value={undefined}
+        value={{}}
         onChange={onChange}
         schema={schema}
       />,
     );
 
     expect(
-      screen.getByText('Return the previous node result'),
+      screen.getByText('Returns the previous node result'),
     ).toBeInTheDocument();
-    expect(screen.queryByLabelText('Workflow data field')).toBeNull();
-    expect(onChange).toHaveBeenCalledWith({
-      resultType: 'JSON',
-      sourceMode: 'INPUT',
-      httpStatusCode: 200,
-      httpHeaders: {},
-    });
-  });
-
-  it('can return a field from the original Workflow data', () => {
-    const onChange = vi.fn();
-    render(
-      <ReturnResultConfigEditor
-        value={{
-          resultType: 'APPROVAL_SUBJECTS',
-          sourceMode: 'WORKFLOW',
-          path: 'approvers',
-        }}
-        onChange={onChange}
-        schema={schema}
-      />,
-    );
-
-    expect(screen.getByLabelText('Workflow data field')).toHaveValue(
-      'approvers',
-    );
-    fireEvent.click(
-      screen.getByRole('radio', { name: 'Return the previous node result' }),
-    );
-    expect(onChange).toHaveBeenLastCalledWith({
-      resultType: 'APPROVAL_SUBJECTS',
-      sourceMode: 'INPUT',
-    });
-  });
-
-  it('configures ordinary data with an HTTP status for external callers', () => {
-    const onChange = vi.fn();
-    render(
-      <ReturnResultConfigEditor
-        value={{
-          resultType: 'JSON',
-          sourceMode: 'INPUT',
-          httpStatusCode: 201,
-          httpHeaders: {},
-        }}
-        onChange={onChange}
-        schema={schema}
-      />,
-    );
-
-    expect(screen.getByRole('radio', { name: 'Ordinary data' })).toBeChecked();
     expect(
-      screen.getByRole('spinbutton', { name: 'HTTP status code' }),
-    ).toHaveValue('201');
+      screen.getByText(
+        'This node ends the Workflow and returns the connected previous node result to the caller. It has no settings.',
+      ),
+    ).toBeInTheDocument();
+    expect(screen.queryByRole('radio')).toBeNull();
+    expect(onChange).not.toHaveBeenCalled();
   });
 });

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

@@ -1,281 +1,16 @@
-import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
-import {
-  Button,
-  Card,
-  Input,
-  InputNumber,
-  Radio,
-  Space,
-  Typography,
-} from 'antd';
-import { useEffect } from 'react';
+import { Alert } from 'antd';
 import { useTranslation } from 'react-i18next';
 import type { WidgetProps } from '../schema-form/widget-registry';
 
-type ReturnResultConfig = {
-  resultType?: 'JSON' | 'APPROVAL_SUBJECTS';
-  sourceMode?: 'INPUT' | 'WORKFLOW';
-  path?: string;
-  httpStatusCode?: number;
-  httpHeaders?: Record<string, string>;
-};
-
-export function ReturnResultConfigEditor({
-  value,
-  onChange,
-  disabled,
-}: WidgetProps<ReturnResultConfig | undefined>) {
-  const { t } = useTranslation('workflow');
-  const resultType =
-    value?.resultType === 'APPROVAL_SUBJECTS' ? 'APPROVAL_SUBJECTS' : 'JSON';
-  const sourceMode =
-    value?.sourceMode === 'INPUT' || value?.sourceMode === 'WORKFLOW'
-      ? value.sourceMode
-      : 'INPUT';
-
-  useEffect(() => {
-    if (
-      (value?.resultType !== 'JSON' &&
-        value?.resultType !== 'APPROVAL_SUBJECTS') ||
-      (value?.sourceMode !== 'INPUT' && value?.sourceMode !== 'WORKFLOW')
-    ) {
-      onChange({
-        resultType: 'JSON',
-        sourceMode: 'INPUT',
-        httpStatusCode: 200,
-        httpHeaders: {},
-      });
-    }
-  }, [onChange, value?.resultType, value?.sourceMode]);
-
-  function nextConfig(
-    nextResultType: 'JSON' | 'APPROVAL_SUBJECTS',
-    nextSourceMode: 'INPUT' | 'WORKFLOW',
-    patch: Partial<ReturnResultConfig> = {},
-  ): ReturnResultConfig {
-    return {
-      resultType: nextResultType,
-      sourceMode: nextSourceMode,
-      ...(nextSourceMode === 'WORKFLOW' && {
-        path: patch.path ?? value?.path ?? '',
-      }),
-      ...(nextResultType === 'JSON' && {
-        httpStatusCode: patch.httpStatusCode ?? value?.httpStatusCode ?? 200,
-        httpHeaders: patch.httpHeaders ?? value?.httpHeaders ?? {},
-      }),
-    };
-  }
-
-  return (
-    <Space direction="vertical" size={16} style={{ width: '100%' }}>
-      <Card size="small" title={t('returnResult.type')}>
-        <Radio.Group
-          value={resultType}
-          disabled={disabled}
-          onChange={(event) =>
-            onChange(
-              nextConfig(
-                event.target.value as 'JSON' | 'APPROVAL_SUBJECTS',
-                sourceMode,
-              ),
-            )
-          }
-        >
-          <Space direction="vertical">
-            <Radio value="JSON">{t('returnResult.ordinaryData')}</Radio>
-            <Radio value="APPROVAL_SUBJECTS">
-              <Space direction="vertical" size={0}>
-                <Typography.Text>
-                  {t('returnResult.approvalSubjects')}
-                </Typography.Text>
-                <Typography.Text type="secondary">
-                  {t('returnResult.approvalSubjectsHint')}
-                </Typography.Text>
-              </Space>
-            </Radio>
-          </Space>
-        </Radio.Group>
-      </Card>
-
-      <Card size="small" title={t('returnResult.source')}>
-        <Radio.Group
-          value={sourceMode}
-          disabled={disabled}
-          onChange={(event) =>
-            onChange(
-              nextConfig(
-                resultType,
-                event.target.value as 'INPUT' | 'WORKFLOW',
-              ),
-            )
-          }
-        >
-          <Space direction="vertical">
-            <Radio value="INPUT">{t('returnResult.previousNode')}</Radio>
-            <Radio value="WORKFLOW">{t('returnResult.workflowData')}</Radio>
-          </Space>
-        </Radio.Group>
-        {sourceMode === 'INPUT' ? (
-          <Typography.Text
-            type="secondary"
-            style={{ display: 'block', marginTop: 10 }}
-          >
-            {t('returnResult.previousNodeHint')}
-          </Typography.Text>
-        ) : (
-          <div style={{ marginTop: 12 }}>
-            <Typography.Text>{t('returnResult.workflowPath')}</Typography.Text>
-            <Input
-              aria-label={t('returnResult.workflowPath')}
-              addonBefore="workflow."
-              value={value?.path ?? ''}
-              disabled={disabled}
-              placeholder={resultType === 'JSON' ? 'body' : 'approvers'}
-              onChange={(event) =>
-                onChange(
-                  nextConfig(resultType, 'WORKFLOW', {
-                    path: event.target.value,
-                  }),
-                )
-              }
-              style={{ marginTop: 6 }}
-            />
-            <Typography.Text
-              type="secondary"
-              style={{ display: 'block', marginTop: 6, fontSize: 12 }}
-            >
-              {t('returnResult.workflowHint')}
-            </Typography.Text>
-          </div>
-        )}
-      </Card>
-
-      {resultType === 'JSON' && (
-        <Card size="small" title={t('returnResult.httpResponse')}>
-          <Typography.Text>{t('returnResult.httpStatusCode')}</Typography.Text>
-          <InputNumber
-            aria-label={t('returnResult.httpStatusCode')}
-            min={100}
-            max={599}
-            precision={0}
-            value={value?.httpStatusCode ?? 200}
-            disabled={disabled}
-            onChange={(next) =>
-              onChange(
-                nextConfig('JSON', sourceMode, {
-                  httpStatusCode: next ?? 200,
-                }),
-              )
-            }
-            style={{ display: 'block', marginTop: 6, width: '100%' }}
-          />
-          <ResponseHeadersEditor
-            value={value?.httpHeaders ?? {}}
-            disabled={disabled}
-            onChange={(httpHeaders) =>
-              onChange(nextConfig('JSON', sourceMode, { httpHeaders }))
-            }
-          />
-        </Card>
-      )}
-    </Space>
-  );
-}
-
-function ResponseHeadersEditor({
-  value,
-  disabled,
-  onChange,
-}: {
-  value: Record<string, string>;
-  disabled?: boolean;
-  onChange(value: Record<string, string>): void;
-}) {
+export function ReturnResultConfigEditor(_props: WidgetProps<unknown>) {
   const { t } = useTranslation('workflow');
-  const entries = Object.entries(value);
-
-  function replace(index: number, key: string, headerValue: string) {
-    onChange(
-      Object.fromEntries(
-        entries.map((entry, current) =>
-          current === index ? [key, headerValue] : entry,
-        ),
-      ),
-    );
-  }
 
   return (
-    <Space
-      direction="vertical"
-      size={8}
-      style={{ width: '100%', marginTop: 16 }}
-    >
-      <Typography.Text>{t('returnResult.httpHeaders')}</Typography.Text>
-      {entries.map(([key, headerValue], index) => (
-        <div
-          key={`${key}-${index}`}
-          style={{
-            display: 'grid',
-            gridTemplateColumns: 'minmax(120px, 0.8fr) minmax(160px, 1fr) 32px',
-            gap: 8,
-          }}
-        >
-          <Input
-            aria-label={t('returnResult.headerName')}
-            value={key}
-            disabled={disabled}
-            placeholder="X-Result-Type"
-            onChange={(event) =>
-              replace(index, event.target.value, headerValue)
-            }
-          />
-          <Input
-            aria-label={t('returnResult.headerValue')}
-            value={headerValue}
-            disabled={disabled}
-            placeholder="created"
-            onChange={(event) => replace(index, key, event.target.value)}
-          />
-          <Button
-            type="text"
-            danger
-            icon={<DeleteOutlined />}
-            aria-label={t('returnResult.deleteHeader', { name: key })}
-            disabled={disabled}
-            onClick={() =>
-              onChange(
-                Object.fromEntries(
-                  entries.filter((_, current) => current !== index),
-                ),
-              )
-            }
-          />
-        </div>
-      ))}
-      <Button
-        type="dashed"
-        block
-        icon={<PlusOutlined />}
-        disabled={disabled}
-        onClick={() =>
-          onChange({
-            ...value,
-            [nextHeaderName(value)]: '',
-          })
-        }
-      >
-        {t('returnResult.addHeader')}
-      </Button>
-      <Typography.Text type="secondary">
-        {t('returnResult.httpHint')}
-      </Typography.Text>
-    </Space>
+    <Alert
+      type="info"
+      showIcon
+      message={t('returnResult.fixedTitle')}
+      description={t('returnResult.fixedHint')}
+    />
   );
 }
-
-function nextHeaderName(value: Record<string, string>): string {
-  if (!('X-Result-Type' in value)) return 'X-Result-Type';
-  let index = 2;
-  while (`X-Result-Type-${index}` in value) index += 1;
-  return `X-Result-Type-${index}`;
-}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/temporal-tenant/index.test.tsx

@@ -71,6 +71,30 @@ describe('TemporalTenantPage', () => {
           return config as never;
         }
 
+        if (
+          resource === 'temporalTenantConfig/testConnection' &&
+          method === 'POST'
+        ) {
+          return {
+            ok: true,
+            checks: [
+              {
+                key: 'temporal',
+                label: 'Temporal 服务',
+                ok: true,
+                latencyMs: 2,
+              },
+              { key: 'database', label: 'PostgreSQL', ok: true, latencyMs: 3 },
+              {
+                key: 'runtime',
+                label: 'GAdmin Runtime API',
+                ok: true,
+                latencyMs: 4,
+              },
+            ],
+          } as never;
+        }
+
         return {} as never;
       },
     );
@@ -149,4 +173,34 @@ describe('TemporalTenantPage', () => {
       screen.queryByRole('button', { name: '注册服务' }),
     ).not.toBeInTheDocument();
   });
+
+  it('tests the saved connection without changing the configuration', async () => {
+    const user = userEvent.setup();
+
+    render(
+      <MemoryRouter>
+        <TemporalTenantPage />
+      </MemoryRouter>,
+    );
+
+    await screen.findByText('已注册到 Temporal');
+    await user.click(screen.getByRole('button', { name: '测试连通性' }));
+
+    await waitFor(() =>
+      expect(customRequest).toHaveBeenCalledWith(
+        'temporalTenantConfig/testConnection',
+        'POST',
+        expect.objectContaining({
+          adminUrl: 'http://temporal-worker:8081',
+          dbUrl: 'postgresql://gadmin:db-password@postgres:5432/gadmin',
+          runtimeBaseUrl: 'http://gadmin-server:8000/api',
+        }),
+      ),
+    );
+    expect(customRequest).not.toHaveBeenCalledWith(
+      'temporalTenantConfig/updateUnique/1',
+      'PATCH',
+      expect.anything(),
+    );
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/temporal-tenant/index.tsx

@@ -1,4 +1,5 @@
 import {
+  ApiOutlined,
   ArrowLeftOutlined,
   CheckCircleFilled,
   EditOutlined,
@@ -26,8 +27,8 @@ import {
   message,
   theme,
 } from 'antd';
-import { customRequest } from 'helpers/http';
 import { HEADER_CARD_PROPS, PAGE_WRAPPER_STYLE } from 'constants/layout';
+import { customRequest } from 'helpers/http';
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -48,6 +49,17 @@ interface TenantConfigListResponse {
   data: TenantConfig[];
 }
 
+interface ConnectivityTestResponse {
+  ok: boolean;
+  checks: Array<{
+    key: string;
+    label: string;
+    ok: boolean;
+    latencyMs: number;
+    message?: string;
+  }>;
+}
+
 type TenantConfigFormValues = Omit<TenantConfig, 'id'>;
 
 const configSelect = {
@@ -95,7 +107,7 @@ function SensitiveValue({
           whiteSpace: 'normal',
         }}
       >
-        {visible ? value : (maskedValue ?? maskSecret(value))}
+        {visible ? value : maskedValue ?? maskSecret(value)}
       </Text>
       <Button
         type="text"
@@ -117,6 +129,7 @@ export default function TemporalTenantPage() {
 
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
+  const [testing, setTesting] = useState(false);
   const [editorOpen, setEditorOpen] = useState(false);
   const [existing, setExisting] = useState<TenantConfig | null>(null);
   const [loadError, setLoadError] = useState(false);
@@ -203,6 +216,48 @@ export default function TemporalTenantPage() {
     }
   };
 
+  const testConnection = async (values: TenantConfigFormValues) => {
+    setTesting(true);
+    try {
+      const result = await customRequest<ConnectivityTestResponse>(
+        'temporalTenantConfig/testConnection',
+        'POST',
+        values,
+      );
+      const failed = result.checks.filter((check) => !check.ok);
+      if (result.ok && failed.length === 0) {
+        message.success(
+          `连通性测试通过：${result.checks
+            .map((check) => `${check.label} ${check.latencyMs}ms`)
+            .join('，')}`,
+        );
+      } else {
+        message.error({
+          content: `连通性测试未通过：${failed
+            .map(
+              (check) =>
+                `${check.label}${check.message ? `（${check.message}）` : ''}`,
+            )
+            .join('；')}`,
+          duration: 8,
+        });
+      }
+    } catch (error: any) {
+      const detail = error?.response?.data?.message;
+      message.error(typeof detail === 'string' ? detail : '连通性测试请求失败');
+    } finally {
+      setTesting(false);
+    }
+  };
+
+  const testEditorConnection = async () => {
+    try {
+      await testConnection(await form.validateFields());
+    } catch {
+      // Field-level validation messages are rendered by Ant Design.
+    }
+  };
+
   if (!isAdmin) {
     return (
       <div style={{ padding: 24 }}>
@@ -240,14 +295,24 @@ export default function TemporalTenantPage() {
           </div>
 
           {!loading && !loadError && existing && (
-            <Button
-              type="primary"
-              aria-label="修改配置"
-              icon={<EditOutlined />}
-              onClick={openEditor}
-            >
-              修改配置
-            </Button>
+            <Space>
+              <Button
+                aria-label="测试连通性"
+                icon={<ApiOutlined />}
+                loading={testing}
+                onClick={() => testConnection(existing)}
+              >
+                测试连通性
+              </Button>
+              <Button
+                type="primary"
+                aria-label="修改配置"
+                icon={<EditOutlined />}
+                onClick={openEditor}
+              >
+                修改配置
+              </Button>
+            </Space>
           )}
         </div>
       </Card>
@@ -396,17 +461,42 @@ export default function TemporalTenantPage() {
         width={600}
         open={editorOpen}
         destroyOnClose
-        maskClosable={!saving}
-        closable={!saving}
+        maskClosable={!saving && !testing}
+        closable={!saving && !testing}
         onClose={() => setEditorOpen(false)}
         footer={
-          <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 8 }}>
-            <Button disabled={saving} onClick={() => setEditorOpen(false)}>
-              取消
-            </Button>
-            <Button type="primary" loading={saving} onClick={submitEditor}>
-              {existing ? '保存修改' : '注册服务'}
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'space-between',
+              gap: 8,
+            }}
+          >
+            <Button
+              aria-label="测试连通性"
+              icon={<ApiOutlined />}
+              loading={testing}
+              disabled={saving}
+              onClick={testEditorConnection}
+            >
+              测试连通性
             </Button>
+            <Space>
+              <Button
+                disabled={saving || testing}
+                onClick={() => setEditorOpen(false)}
+              >
+                取消
+              </Button>
+              <Button
+                type="primary"
+                loading={saving}
+                disabled={testing}
+                onClick={submitEditor}
+              >
+                {existing ? '保存修改' : '注册服务'}
+              </Button>
+            </Space>
           </div>
         }
       >
@@ -504,14 +594,14 @@ export default function TemporalTenantPage() {
           <Form.Item
             label="Runtime Token"
             name="runtimeToken"
-            extra="必须与本 GAdmin 的 WORKFLOW_RUNTIME_TOKEN 完全一致。"
+            extra="在这里设置 Worker 调用本 GAdmin Runtime API 时使用的凭据。"
             rules={[
               { required: true, message: '请输入 Runtime Token' },
               { min: 32, message: 'Runtime Token 至少需要 32 个字符' },
             ]}
           >
             <Input.Password
-              placeholder="WORKFLOW_RUNTIME_TOKEN"
+              placeholder="至少 32 个字符"
               autoComplete="new-password"
             />
           </Form.Item>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/utils/newNodeConfig.ts

@@ -3,13 +3,7 @@ export function withNewNodeDefaults(
   config: Record<string, any>,
 ): Record<string, any> {
   if (nodeType === 'return_result') {
-    return {
-      ...config,
-      resultType: 'JSON',
-      sourceMode: 'INPUT',
-      httpStatusCode: 200,
-      httpHeaders: {},
-    };
+    return {};
   }
   if (nodeType === 'http_request') {
     return {
@@ -31,37 +25,13 @@ export function withNewNodeDefaults(
       responseTimeoutSeconds: 60,
     };
   }
-  if (nodeType === 'submit_approval_result') {
-    return {
-      ...config,
-      inputBindings: Object.fromEntries(
-        ['requestId', 'channelRef', 'eventId', 'approverId', 'decision'].map(
-          (key) => [key, { source: 'INPUT', path: key }],
-        ),
-      ),
-    };
-  }
-  if (nodeType === 'submit_external_result') {
-    return {
-      ...config,
-      inputBindings: Object.fromEntries(
-        ['callbackToken', 'eventId', 'outcome'].map((key) => [
-          key,
-          { source: 'INPUT', path: key },
-        ]),
-      ),
-    };
-  }
   if (nodeType === 'external_wait') {
     return {
       ...config,
-      outcomes: [
-        { code: 'COMPLETED', label: '已完成' },
-        { code: 'REJECTED', label: '已拒绝' },
-      ],
+      callbackTokenBinding: { source: 'WORKFLOW', path: 'callbackToken' },
       timeout: {
-        durationSeconds: 86400,
-        outcome: 'TIMEOUT',
+        mode: 'DEADLINE',
+        deadlineBinding: { source: 'WORKFLOW', path: 'expiresAt' },
       },
     };
   }