@gadmin2n/schematics 0.0.140 → 0.0.142

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

@@ -1,12 +1,23 @@
-import { Input, Radio, Space, Typography } from 'antd';
+import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
+import {
+  Button,
+  Card,
+  Input,
+  InputNumber,
+  Radio,
+  Space,
+  Typography,
+} from 'antd';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { WidgetProps } from '../schema-form/widget-registry';
 
 type ReturnResultConfig = {
-  resultType?: 'APPROVAL_SUBJECTS';
+  resultType?: 'JSON' | 'APPROVAL_SUBJECTS';
   sourceMode?: 'INPUT' | 'WORKFLOW';
   path?: string;
+  httpStatusCode?: number;
+  httpHeaders?: Record<string, string>;
 };
 
 export function ReturnResultConfigEditor({
@@ -15,77 +26,256 @@ export function ReturnResultConfigEditor({
   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?.sourceMode !== 'INPUT' && value?.sourceMode !== 'WORKFLOW') {
+    if (
+      (value?.resultType !== 'JSON' &&
+        value?.resultType !== 'APPROVAL_SUBJECTS') ||
+      (value?.sourceMode !== 'INPUT' && value?.sourceMode !== 'WORKFLOW')
+    ) {
       onChange({
-        resultType: 'APPROVAL_SUBJECTS',
+        resultType: 'JSON',
         sourceMode: 'INPUT',
+        httpStatusCode: 200,
+        httpHeaders: {},
       });
     }
-  }, [onChange, value?.sourceMode]);
+  }, [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={12} style={{ width: '100%' }}>
-      <Typography.Text strong>{t('returnResult.source')}</Typography.Text>
-      <Radio.Group
-        value={sourceMode}
-        disabled={disabled}
-        onChange={(event) => {
-          const nextMode = event.target.value as 'INPUT' | 'WORKFLOW';
-          onChange(
-            nextMode === 'INPUT'
-              ? {
-                  resultType: 'APPROVAL_SUBJECTS',
-                  sourceMode: 'INPUT',
-                }
-              : {
-                  resultType: 'APPROVAL_SUBJECTS',
-                  sourceMode: 'WORKFLOW',
-                  path: value?.path ?? '',
-                },
-          );
-        }}
-      >
-        <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">
-          {t('returnResult.previousNodeHint')}
-        </Typography.Text>
-      ) : (
-        <div>
-          <Typography.Text>{t('returnResult.workflowPath')}</Typography.Text>
+    <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;
+}) {
+  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.workflowPath')}
-            addonBefore="workflow."
-            value={value?.path ?? ''}
+            aria-label={t('returnResult.headerName')}
+            value={key}
             disabled={disabled}
-            placeholder="approvers"
+            placeholder="X-Result-Type"
             onChange={(event) =>
-              onChange({
-                resultType: 'APPROVAL_SUBJECTS',
-                sourceMode: 'WORKFLOW',
-                path: event.target.value,
-              })
+              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),
+                ),
+              )
             }
-            style={{ marginTop: 6 }}
           />
-          <Typography.Text
-            type="secondary"
-            style={{ display: 'block', marginTop: 6, fontSize: 12 }}
-          >
-            {t('returnResult.workflowHint')}
-          </Typography.Text>
         </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>
   );
 }
+
+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

