@gadmin2n/schematics 0.0.151 → 0.0.153

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 {

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

@@ -96,6 +96,7 @@ export function withNewNodeDefaults(
   }
   if (nodeType === 'db_execute') {
     return {
+      mode: 'FUNCTION',
       argumentBindings: [],
       timeoutSeconds: 30,
     };

package/package.json

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