@gadmin2n/schematics 0.0.146 → 0.0.148

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

@@ -10,9 +10,8 @@ import {
   Typography,
   message,
 } from 'antd';
-import { EditOutlined, PlusOutlined, TeamOutlined } from '@ant-design/icons';
+import { EditOutlined, TeamOutlined } from '@ant-design/icons';
 import type { WidgetProps } from '../schema-form/widget-registry';
-import { UserGroupCreateModal } from './UserGroupCreateModal';
 import { UserGroupEditModal } from './UserGroupEditModal';
 import { useTranslation } from 'react-i18next';
 import {
@@ -27,11 +26,16 @@ export interface SubjectSelection {
   refs: string[];
 }
 
+interface SubjectPickerProps extends WidgetProps<SubjectSelection[]> {
+  allowedProviders?: readonly string[];
+}
+
 export function SubjectPicker({
   value = [],
   onChange,
   disabled,
-}: WidgetProps<SubjectSelection[]>) {
+  allowedProviders,
+}: SubjectPickerProps) {
   const { t } = useTranslation('workflow');
   const [providers, setProviders] = useState<SubjectProviderDescriptor[]>([]);
   const [activeProvider, setActiveProvider] = useState<string>(
@@ -44,7 +48,6 @@ export function SubjectPicker({
   );
   const [preview, setPreview] = useState<SubjectPreview>();
   const [loading, setLoading] = useState(false);
-  const [createOpen, setCreateOpen] = useState(false);
   const [editingGroupRef, setEditingGroupRef] = useState<string>();
   const [previewRefresh, setPreviewRefresh] = useState(0);
   const debounce = useRef<ReturnType<typeof setTimeout>>();
@@ -53,15 +56,20 @@ export function SubjectPicker({
     subjectProviderApi
       .descriptors()
       .then((items) => {
-        setProviders(items);
+        const visibleProviders = allowedProviders?.length
+          ? items.filter((item) => allowedProviders.includes(item.key))
+          : items;
+        setProviders(visibleProviders);
         setActiveProvider((current) =>
-          items.some((item) => item.key === current) ? current : items[0]?.key,
+          visibleProviders.some((item) => item.key === current)
+            ? current
+            : visibleProviders[0]?.key,
         );
       })
       .catch((error) =>
         message.error(error?.message ?? t('subject.loadFailed')),
       );
-  }, []);
+  }, [allowedProviders]);
 
   const selected = useMemo(
     () => value.find((item) => item.provider === activeProvider)?.refs ?? [],
@@ -132,17 +140,19 @@ export function SubjectPicker({
   return (
     <Card size="small" className="workflow-subject-picker">
       <Space direction="vertical" size={12} style={{ width: '100%' }}>
-        <Select
-          aria-label={t('subject.provider')}
-          value={activeProvider}
-          disabled={disabled}
-          options={providers.map((item) => ({
-            label: item.label,
-            value: item.key,
-          }))}
-          onChange={setActiveProvider}
-          style={{ width: '100%' }}
-        />
+        {providers.length > 1 ? (
+          <Select
+            aria-label={t('subject.provider')}
+            value={activeProvider}
+            disabled={disabled}
+            options={providers.map((item) => ({
+              label: item.label,
+              value: item.key,
+            }))}
+            onChange={setActiveProvider}
+            style={{ width: '100%' }}
+          />
+        ) : null}
         {descriptor ? (
           <Space.Compact style={{ width: '100%' }}>
             <Select
@@ -171,16 +181,6 @@ export function SubjectPicker({
                 name: descriptor.label.toLowerCase(),
               })}
             />
-            {descriptor.capabilities.inlineCreate && (
-              <Button
-                className="workflow-panel-action"
-                icon={<PlusOutlined />}
-                disabled={disabled}
-                onClick={() => setCreateOpen(true)}
-              >
-                {t('subject.create')}
-              </Button>
-            )}
           </Space.Compact>
         ) : (
           <Spin size="small" />
@@ -223,24 +223,6 @@ export function SubjectPicker({
           </div>
         ))}
       </Space>
-      {descriptor && (
-        <UserGroupCreateModal
-          open={createOpen}
-          provider={descriptor.key}
-          providerLabel={descriptor.label.replace(/s$/, '')}
-          createSchema={descriptor.createSchema}
-          createUiSchema={descriptor.createUiSchema}
-          onCancel={() => setCreateOpen(false)}
-          onCreated={(resource) => {
-            setCreateOpen(false);
-            setResources((current) => ({
-              ...current,
-              [descriptor.key]: [resource, ...(current[descriptor.key] ?? [])],
-            }));
-            changeRefs([...selected, resource.ref]);
-          }}
-        />
-      )}
       <UserGroupEditModal
         open={Boolean(editingGroupRef)}
         groupRef={editingGroupRef}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/human-approval-config.css

@@ -64,7 +64,9 @@
 
 .human-approval-config__field-heading,
 .human-approval-config__detail-head,
+.human-approval-config__fixed-heading,
 .human-approval-config__dynamic-heading,
+.human-approval-config__static-source-header,
 .human-approval-config__dynamic-source-header {
   display: flex;
   align-items: center;
@@ -72,6 +74,19 @@
   gap: 10px;
 }
 
+.human-approval-config__static-source {
+  margin-top: 12px;
+  padding: 12px;
+  border: 1px solid var(--ant-color-border-secondary);
+  border-radius: 8px;
+  background: var(--ant-color-fill-quaternary);
+}
+
+.human-approval-config__static-source .workflow-subject-picker {
+  margin-top: 8px;
+  background: var(--ant-color-bg-container);
+}
+
 .human-approval-config__dynamic-heading {
   align-items: flex-start;
   margin-top: 16px;
@@ -183,6 +198,7 @@
 
 @media (max-width: 620px) {
   .human-approval-config__field-heading,
+  .human-approval-config__fixed-heading,
   .human-approval-config__dynamic-heading {
     align-items: stretch;
     flex-direction: column;

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

@@ -55,12 +55,6 @@ export const subjectProviderApi = {
       '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`,

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

@@ -125,6 +125,12 @@ describe('TemporalTenantPage', () => {
 
     await user.click(screen.getByRole('button', { name: '显示 Admin Token' }));
     expect(screen.getByText('admin-token-1234567890')).toBeInTheDocument();
+    await user.click(
+      screen.getByRole('button', { name: '显示 Runtime Token' }),
+    );
+    expect(
+      screen.getByText('runtime-token-1234567890-runtime'),
+    ).toBeInTheDocument();
 
     await user.click(screen.getByRole('button', { name: '修改配置' }));
 
@@ -136,6 +142,7 @@ describe('TemporalTenantPage', () => {
     expect(screen.getByLabelText('Runtime API 地址')).toHaveValue(
       'http://gadmin-server:8000/api',
     );
+    expect(screen.queryByLabelText('Runtime Token')).not.toBeInTheDocument();
 
     const displayNameInput = screen.getByLabelText('显示名称');
     await user.clear(displayNameInput);
@@ -152,6 +159,14 @@ describe('TemporalTenantPage', () => {
         }),
       ),
     );
+    const updateCall = vi
+      .mocked(customRequest)
+      .mock.calls.find(
+        ([resource, method]) =>
+          resource === 'temporalTenantConfig/updateUnique/1' &&
+          method === 'PATCH',
+      );
+    expect(updateCall?.[2]).not.toHaveProperty('runtimeToken');
     expect(
       (await screen.findAllByText('GAdmin Workflow Updated')).length,
     ).toBeGreaterThan(0);
@@ -197,6 +212,15 @@ describe('TemporalTenantPage', () => {
         }),
       ),
     );
+    const testCall = vi
+      .mocked(customRequest)
+      .mock.calls.find(
+        ([resource, method]) =>
+          resource === 'temporalTenantConfig/testConnection' &&
+          method === 'POST',
+      );
+    expect(testCall?.[2]).not.toHaveProperty('runtimeToken');
+    expect(testCall?.[2]).not.toHaveProperty('id');
     expect(customRequest).not.toHaveBeenCalledWith(
       'temporalTenantConfig/updateUnique/1',
       'PATCH',

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

@@ -62,7 +62,7 @@ interface ConnectivityTestResponse {
   }>;
 }
 
-type TenantConfigFormValues = Omit<TenantConfig, 'id'>;
+type TenantConfigFormValues = Omit<TenantConfig, 'id' | 'runtimeToken'>;
 
 const configSelect = {
   id: true,
@@ -85,6 +85,17 @@ function maskDatabaseUrl(value: string) {
   return value.replace(/(\/\/[^:/?#]+:)[^@/?#]+(@)/, '$1••••••$2');
 }
 
+function toFormValues(config: TenantConfig): TenantConfigFormValues {
+  return {
+    adminUrl: config.adminUrl,
+    adminToken: config.adminToken,
+    namespace: config.namespace,
+    dbUrl: config.dbUrl,
+    displayName: config.displayName,
+    runtimeBaseUrl: config.runtimeBaseUrl,
+  };
+}
+
 function SensitiveValue({
   label,
   value,
@@ -177,7 +188,7 @@ export default function TemporalTenantPage() {
   const openEditor = () => {
     form.resetFields();
     if (existing) {
-      form.setFieldsValue(existing);
+      form.setFieldsValue(toFormValues(existing));
     }
     setEditorOpen(true);
   };
@@ -303,7 +314,7 @@ export default function TemporalTenantPage() {
                 aria-label="测试连通性"
                 icon={<ApiOutlined />}
                 loading={testing}
-                onClick={() => testConnection(existing)}
+                onClick={() => testConnection(toFormValues(existing))}
               >
                 测试连通性
               </Button>
@@ -588,20 +599,6 @@ export default function TemporalTenantPage() {
           >
             <Input placeholder="http://gadmin-server:8000/api" />
           </Form.Item>
-          <Form.Item
-            label="Runtime Token"
-            name="runtimeToken"
-            extra="在这里设置 Worker 调用本 GAdmin Runtime API 时使用的凭据。"
-            rules={[
-              { required: true, message: '请输入 Runtime Token' },
-              { min: 32, message: 'Runtime Token 至少需要 32 个字符' },
-            ]}
-          >
-            <Input.Password
-              placeholder="至少 32 个字符"
-              autoComplete="new-password"
-            />
-          </Form.Item>
         </Form>
       </Drawer>
     </div>

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

@@ -68,6 +68,7 @@ export interface Workflow {
     running: number;
     completed: number;
     failed: number;
+    cancelled: number;
   };
   lastRun?: string | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/schematics",
-  "version": "0.0.146",
+  "version": "0.0.148",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [

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

@@ -1,162 +0,0 @@
-import {
-  Button,
-  Drawer,
-  Form,
-  Input,
-  Space,
-  Switch,
-  Typography,
-  message,
-} from 'antd';
-import { customRequest } from 'helpers/http';
-import React, { useEffect, useState } from 'react';
-import { SchemaForm } from '../node-instances/schema-form/SchemaForm';
-import { schemaConfigDefaults } from '../node-instances/schema-form/schema-defaults';
-import type { WorkflowNodeInstance, WorkflowNodeType } from '../types';
-import { useTranslation } from 'react-i18next';
-import { useWorkflowFormValidation } from '../useWorkflowFormValidation';
-
-interface Props {
-  open: boolean;
-  nodeType?: WorkflowNodeType;
-  onCancel(): void;
-  onCreated(instance: WorkflowNodeInstance): void;
-}
-
-export function CreateNodeInstanceDrawer({
-  open,
-  nodeType,
-  onCancel,
-  onCreated,
-}: Props) {
-  const { t } = useTranslation('workflow');
-  const formValidation = useWorkflowFormValidation();
-  const [form] = Form.useForm();
-  const [submitting, setSubmitting] = useState(false);
-  const [schemaError, setSchemaError] = useState<Error | null>(null);
-
-  useEffect(() => {
-    if (!open || !nodeType) return;
-    form.resetFields();
-    form.setFieldsValue({
-      name: '',
-      description: '',
-      isEnabled: true,
-      config: schemaConfigDefaults(nodeType.configSchema),
-    });
-    setSchemaError(null);
-  }, [form, nodeType, open]);
-
-  async function handleCreate() {
-    if (!nodeType || schemaError) return;
-    try {
-      const values = await form.validateFields();
-      setSubmitting(true);
-      const instance = await customRequest<WorkflowNodeInstance>(
-        'workflowNodeInstance/createOne',
-        'POST',
-        {
-          nodeTypeId: Number(nodeType.id),
-          name: values.name.trim(),
-          description: values.description?.trim() || undefined,
-          isEnabled: values.isEnabled ?? true,
-          config: values.config ?? {},
-        },
-      );
-      message.success(t('nodeInstance.createdAndAdded'));
-      onCreated(instance);
-    } catch (error: any) {
-      if (error?.errorFields) return;
-      message.error(error?.message ?? t('nodeInstance.createFailed'));
-    } finally {
-      setSubmitting(false);
-    }
-  }
-
-  const usesCustomEditor = Boolean((nodeType?.uiSchema as any)?.widget);
-
-  return (
-    <Drawer
-      open={open}
-      title={t('nodeInstance.createNamed', {
-        name: nodeType?.label ?? 'Node',
-      })}
-      width={usesCustomEditor ? 880 : 640}
-      onClose={onCancel}
-      destroyOnHidden
-      maskClosable={!submitting}
-      footer={
-        <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-          <Space>
-            <Button disabled={submitting} onClick={onCancel}>
-              {t('common.back')}
-            </Button>
-            <Button
-              type="primary"
-              loading={submitting}
-              disabled={Boolean(schemaError)}
-              onClick={() => void handleCreate()}
-            >
-              {t('nodeInstance.createAndUse')}
-            </Button>
-          </Space>
-        </div>
-      }
-      styles={{ body: { paddingBottom: 32 } }}
-    >
-      <Typography.Paragraph type="secondary">
-        {t('nodeInstance.createAndUseDescription')}
-      </Typography.Paragraph>
-      <Form
-        form={form}
-        layout="vertical"
-        disabled={submitting}
-        {...formValidation}
-      >
-        <Form.Item
-          name="name"
-          label={t('nodeInstance.instanceName')}
-          rules={[
-            {
-              required: true,
-              whitespace: true,
-              message: t('nodeInstance.nameRequired'),
-            },
-          ]}
-        >
-          <Input
-            placeholder={t('nodeInstance.nameExample', {
-              name: nodeType?.label ?? 'Node',
-            })}
-          />
-        </Form.Item>
-
-        <Form.Item name="description" label={t('common.description')}>
-          <Input.TextArea
-            rows={2}
-            placeholder={t('common.optionalDescription')}
-          />
-        </Form.Item>
-
-        <Form.Item
-          name="isEnabled"
-          label={t('common.enabled')}
-          valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
-
-        <Typography.Title level={5}>
-          {t('common.configuration')}
-        </Typography.Title>
-        <SchemaForm
-          schema={nodeType?.configSchema ?? null}
-          uiSchema={nodeType?.uiSchema ?? null}
-          disabled={submitting}
-          validate={false}
-          onSchemaError={setSchemaError}
-        />
-      </Form>
-    </Drawer>
-  );
-}

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

@@ -1,72 +0,0 @@
-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';
-import { useWorkflowFormValidation } from '../../useWorkflowFormValidation';
-
-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 formValidation = useWorkflowFormValidation();
-  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} {...formValidation}>
-        <SchemaForm
-          schema={(createSchema ?? null) as JsonSchema | null}
-          uiSchema={(createUiSchema ?? null) as UiSchema | null}
-          disabled={saving}
-        />
-      </Form>
-    </Modal>
-  );
-}