@gadmin2n/schematics 0.0.149 → 0.0.151

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

@@ -0,0 +1,126 @@
+import {
+  Card,
+  Form,
+  Input,
+  Select,
+  Space,
+  Switch,
+  Typography,
+  message,
+} from 'antd';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import type { IntegrationConnection } from '../../connections/connection.types';
+import { fetchConnections } from '../../connections/connectionsApi';
+import type { WidgetProps } from '../schema-form/widget-registry';
+import { EventTriggerConfigEditor } from './EventTriggerConfigEditor';
+
+type EventTriggerLifecycleConfig = Record<string, unknown> & {
+  failureCallback?: {
+    connectionRef?: string;
+    path?: string;
+  };
+};
+
+export function EventTriggerLifecycleConfigEditor({
+  value,
+  onChange,
+  ...props
+}: WidgetProps<EventTriggerLifecycleConfig | undefined>) {
+  const { t } = useTranslation('workflow');
+  const config = value ?? {};
+  const callback = config.failureCallback;
+  const [connections, setConnections] = useState<IntegrationConnection[]>([]);
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    setLoading(true);
+    fetchConnections('')
+      .then(setConnections)
+      .catch((error) =>
+        message.error(
+          error?.message ?? t('nodeEditors.event.failureCallbackLoadFailed'),
+        ),
+      )
+      .finally(() => setLoading(false));
+  }, []);
+
+  function updateCallback(
+    next: EventTriggerLifecycleConfig['failureCallback'] | undefined,
+  ) {
+    const updated = { ...config };
+    if (next) updated.failureCallback = next;
+    else delete updated.failureCallback;
+    onChange(updated);
+  }
+
+  return (
+    <Space direction="vertical" size={12} style={{ width: '100%' }}>
+      <EventTriggerConfigEditor
+        {...(props as any)}
+        value={config as any}
+        onChange={(next) =>
+          onChange({
+            ...(next as unknown as Record<string, unknown>),
+            ...(callback && { failureCallback: callback }),
+          })
+        }
+      />
+      <Card size="small" title={t('nodeEditors.event.failureCallbackTitle')}>
+        <Typography.Paragraph type="secondary">
+          {t('nodeEditors.event.failureCallbackDescription')}
+        </Typography.Paragraph>
+        <Form.Item label={t('nodeEditors.event.failureCallbackEnabled')}>
+          <Switch
+            checked={Boolean(callback)}
+            disabled={props.disabled}
+            onChange={(enabled) =>
+              updateCallback(
+                enabled ? { connectionRef: '', path: '' } : undefined,
+              )
+            }
+          />
+        </Form.Item>
+        {callback && (
+          <>
+            <Form.Item
+              label={t('nodeEditors.event.failureCallbackConnection')}
+              required
+            >
+              <Select
+                value={callback.connectionRef || undefined}
+                loading={loading}
+                disabled={props.disabled}
+                showSearch
+                optionFilterProp="label"
+                options={connections
+                  .filter((connection) => connection.isEnabled)
+                  .map((connection) => ({
+                    value: connection.code,
+                    label: `${connection.name} (${connection.code})`,
+                  }))}
+                onChange={(connectionRef) =>
+                  updateCallback({ ...callback, connectionRef })
+                }
+              />
+            </Form.Item>
+            <Form.Item
+              label={t('nodeEditors.event.failureCallbackPath')}
+              required
+              style={{ marginBottom: 0 }}
+            >
+              <Input
+                value={callback.path}
+                disabled={props.disabled}
+                placeholder="/api/hardware-disposal/workflow-failed"
+                onChange={(event) =>
+                  updateCallback({ ...callback, path: event.target.value })
+                }
+              />
+            </Form.Item>
+          </>
+        )}
+      </Card>
+    </Space>
+  );
+}

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

@@ -2,13 +2,16 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 import i18n from '../../../../i18n';
 import { CronTriggerConfigEditor } from './CronTriggerConfigEditor';
-import {
-  DbExecuteConfigEditor,
-  isDatabaseSqlAllowed,
-} from './DbExecuteConfigEditor';
+import { DbExecuteConfigEditor } from './DbExecuteConfigEditor';
 import { EventTriggerConfigEditor } from './EventTriggerConfigEditor';
 import { ParallelConfigEditor } from './ParallelConfigEditor';
 
