@gadmin2n/schematics 0.0.139 → 0.0.141

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

@@ -0,0 +1,98 @@
+import { Alert, Divider, Space, Switch, Typography } 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 SubmitExternalResultConfig = {
+  inputBindings?: Record<string, ParameterBinding>;
+};
+
+const REQUIRED_FIELDS = ['callbackToken', 'eventId', 'outcome'] as const;
+const OPTIONAL_FIELDS = ['operatorId', 'data'] as const;
+
+export function SubmitExternalResultConfigEditor({
+  value,
+  onChange,
+  disabled,
+}: WidgetProps<SubmitExternalResultConfig>) {
+  const { t } = useTranslation('workflow');
+  const config = value ?? {};
+  const bindings = config.inputBindings ?? {};
+
+  function update(key: string, binding?: ParameterBinding) {
+    const next = { ...bindings };
+    if (binding) next[key] = binding;
+    else delete next[key];
+    onChange({ ...config, inputBindings: next });
+  }
+
+  return (
+    <Space direction="vertical" size={16} style={{ width: '100%' }}>
+      <Alert
+        type="info"
+        showIcon
+        message={t('submitExternalResult.description')}
+        description={t('submitExternalResult.hint')}
+      />
+
+      {REQUIRED_FIELDS.map((field) => (
+        <div key={field}>
+          <Typography.Text strong style={{ display: 'block', marginBottom: 6 }}>
+            {t(`submitExternalResult.fields.${field}`)} *
+          </Typography.Text>
+          <ParameterBindingEditor
+            name={t(`submitExternalResult.fields.${field}`)}
+            defaultPath={field}
+            value={
+              bindings[field] ?? {
+                source: 'INPUT',
+                path: field,
+              }
+            }
+            disabled={disabled}
+            onChange={(binding) => update(field, binding)}
+          />
+        </div>
+      ))}
+
+      <Divider style={{ margin: '4px 0' }} />
+      <Typography.Text strong>
+        {t('submitExternalResult.optional')}
+      </Typography.Text>
+
+      {OPTIONAL_FIELDS.map((field) => {
+        const enabled = Boolean(bindings[field]);
+        return (
+          <div key={field}>
+            <Space style={{ marginBottom: enabled ? 8 : 0 }}>
+              <Switch
+                size="small"
+                checked={enabled}
+                disabled={disabled}
+                onChange={(checked) =>
+                  update(
+                    field,
+                    checked ? { source: 'INPUT', path: field } : undefined,
+                  )
+                }
+              />
+              <Typography.Text>
+                {t(`submitExternalResult.fields.${field}`)}
+              </Typography.Text>
+            </Space>
+            {enabled && (
+              <ParameterBindingEditor
+                name={t(`submitExternalResult.fields.${field}`)}
+                defaultPath={field}
+                value={bindings[field]}
+                disabled={disabled}
+                onChange={(binding) => update(field, binding)}
+              />
+            )}
+          </div>
+        );
+      })}
+    </Space>
+  );
+}

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