@@ -0,0 +1,152 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { customRequest } from 'helpers/http';
+import { MemoryRouter } from 'react-router-dom';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import TemporalTenantPage from '.';
+
+vi.mock('helpers/http', () => ({ customRequest: vi.fn() }));
+
+vi.mock('@refinedev/core', () => ({
+  useGetIdentity: () => ({
+    data: {
+      configPerms: {
+        roles: ['SYSTEM_ADMIN'],
+      },
+    },
+  }),
+}));
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: () => ({
+    matches: false,
+    addListener: () => undefined,
+    removeListener: () => undefined,
+    addEventListener: () => undefined,
+    removeEventListener: () => undefined,
+    dispatchEvent: () => false,
+  }),
+});
+
+describe('TemporalTenantPage', () => {
+  beforeEach(() => {
+    const getComputedStyle = window.getComputedStyle.bind(window);
+    vi.spyOn(window, 'getComputedStyle').mockImplementation((element) =>
+      getComputedStyle(element),
+    );
+
+    let config = {
+      id: 1,
+      adminUrl: 'http://temporal-worker:8081',
+      adminToken: 'admin-token-1234567890',
+      namespace: 'gadmin-test',
+      dbUrl: 'postgresql://gadmin:db-password@postgres:5432/gadmin',
+      displayName: 'GAdmin Workflow',
+      runtimeBaseUrl: 'http://gadmin-server:8000/api',
+      runtimeToken: 'runtime-token-1234567890-runtime',
+      createdAt: '2026-07-01T00:00:00.000Z',
+      updatedAt: '2026-07-30T00:00:00.000Z',
+    };
+
+    vi.mocked(customRequest).mockImplementation(
+      async (resource: string, method: string, values?: any) => {
+        if (resource === 'temporalTenantConfig/findMany' && method === 'POST') {
+          return {
+            data: [config],
+            meta: {
+              itemCount: 1,
+              pageCount: 1,
+              hasPreviousPage: false,
+              hasNextPage: false,
+            },
+          } as never;
+        }
+
+        if (
+          resource === 'temporalTenantConfig/updateUnique/1' &&
+          method === 'PATCH'
+        ) {
+          config = { ...config, ...values };
+          return config as never;
+        }
+
+        return {} as never;
+      },
+    );
+  });
+
+  afterEach(() => vi.restoreAllMocks());
+
+  it('shows the registered configuration and saves changes from the edit drawer', async () => {
+    const user = userEvent.setup();
+
+    render(
+      <MemoryRouter>
+        <TemporalTenantPage />
+      </MemoryRouter>,
+    );
+
+    expect(
+      (await screen.findAllByText('GAdmin Workflow')).length,
+    ).toBeGreaterThan(0);
+    expect(screen.getAllByText('gadmin-test').length).toBeGreaterThan(0);
+    expect(screen.getByText('http://temporal-worker:8081')).toBeInTheDocument();
+    expect(
+      screen.queryByDisplayValue('GAdmin Workflow'),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('admin-token-1234567890'),
+    ).not.toBeInTheDocument();
+
+    await user.click(screen.getByRole('button', { name: '显示 Admin Token' }));
+    expect(screen.getByText('admin-token-1234567890')).toBeInTheDocument();
+
+    await user.click(screen.getByRole('button', { name: '修改配置' }));
+
+    const namespaceInput = screen.getByLabelText('Namespace');
+    expect(namespaceInput).toBeDisabled();
+    expect(screen.getByLabelText('Admin URL')).toHaveValue(
+      'http://temporal-worker:8081',
+    );
+    expect(screen.getByLabelText('Runtime API 地址')).toHaveValue(
+      'http://gadmin-server:8000/api',
+    );
+
+    const displayNameInput = screen.getByLabelText('显示名称');
+    await user.clear(displayNameInput);
+    await user.type(displayNameInput, 'GAdmin Workflow Updated');
+    await user.click(screen.getByRole('button', { name: '保存修改' }));
+
+    await waitFor(() =>
+      expect(customRequest).toHaveBeenCalledWith(
+        'temporalTenantConfig/updateUnique/1',
+        'PATCH',
+        expect.objectContaining({
+          namespace: 'gadmin-test',
+          displayName: 'GAdmin Workflow Updated',
+        }),
+      ),
+    );
+    expect(
+      (await screen.findAllByText('GAdmin Workflow Updated')).length,
+    ).toBeGreaterThan(0);
+  });
+
+  it('does not present registration as available when the current status cannot be loaded', async () => {
+    vi.mocked(customRequest).mockRejectedValueOnce(
+      new Error('request failed') as never,
+    );
+
+    render(
+      <MemoryRouter>
+        <TemporalTenantPage />
+      </MemoryRouter>,
+    );
+
+    expect(await screen.findByText('无法确认注册状态')).toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: '注册服务' }),
+    ).not.toBeInTheDocument();
+  });
+});