@gadmin2n/schematics 0.0.152 → 0.0.154

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

@@ -13,6 +13,7 @@ const PAGE_SIZE = 20;
 const STATUS_TAG: Record<string, { color: string; label: string }> = {
   PENDING: { color: 'gold', label: 'Pending' },
   RUNNING: { color: 'blue', label: 'Running' },
+  WAITING_RETRY: { color: 'orange', label: 'Waiting to retry' },
   COMPLETED: { color: 'green', label: 'Completed' },
   FAILED: { color: 'red', label: 'Failed' },
   CANCELLED: { color: 'default', label: 'Cancelled' },
@@ -233,6 +234,10 @@ export default function WorkflowInstancesPage() {
             options={[
               { value: 'PENDING', label: t('instances.statuses.pending') },
               { value: 'RUNNING', label: t('instances.statuses.running') },
+              {
+                value: 'WAITING_RETRY',
+                label: t('instances.statuses.waiting_retry'),
+              },
               { value: 'COMPLETED', label: t('instances.statuses.completed') },
               { value: 'FAILED', label: t('instances.statuses.failed') },
               { value: 'CANCELLED', label: t('instances.statuses.cancelled') },

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

@@ -181,7 +181,6 @@ export function NodeInstanceForm({
               ]}
             >
               <Select
-                size="large"
                 placeholder={t('nodeInstance.selectNodeType')}
                 disabled={disableNodeType}
                 showSearch

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

@@ -1,10 +1,22 @@
-import { Alert, Button, InputNumber, Select, Space, Typography } from 'antd';
+import {
+  Alert,
+  Button,
+  InputNumber,
+  Segmented,
+  Select,
+  Space,
+  Switch,
+  Tag,
+  Typography,
+} from 'antd';
 import { customRequest } from 'helpers/http';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ParameterBindingEditor } from '../../components/ParameterBindingEditor';
+import { WorkflowCodeEditor } from '../../components/WorkflowCodeEditor';
 import type { ParameterBinding } from '../../types/parameter-binding';
 import type { WidgetProps } from '../schema-form/widget-registry';
+import { ParameterBindingListEditor } from './ParameterBindingListEditor';
 
 export interface DatabaseFunctionArgument {
   position: number;
@@ -26,11 +38,24 @@ type DatabaseFunctionRef = Pick<
 >;
 
 type DbExecuteConfig = {
+  mode?: 'FUNCTION' | 'SQL';
   functionRef?: DatabaseFunctionRef;
   argumentBindings?: ParameterBinding[];
+  allowWrite?: boolean;
+  sql?: string;
+  parameters?: ParameterBinding[];
   timeoutSeconds?: number | null;
 };
 
+function executionMode(config: DbExecuteConfig): 'FUNCTION' | 'SQL' {
+  if (config.mode === 'FUNCTION' || config.mode === 'SQL') return config.mode;
+  return config.sql !== undefined ||
+    config.allowWrite !== undefined ||
+    config.parameters !== undefined
+    ? 'SQL'
+    : 'FUNCTION';
+}
+
 function functionKey(value: DatabaseFunctionRef): string {
   return `${value.schema}.${value.name}(${value.identityArguments})`;
 }
@@ -50,10 +75,12 @@ export function DbExecuteConfigEditor({
 }: WidgetProps<DbExecuteConfig | undefined>) {
   const { t } = useTranslation('workflow');
   const config = value ?? {};
+  const mode = executionMode(config);
+  const allowWrite = config.allowWrite === true;
   const [functions, setFunctions] = useState<DatabaseFunctionOption[]>([]);
   const [catalogStatus, setCatalogStatus] = useState<
-    'loading' | 'ready' | 'error'
-  >('loading');
+    'idle' | 'loading' | 'ready' | 'error'
+  >('idle');
 
   const loadFunctions = useCallback(async () => {
     setCatalogStatus('loading');
@@ -70,8 +97,8 @@ export function DbExecuteConfigEditor({
   }, []);
 
   useEffect(() => {
-    void loadFunctions();
-  }, [loadFunctions]);
+    if (mode === 'FUNCTION') void loadFunctions();
+  }, [loadFunctions, mode]);
 
   const selected = useMemo(
     () =>
@@ -89,109 +116,212 @@ export function DbExecuteConfigEditor({
   return (
     <Space direction="vertical" size={14} style={{ width: '100%' }}>
       <Space direction="vertical" size={6} style={{ width: '100%' }}>
-        <Typography.Text>{t('nodeEditors.database.function')}</Typography.Text>
-        <Typography.Text type="secondary">
-          {t('nodeEditors.database.functionHint')}
-        </Typography.Text>
-        {catalogStatus === 'error' && (
-          <Typography.Text type="danger">
-            {t('nodeEditors.database.loadFailed')}{' '}
-            <Button type="link" size="small" onClick={loadFunctions}>
-              {t('common.retry')}
-            </Button>
-          </Typography.Text>
-        )}
-        <Select
-          aria-label={t('nodeEditors.database.function')}
-          value={selectedKey}
-          disabled={disabled || catalogStatus !== 'ready'}
-          loading={catalogStatus === 'loading'}
-          placeholder={t('nodeEditors.database.selectFunction')}
-          showSearch
-          optionFilterProp="label"
-          options={functions.map((item) => ({
-            value: functionKey(item),
-            label: functionKey(item),
-          }))}
-          onChange={(key) => {
-            const databaseFunction = functions.find(
-              (item) => functionKey(item) === key,
-            );
-            if (!databaseFunction) return;
-            const keepExistingBindings = selectedKey === key;
+        <Typography.Text>{t('nodeEditors.database.mode')}</Typography.Text>
+        <Segmented
+          block
+          aria-label={t('nodeEditors.database.mode')}
+          value={mode}
+          disabled={disabled}
+          options={[
+            {
+              label: t('nodeEditors.database.functionMode'),
+              value: 'FUNCTION',
+            },
+            { label: t('nodeEditors.database.sqlMode'), value: 'SQL' },
+          ]}
+          onChange={(nextMode) =>
             onChange({
-              functionRef: {
-                schema: databaseFunction.schema,
-                name: databaseFunction.name,
-                identityArguments: databaseFunction.identityArguments,
-              },
-              argumentBindings: databaseFunction.arguments.map(
-                (argument, index) =>
-                  (keepExistingBindings
-                    ? config.argumentBindings?.[index]
-                    : undefined) ?? defaultBinding(argument),
-              ),
+              ...config,
+              mode: nextMode as 'FUNCTION' | 'SQL',
               timeoutSeconds: config.timeoutSeconds ?? 30,
-            });
-          }}
-          style={{ width: '100%' }}
+            })
+          }
         />
       </Space>
 
-      {catalogStatus === 'ready' && config.functionRef && !selected && (
-        <Alert
-          type="warning"
-          showIcon
-          message={t('nodeEditors.database.functionMissing')}
-        />
-      )}
-
-      {selected && (
+      {mode === 'FUNCTION' ? (
         <>
-          <Typography.Text type="secondary">
-            {t('nodeEditors.database.returnType', {
-              type: selected.returnType,
-            })}
-          </Typography.Text>
-          {selected.arguments.length === 0 ? (
+          <Space direction="vertical" size={6} style={{ width: '100%' }}>
+            <Typography.Text>
+              {t('nodeEditors.database.function')}
+            </Typography.Text>
             <Typography.Text type="secondary">
-              {t('nodeEditors.database.noArguments')}
+              {t('nodeEditors.database.functionHint')}
             </Typography.Text>
-          ) : (
-            selected.arguments.map((argument, index) => (
-              <Space
-                key={`${argument.position}:${argument.name}`}
-                direction="vertical"
-                size={6}
-                style={{ width: '100%' }}
-              >
-                <Typography.Text>
-                  {argument.name}{' '}
-                  <Typography.Text type="secondary">
-                    ({argument.type})
-                  </Typography.Text>
+            {catalogStatus === 'error' && (
+              <Typography.Text type="danger">
+                {t('nodeEditors.database.loadFailed')}{' '}
+                <Button type="link" size="small" onClick={loadFunctions}>
+                  {t('common.retry')}
+                </Button>
+              </Typography.Text>
+            )}
+            <Select
+              aria-label={t('nodeEditors.database.function')}
+              value={selectedKey}
+              disabled={disabled || catalogStatus !== 'ready'}
+              loading={catalogStatus === 'loading'}
+              placeholder={t('nodeEditors.database.selectFunction')}
+              showSearch
+              optionFilterProp="label"
+              options={functions.map((item) => ({
+                value: functionKey(item),
+                label: functionKey(item),
+              }))}
+              onChange={(key) => {
+                const databaseFunction = functions.find(
+                  (item) => functionKey(item) === key,
+                );
+                if (!databaseFunction) return;
+                const keepExistingBindings = selectedKey === key;
+                onChange({
+                  ...config,
+                  mode: 'FUNCTION',
+                  functionRef: {
+                    schema: databaseFunction.schema,
+                    name: databaseFunction.name,
+                    identityArguments: databaseFunction.identityArguments,
+                  },
+                  argumentBindings: databaseFunction.arguments.map(
+                    (argument, index) =>
+                      (keepExistingBindings
+                        ? config.argumentBindings?.[index]
+                        : undefined) ?? defaultBinding(argument),
+                  ),
+                  timeoutSeconds: config.timeoutSeconds ?? 30,
+                });
+              }}
+              style={{ width: '100%' }}
+            />
+          </Space>
+
+          {catalogStatus === 'ready' && config.functionRef && !selected && (
+            <Alert
+              type="warning"
+              showIcon
+              message={t('nodeEditors.database.functionMissing')}
+            />
+          )}
+
+          {selected && (
+            <>
+              <Typography.Text type="secondary">
+                {t('nodeEditors.database.returnType', {
+                  type: selected.returnType,
+                })}
+              </Typography.Text>
+              {selected.arguments.length === 0 ? (
+                <Typography.Text type="secondary">
+                  {t('nodeEditors.database.noArguments')}
                 </Typography.Text>
-                <ParameterBindingEditor
-                  name={argument.name}
-                  defaultPath={defaultArgumentPath(argument.name)}
-                  value={
-                    config.argumentBindings?.[index] ?? defaultBinding(argument)
-                  }
-                  disabled={disabled}
-                  onChange={(binding) => {
-                    const argumentBindings = selected.arguments.map(
-                      (item, bindingIndex) =>
-                        config.argumentBindings?.[bindingIndex] ??
-                        defaultBinding(item),
-                    );
-                    argumentBindings[index] = binding;
-                    onChange({ ...config, argumentBindings });
-                  }}
-                />
-              </Space>
-            ))
+              ) : (
+                selected.arguments.map((argument, index) => (
+                  <Space
+                    key={`${argument.position}:${argument.name}`}
+                    direction="vertical"
+                    size={6}
+                    style={{ width: '100%' }}
+                  >
+                    <Typography.Text>
+                      {argument.name}{' '}
+                      <Typography.Text type="secondary">
+                        ({argument.type})
+                      </Typography.Text>
+                    </Typography.Text>
+                    <ParameterBindingEditor
+                      name={argument.name}
+                      defaultPath={defaultArgumentPath(argument.name)}
+                      value={
+                        config.argumentBindings?.[index] ??
+                        defaultBinding(argument)
+                      }
+                      disabled={disabled}
+                      onChange={(binding) => {
+                        const argumentBindings = selected.arguments.map(
+                          (item, bindingIndex) =>
+                            config.argumentBindings?.[bindingIndex] ??
+                            defaultBinding(item),
+                        );
+                        argumentBindings[index] = binding;
+                        onChange({ ...config, argumentBindings });
+                      }}
+                    />
+                  </Space>
+                ))
+              )}
+            </>
           )}
         </>
+      ) : (
+        <>
+          <div className="db-execute-config__permission">
+            <div>
+              <Typography.Text strong>
+                {t('nodeEditors.database.allowWrite')}
+              </Typography.Text>
+              <Typography.Text
+                type="secondary"
+                className="db-execute-config__hint"
+              >
+                {t(
+                  allowWrite
+                    ? 'nodeEditors.database.readWriteDescription'
+                    : 'nodeEditors.database.readOnlyDescription',
+                )}
+              </Typography.Text>
+            </div>
+            <Switch
+              aria-label={t('nodeEditors.database.allowWrite')}
+              checked={allowWrite}
+              disabled={disabled}
+              onChange={(nextAllowWrite) =>
+                onChange({ ...config, allowWrite: nextAllowWrite })
+              }
+            />
+          </div>
+
+          <Space direction="vertical" size={6} style={{ width: '100%' }}>
+            <div className="db-execute-config__sql-head">
+              <Typography.Text strong>
+                {t('nodeEditors.database.sql')}
+              </Typography.Text>
+              <Tag bordered={false} color={allowWrite ? 'orange' : 'green'}>
+                {t(
+                  allowWrite
+                    ? 'nodeEditors.database.writeEnabled'
+                    : 'nodeEditors.database.readOnly',
+                )}
+              </Tag>
+            </div>
+            <WorkflowCodeEditor
+              language="sql"
+              value={config.sql ?? ''}
+              readOnly={disabled}
+              height={280}
+              wordWrap="off"
+              ariaLabel={t('nodeEditors.database.sql')}
+              onChange={(sql) => onChange({ ...config, sql })}
+            />
+          </Space>
+
+          <Space direction="vertical" size={6} style={{ width: '100%' }}>
+            <Typography.Text>
+              {t('nodeEditors.database.parameters')}
+            </Typography.Text>
+            <Typography.Text
+              type="secondary"
+              className="db-execute-config__hint"
+            >
+              {t('nodeEditors.database.parametersHint')}
+            </Typography.Text>
+            <ParameterBindingListEditor
+              value={config.parameters}
+              disabled={disabled}
+              addLabel={t('nodeEditors.database.addParameter')}
+              onChange={(parameters) => onChange({ ...config, parameters })}
+            />
+          </Space>
+        </>
       )}
 
       <Space direction="vertical" size={6} style={{ width: '100%' }}>

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

@@ -533,6 +533,7 @@ describe('simplified workflow node editors', () => {
     );
 
     expect(onChange).toHaveBeenCalledWith({
+      mode: 'FUNCTION',
       functionRef: {
         schema: 'workflow_api',
         name: 'approve_request',
@@ -549,4 +550,65 @@ describe('simplified workflow node editors', () => {
       'GET',
     );
   });
+
+  it('switches a database node to Raw SQL without removing its Function config', async () => {
+    await i18n.changeLanguage('zh_CN');
+    customRequest.mockResolvedValueOnce([]);
+    const onChange = vi.fn();
+    render(
+      <DbExecuteConfigEditor
+        value={{
+          mode: 'FUNCTION',
+          functionRef: {
+            schema: 'workflow_api',
+            name: 'approve_request',
+            identityArguments: 'p_request_id bigint',
+          },
+          argumentBindings: [{ source: 'INPUT', path: 'request_id' }],
+          timeoutSeconds: 30,
+        }}
+        onChange={onChange}
+        schema={schema}
+      />,
+    );
+
+    await screen.findByRole('combobox', { name: '数据库 Function' });
+    fireEvent.click(screen.getByText('Raw SQL'));
+
+    expect(onChange).toHaveBeenLastCalledWith({
+      mode: 'SQL',
+      functionRef: {
+        schema: 'workflow_api',
+        name: 'approve_request',
+        identityArguments: 'p_request_id bigint',
+      },
+      argumentBindings: [{ source: 'INPUT', path: 'request_id' }],
+      timeoutSeconds: 30,
+    });
+  });
+
+  it('shows the SQL editor when a database node uses Raw SQL mode', async () => {
+    await i18n.changeLanguage('zh_CN');
+    customRequest.mockResolvedValueOnce([]);
+    render(
+      <DbExecuteConfigEditor
+        value={{
+          mode: 'SQL',
+          allowWrite: false,
+          sql: 'SELECT id FROM users WHERE id = $1',
+          parameters: [{ source: 'INPUT', path: 'id' }],
+          timeoutSeconds: 30,
+        }}
+        onChange={vi.fn()}
+        schema={schema}
+      />,
+    );
+
+    expect(screen.getByRole('textbox', { name: 'SQL 语句' })).toHaveValue(
+      'SELECT id FROM users WHERE id = $1',
+    );
+    expect(
+      screen.queryByRole('combobox', { name: '数据库 Function' }),
+    ).not.toBeInTheDocument();
+  });
 });

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

@@ -0,0 +1,73 @@
+import { Tabs } from 'antd';
+import { PageHeader } from 'components';
+import { PAGE_WRAPPER_STYLE } from 'constants/layout';
+import { useTranslation } from 'react-i18next';
+import { useSearchParams } from 'react-router-dom';
+import PersonDirectoryPage from 'routes/person-directory';
+import PeopleGroupsPage from 'routes/people-groups';
+import BusinessEventCatalogPage from '../business-events';
+import ConnectionsPage from '../connections';
+import TemporalTenantPage from '../temporal-tenant';
+
+const TAB_KEYS = [
+  'tenant',
+  'connections',
+  'events',
+  'people',
+  'groups',
+] as const;
+type TabKey = (typeof TAB_KEYS)[number];
+
+function parseTab(value: string | null): TabKey {
+  return (TAB_KEYS as readonly string[]).includes(value ?? '')
+    ? (value as TabKey)
+    : 'tenant';
+}
+
+export default function WorkflowSettingsPage() {
+  const { t } = useTranslation('workflow');
+  const [searchParams, setSearchParams] = useSearchParams();
+  const activeKey = parseTab(searchParams.get('tab'));
+
+  const items = [
+    {
+      key: 'tenant',
+      label: t('settings.tabTenant'),
+      children: <TemporalTenantPage />,
+    },
+    {
+      key: 'connections',
+      label: t('settings.tabConnections'),
+      children: <ConnectionsPage />,
+    },
+    {
+      key: 'events',
+      label: t('settings.tabEvents'),
+      children: <BusinessEventCatalogPage />,
+    },
+    {
+      key: 'people',
+      label: t('settings.tabPeople'),
+      children: <PersonDirectoryPage />,
+    },
+    {
+      key: 'groups',
+      label: t('settings.tabGroups'),
+      children: <PeopleGroupsPage />,
+    },
+  ];
+
+  return (
+    <div style={PAGE_WRAPPER_STYLE}>
+      <PageHeader
+        title={t('settings.title')}
+        subtitle={t('settings.subtitle')}
+      />
+      <Tabs
+        activeKey={activeKey}
+        items={items}
+        onChange={(key) => setSearchParams({ tab: key }, { replace: true })}
+      />
+    </div>
+  );
+}

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

@@ -1,6 +1,5 @@
 import {
   ApiOutlined,
-  ArrowLeftOutlined,
   CheckCircleFilled,
   EditOutlined,
   EyeInvisibleOutlined,
@@ -27,10 +26,8 @@ import {
   message,
   theme,
 } from 'antd';
-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';
 import '../workflow-ui.css';
 import { useWorkflowFormValidation } from '../useWorkflowFormValidation';
 
@@ -134,7 +131,6 @@ function SensitiveValue({
 }
 
 export default function TemporalTenantPage() {
-  const navigate = useNavigate();
   const [form] = Form.useForm<TenantConfigFormValues>();
   const formValidation = useWorkflowFormValidation();
   const { token } = theme.useToken();
@@ -281,55 +277,34 @@ export default function TemporalTenantPage() {
   }
 
   return (
-    <div className="workflow-page-stack" style={PAGE_WRAPPER_STYLE}>
-      <Card {...HEADER_CARD_PROPS}>
+    <div className="workflow-page-stack">
+      {!loading && !loadError && existing && (
         <div
           style={{
             display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'space-between',
-            gap: 16,
-            flexWrap: 'wrap',
+            justifyContent: 'flex-end',
           }}
         >
-          <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
+          <Space>
             <Button
-              type="text"
-              icon={<ArrowLeftOutlined />}
-              onClick={() => navigate(-1)}
-            />
-            <div>
-              <Title level={4} style={{ margin: 0 }}>
-                服务注册
-              </Title>
-              <Text type="secondary" style={{ fontSize: 12 }}>
-                管理本 GAdmin 与 Temporal Worker 的连接配置
-              </Text>
-            </div>
-          </div>
-
-          {!loading && !loadError && existing && (
-            <Space>
-              <Button
-                aria-label="测试连通性"
-                icon={<ApiOutlined />}
-                loading={testing}
-                onClick={() => testConnection(toFormValues(existing))}
-              >
-                测试连通性
-              </Button>
-              <Button
-                type="primary"
-                aria-label="修改配置"
-                icon={<EditOutlined />}
-                onClick={openEditor}
-              >
-                修改配置
-              </Button>
-            </Space>
-          )}
+              aria-label="测试连通性"
+              icon={<ApiOutlined />}
+              loading={testing}
+              onClick={() => testConnection(toFormValues(existing))}
+            >
+              测试连通性
+            </Button>
+            <Button
+              type="primary"
+              aria-label="修改配置"
+              icon={<EditOutlined />}
+              onClick={openEditor}
+            >
+              修改配置
+            </Button>
+          </Space>
         </div>
-      </Card>
+      )}
 
       <Card>
         {loading ? (

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

@@ -66,6 +66,7 @@ export interface Workflow {
   runs?: {
     pending: number;
     running: number;
+    waiting_retry: number;
     completed: number;
     failed: number;
     cancelled: number;
@@ -93,6 +94,7 @@ export interface WorkflowOverview {
   };
   running: number;
   pending: number;
+  waitingRetry: number;
 }
 
 export interface WorkflowNodeType {