+const customRequest = vi.fn();
+
+vi.mock('helpers/http', () => ({
+  customRequest: (...args: unknown[]) => customRequest(...args),
+}));
+
 vi.mock('@monaco-editor/react', () => ({
   default: ({
     language,
@@ -353,35 +356,6 @@ describe('simplified workflow node editors', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('checks SQL against the node write permission', () => {
-    expect(isDatabaseSqlAllowed(' SELECT * FROM users', false)).toBe(true);
-    expect(
-      isDatabaseSqlAllowed(
-        'WITH active AS (SELECT 1) SELECT * FROM active',
-        false,
-      ),
-    ).toBe(true);
-    expect(isDatabaseSqlAllowed('UPDATE users SET active = true', false)).toBe(
-      false,
-    );
-    expect(isDatabaseSqlAllowed('UPDATE users SET active = true', true)).toBe(
-      true,
-    );
-    expect(
-      isDatabaseSqlAllowed(
-        'WITH changed AS (UPDATE requests SET status = $1 RETURNING id) UPDATE assets SET state = $2 WHERE request_id IN (SELECT id FROM changed)',
-        true,
-      ),
-    ).toBe(true);
-    expect(
-      isDatabaseSqlAllowed(
-        'WITH changed AS (UPDATE requests SET status = $1 RETURNING id) UPDATE assets SET state = $2 WHERE request_id IN (SELECT id FROM changed)',
-        false,
-      ),
-    ).toBe(false);
-    expect(isDatabaseSqlAllowed('DROP TABLE users', true)).toBe(false);
-  });
-
   it('explains the zero-based Parallel branch result array', async () => {
     await i18n.changeLanguage('zh_CN');
     render(
@@ -522,35 +496,57 @@ describe('simplified workflow node editors', () => {
     });
   });
 
-  it('uses one SQL editor with a write permission switch', async () => {
+  it('selects a workflow_api Function and creates one binding per argument', async () => {
     await i18n.changeLanguage('zh_CN');
+    customRequest.mockResolvedValueOnce([
+      {
+        schema: 'workflow_api',
+        name: 'approve_request',
+        identityArguments: 'p_request_id bigint, p_approved boolean',
+        returnType: 'jsonb',
+        arguments: [
+          { position: 1, name: 'p_request_id', type: 'bigint' },
+          { position: 2, name: 'p_approved', type: 'boolean' },
+        ],
+      },
+    ]);
     const onChange = vi.fn();
     render(
       <DbExecuteConfigEditor
-        value={{
-          allowWrite: false,
-          sql: 'SELECT * FROM users WHERE id = $1',
-          parameters: [{ source: 'INPUT', path: 'userId' }],
-        }}
+        value={{ timeoutSeconds: 30 }}
         onChange={onChange}
         schema={schema}
       />,
     );
 
-    const sqlEditor = screen.getByRole('textbox', { name: 'SQL 语句' });
-    expect(sqlEditor).toHaveValue('SELECT * FROM users WHERE id = $1');
-    expect(sqlEditor).toHaveAttribute('data-language', 'sql');
-    expect(screen.getByText('只读 SQL')).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: '参数 $1' })).toBeDisabled();
-    expect(screen.getByRole('textbox', { name: '参数 $1' })).toHaveValue('$1');
-    expect(screen.getByText('参数')).toBeInTheDocument();
-    expect(screen.getByText('值')).toBeInTheDocument();
-    expect(screen.getByDisplayValue('userId')).toBeInTheDocument();
-    fireEvent.click(screen.getByRole('switch', { name: '允许写入' }));
+    const selector = await screen.findByRole('combobox', {
+      name: '数据库 Function',
+    });
+    expect(
+      screen.queryByRole('textbox', { name: 'SQL 语句' }),
+    ).not.toBeInTheDocument();
+    fireEvent.mouseDown(selector);
+    fireEvent.click(
+      await screen.findByTitle(
+        'workflow_api.approve_request(p_request_id bigint, p_approved boolean)',
+      ),
+    );
+
     expect(onChange).toHaveBeenCalledWith({
-      allowWrite: true,
-      sql: 'SELECT * FROM users WHERE id = $1',
-      parameters: [{ source: 'INPUT', path: 'userId' }],
+      functionRef: {
+        schema: 'workflow_api',
+        name: 'approve_request',
+        identityArguments: 'p_request_id bigint, p_approved boolean',
+      },
+      argumentBindings: [
+        { source: 'INPUT', path: 'request_id' },
+        { source: 'INPUT', path: 'approved' },
+      ],
+      timeoutSeconds: 30,
     });
+    expect(customRequest).toHaveBeenCalledWith(
+      'workflow/database-functions',
+      'GET',
+    );
   });
 });

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

@@ -23,9 +23,9 @@ export function resolveForEachCall(
     connection.sourceHandle,
     'start',
   );
-  if (!ownerPorts || !firstNode) return null;
+  if (!forEachNode || !firstNode || !ownerPorts) return null;
   return {
-    forEachNode: forEachNode!,
+    forEachNode,
     firstNode,
     sourceHandle: ownerPorts.start,
     targetReturnHandle: ownerPorts.end,

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

@@ -96,9 +96,7 @@ export function withNewNodeDefaults(
   }
   if (nodeType === 'db_execute') {
     return {
-      allowWrite: false,
-      sql: '',
-      parameters: [],
+      argumentBindings: [],
       timeoutSeconds: 30,
     };
   }

package/package.json

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

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/config/ac.config.ts

@@ -1,24 +0,0 @@
-import { RolesBuilder } from 'nest-access-control';
-
-export enum AppRoles {
-  GUEST = 'GUEST',
-  PRODUCT = 'PRODUCT',
-  SYSTEM_ADMIIN = 'SYSTEM_ADMIN',
-}
-
-const ALL_TABLES = ['source', 'tasklog', 'log', 'game', 'role'];
-
-export const roles: RolesBuilder = new RolesBuilder();
-roles
-  .grant(AppRoles.GUEST)
-  .readAny(ALL_TABLES, ['*'])
-  .grant(AppRoles.PRODUCT) // define new or modify existing role. also takes an array.
-  .extend(AppRoles.GUEST)
-  .createAny(ALL_TABLES) // equivalent to .createOwn('product', ['*'])
-  .updateAny(ALL_TABLES)
-  .deleteAny(ALL_TABLES, ['*'])
-  .grant(AppRoles.SYSTEM_ADMIIN) // switch to another role without breaking the chain
-  .extend(AppRoles.PRODUCT)
-  .createAny(ALL_TABLES)
-  .updateAny(ALL_TABLES) // explicitly defined attributes
-  .deleteAny(ALL_TABLES, ['*']);