@@ -0,0 +1,70 @@
+import React, { useState } from 'react';
+import { Form, Modal, message } from 'antd';
+import { SchemaForm } from '../schema-form/SchemaForm';
+import type { JsonSchema, UiSchema } from '../schema-form/schema.types';
+import {
+  subjectProviderApi,
+  type SubjectResource,
+} from './subject-provider.api';
+
+interface Props {
+  open: boolean;
+  provider: string;
+  providerLabel: string;
+  createSchema?: Record<string, unknown>;
+  createUiSchema?: Record<string, unknown>;
+  onCancel(): void;
+  onCreated(resource: SubjectResource): void;
+}
+
+export function UserGroupCreateModal({
+  open,
+  provider,
+  providerLabel,
+  createSchema,
+  createUiSchema,
+  onCancel,
+  onCreated,
+}: Props) {
+  const [form] = Form.useForm();
+  const [saving, setSaving] = useState(false);
+
+  async function submit() {
+    try {
+      const values = await form.validateFields();
+      setSaving(true);
+      const resource = await subjectProviderApi.create(
+        provider,
+        values.config ?? {},
+      );
+      message.success(`${providerLabel} created and selected`);
+      form.resetFields();
+      onCreated(resource);
+    } catch (error: any) {
+      if (error?.errorFields) return;
+      message.error(error?.message ?? `Failed to create ${providerLabel}`);
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  return (
+    <Modal
+      open={open}
+      title={`Create ${providerLabel}`}
+      okText="Create and select"
+      confirmLoading={saving}
+      onOk={submit}
+      onCancel={onCancel}
+      destroyOnClose
+    >
+      <Form form={form} layout="vertical" preserve={false}>
+        <SchemaForm
+          schema={(createSchema ?? null) as JsonSchema | null}
+          uiSchema={(createUiSchema ?? null) as UiSchema | null}
+          disabled={saving}
+        />
+      </Form>
+    </Modal>
+  );
+}

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

@@ -0,0 +1,138 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Modal, Select, Spin, message } from 'antd';
+import {
+  subjectProviderApi,
+  type SubjectResource,
+  type UserGroupDetail,
+} from './subject-provider.api';
+
+interface Props {
+  open: boolean;
+  groupRef?: string;
+  onCancel(): void;
+  onSaved(resource: SubjectResource): void;
+}
+
+export function UserGroupEditModal({
+  open,
+  groupRef,
+  onCancel,
+  onSaved,
+}: Props) {
+  const [form] = Form.useForm();
+  const [detail, setDetail] = useState<UserGroupDetail>();
+  const [users, setUsers] = useState<SubjectResource[]>([]);
+  const [groups, setGroups] = useState<SubjectResource[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    if (!open || !groupRef) return;
+    setLoading(true);
+    Promise.all([
+      subjectProviderApi.userGroupDetail(groupRef),
+      subjectProviderApi.search('USER'),
+      subjectProviderApi.search('USER_GROUP'),
+    ])
+      .then(([nextDetail, userOptions, groupOptions]) => {
+        setDetail(nextDetail);
+        setUsers(userOptions);
+        setGroups(groupOptions.filter((item) => item.ref !== groupRef));
+        form.setFieldsValue({
+          name: nextDetail.name,
+          description: nextDetail.description ?? '',
+          userIds: nextDetail.directUserIds,
+          childGroupCodes: nextDetail.childGroupCodes,
+        });
+      })
+      .catch((error) => {
+        message.error(error?.message ?? 'Failed to load user group');
+        onCancel();
+      })
+      .finally(() => setLoading(false));
+  }, [form, groupRef, onCancel, open]);
+
+  async function save() {
+    if (!groupRef || !detail) return;
+    try {
+      const values = await form.validateFields();
+      setSaving(true);
+      const metadata = await subjectProviderApi.updateUserGroup(groupRef, {
+        expectedRevision: detail.revision,
+        name: values.name,
+        description: values.description?.trim() || null,
+      });
+      const members = await subjectProviderApi.replaceUserGroupMembers(
+        groupRef,
+        {
+          expectedRevision: metadata.revision,
+          userIds: values.userIds ?? [],
+          childGroupCodes: values.childGroupCodes ?? [],
+        },
+      );
+      message.success('User group updated');
+      onSaved({
+        ref: groupRef,
+        label: metadata.name,
+        description: metadata.description ?? undefined,
+        active: members.isActive,
+        revision: members.revision,
+      });
+    } catch (error: any) {
+      if (error?.errorFields) return;
+      message.error(error?.message ?? 'Failed to update user group');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  const option = (item: SubjectResource) => ({
+    label: item.label,
+    value: item.ref,
+  });
+
+  return (
+    <Modal
+      open={open}
+      title={groupRef ? `Edit user group · ${groupRef}` : 'Edit user group'}
+      okText="Save"
+      confirmLoading={saving}
+      onOk={save}
+      onCancel={onCancel}
+      destroyOnClose
+    >
+      <Spin spinning={loading}>
+        <Form form={form} layout="vertical" preserve={false}>
+          <Form.Item
+            name="name"
+            label="Name"
+            rules={[{ required: true, message: 'Name is required' }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item name="description" label="Description">
+            <Input.TextArea rows={2} />
+          </Form.Item>
+          <Form.Item name="userIds" label="Users">
+            <Select
+              mode="multiple"
+              showSearch
+              optionFilterProp="label"
+              options={users.map(option)}
+              placeholder="Select users"
+            />
+          </Form.Item>
+          <Form.Item name="childGroupCodes" label="Child groups">
+            <Select
+              mode="multiple"
+              showSearch
+              optionFilterProp="label"
+              options={groups.map(option)}
+              placeholder="Select child groups"
+            />
+          </Form.Item>
+        </Form>
+      </Spin>
+    </Modal>
+  );
+}

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

@@ -0,0 +1,25 @@
+import { addApproverSource } from './approver-source';
+
+describe('automatic approver source config', () => {
+  it('binds same-name parameters to Workflow data by default', () => {
+    expect(
+      addApproverSource([], {
+        id: '12',
+        name: '直属主管',
+        inputParameters: [
+          { key: 'employeeId', label: '申请人', required: true },
+        ],
+      }),
+    ).toEqual([
+      {
+        workflowId: '12',
+        inputBindings: {
+          employeeId: {
+            source: 'WORKFLOW',
+            path: 'employeeId',
+          },
+        },
+      },
+    ]);
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/approver-source.ts

@@ -0,0 +1,42 @@
+import {
+  workflowBinding,
+  type ParameterBinding,
+} from '../../types/parameter-binding';
+
+export type CallableInputParameter = {
+  key: string;
+  label?: string;
+  required?: boolean;
+};
+
+export type CallableWorkflowOption = {
+  id: string;
+  name: string;
+  description?: string | null;
+  inputParameters: CallableInputParameter[];
+};
+
+export type ApproverSourceConfig = {
+  workflowId: string;
+  inputBindings: Record<string, ParameterBinding>;
+};
+
+export function addApproverSource(
+  current: ApproverSourceConfig[],
+  workflow: CallableWorkflowOption,
+): ApproverSourceConfig[] {
+  if (current.some((source) => source.workflowId === workflow.id))
+    return current;
+  return [
+    ...current,
+    {
+      workflowId: workflow.id,
+      inputBindings: Object.fromEntries(
+        workflow.inputParameters.map((parameter) => [
+          parameter.key,
+          workflowBinding(parameter.key),
+        ]),
+      ),
+    },
+  ];
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/subject-provider.api.ts

@@ -0,0 +1,95 @@
+import { customRequest } from 'helpers/http';
+
+export interface SubjectProviderDescriptor {
+  key: string;
+  label: string;
+  capabilities: {
+    search: boolean;
+    preview: boolean;
+    inlineCreate: boolean;
+    edit: boolean;
+    emitsChanges: boolean;
+  };
+  createSchema?: Record<string, unknown>;
+  createUiSchema?: Record<string, unknown>;
+}
+
+export interface SubjectResource {
+  ref: string;
+  label: string;
+  description?: string;
+  active?: boolean;
+  revision?: number;
+  metadata?: Record<string, unknown>;
+}
+
+export interface SubjectPreview {
+  items: Array<
+    SubjectResource & { principals?: Array<{ principalRef: string }> }
+  >;
+  warnings?: string[];
+}
+
+export interface UserGroupDetail {
+  code: string;
+  name: string;
+  description?: string | null;
+  revision: number;
+  isActive: boolean;
+  directUserIds: string[];
+  childGroupCodes: string[];
+  resolvedUserCount: number;
+}
+
+export const subjectProviderApi = {
+  descriptors: () =>
+    customRequest<SubjectProviderDescriptor[]>('subject-providers', 'GET'),
+  search: (provider: string, query = '') =>
+    customRequest<SubjectResource[]>(
+      `subject-providers/${encodeURIComponent(provider)}/resources?q=${encodeURIComponent(query)}`,
+      'GET',
+    ),
+  preview: (provider: string, refs: string[]) =>
+    customRequest<SubjectPreview>(
+      `subject-providers/${encodeURIComponent(provider)}/preview`,
+      'POST',
+      { refs },
+    ),
+  create: (provider: string, input: Record<string, unknown>) =>
+    customRequest<SubjectResource>(
+      `subject-providers/${encodeURIComponent(provider)}/resources`,
+      'POST',
+      input,
+    ),
+  userGroupDetail: (code: string) =>
+    customRequest<UserGroupDetail>(
+      `user-groups/${encodeURIComponent(code)}/preview`,
+      'GET',
+    ),
+  updateUserGroup: (
+    code: string,
+    input: {
+      expectedRevision: number;
+      name: string;
+      description: string | null;
+    },
+  ) =>
+    customRequest<UserGroupDetail>(
+      `user-groups/${encodeURIComponent(code)}`,
+      'PATCH',
+      input,
+    ),
+  replaceUserGroupMembers: (
+    code: string,
+    input: {
+      expectedRevision: number;
+      userIds: string[];
+      childGroupCodes: string[];
+    },
+  ) =>
+    customRequest<UserGroupDetail>(
+      `user-groups/${encodeURIComponent(code)}/members`,
+      'PUT',
+      input,
+    ),
+};

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

@@ -34,6 +34,7 @@ import { customRequest } from 'helpers/http';
 import { FlowRenderer } from './components/FlowRenderer';
 import { DslView, type DslViewHandle } from './components/DslView';
 import { RunWorkflowModal } from './components/RunWorkflowModal';
+import { resolveWorkflowDisplay } from './utils/resolveWorkflowDisplay';
 import type {
   Workflow,
   WorkflowDSL,
@@ -117,11 +118,9 @@ export default function WorkflowShowPage() {
       .then(([wf, vers]) => {
         setWorkflow(wf);
         setVersions(vers);
-        const latestVersion = (wf as any).versions?.[0];
-        if (latestVersion?.dsl) {
-          setDsl(latestVersion.dsl);
-          setCurrentVersion(latestVersion.version);
-        }
+        const display = resolveWorkflowDisplay(wf);
+        setDsl(display.dsl);
+        setCurrentVersion(display.version);
       })
       .catch((e) => {
         message.error(e?.message ?? 'Failed to load workflow');
@@ -207,6 +206,9 @@ export default function WorkflowShowPage() {
       ]);
       setWorkflow(wf);
       setVersions(vers);
+      const display = resolveWorkflowDisplay(wf);
+      setDsl(display.dsl);
+      setCurrentVersion(display.version);
     } catch (e: any) {
       message.error(e?.message ?? 'Failed to publish workflow');
     } finally {
@@ -261,7 +263,7 @@ ${diffRightDsl}
         height: 'calc(100vh - 96px)',
         display: 'flex',
         flexDirection: 'column',
-        background: '#f0f2f5',
+        background: 'var(--ant-color-bg-layout)',
         overflow: 'hidden',
       }}
     >
@@ -290,10 +292,12 @@ ${diffRightDsl}
           <Space>
             {versions.length > 0 && (
               <Select
-                value={currentVersion}
+                value={currentVersion ?? undefined}
                 onChange={handleSelectVersion}
                 style={{ width: 200 }}
-                placeholder="选择版本"
+                placeholder={
+                  workflow?.status === 'DRAFT' ? 'Saved draft' : '选择版本'
+                }
                 options={versions.map((v) => ({
                   label: `v${v.version} - ${v.changeSummary?.slice(0, 20) || 'Saved'}`,
                   value: v.version,
@@ -387,8 +391,8 @@ ${diffRightDsl}
                 style={{
                   width: 320,
                   flexShrink: 0,
-                  borderLeft: '1px solid #f0f0f0',
-                  background: '#fff',
+                  borderLeft: '1px solid var(--ant-color-border-secondary)',
+                  background: 'var(--ant-color-bg-container)',
                   overflowY: 'auto',
                   padding: 16,
                 }}
@@ -412,7 +416,7 @@ ${diffRightDsl}
                   </Descriptions.Item>
                   {selectedNode.instanceRef && (
                     <Descriptions.Item label="节点实例">
-                      {selectedNode.instanceRef.instanceName}
+                      {selectedNode.instanceRef.instanceCode}
                     </Descriptions.Item>
                   )}
                 </Descriptions>

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();
+  });
+});