@gadmin2n/schematics 0.0.151 → 0.0.153

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

@@ -40,6 +40,11 @@ const STATUS_TAG: Record<
 > = {
   PENDING: { color: 'gold', label: 'Pending', icon: <ClockCircleOutlined /> },
   RUNNING: { color: 'blue', label: 'Running', icon: <LoadingOutlined /> },
+  WAITING_RETRY: {
+    color: 'orange',
+    label: 'Waiting to retry',
+    icon: <ClockCircleOutlined />,
+  },
   COMPLETED: {
     color: 'green',
     label: 'Completed',
@@ -65,7 +70,6 @@ interface NodeExecution {
 interface RetryAttempt {
   id: string;
   status: string;
-  retryFromNodeId: string | null;
   createdAt: string;
 }
 
@@ -88,9 +92,7 @@ interface InstanceDetail {
   approvableNodeIds: string[];
   retryableNodeIds: string[];
   retryAttempts: RetryAttempt[];
-  reusedNodeIds: string[];
   retryOfInstanceId: string | null;
-  retryFromNodeId: string | null;
   dsl?: WorkflowDSL;
 }
 
@@ -221,7 +223,11 @@ export default function WorkflowInstanceDetailPage() {
 
   // Auto-refresh for running instances
   useEffect(() => {
-    if (data?.status === 'RUNNING' || data?.status === 'PENDING') {
+    if (
+      data?.status === 'RUNNING' ||
+      data?.status === 'PENDING' ||
+      data?.status === 'WAITING_RETRY'
+    ) {
       const interval = setInterval(fetchData, 3000);
       return () => clearInterval(interval);
     }
@@ -263,16 +269,16 @@ export default function WorkflowInstanceDetailPage() {
     }
   };
 
-  const handleRetryFromNode = async (nodeId: string) => {
+  const handleRetryFailedNode = async (nodeId: string) => {
     setActionLoading(true);
     try {
-      const res = await customRequest<{ instanceId: string }>(
-        `workflow/instance/${instanceId}/retry-from-node`,
+      await customRequest(
+        `workflow/instance/${instanceId}/retry-failed-node`,
         'POST',
         { nodeId },
       );
       message.success(t('instanceDetail.retryFromNodeStarted'));
-      navigate(`/admin/workflow/instance/show/${res.instanceId}`);
+      await fetchData();
     } catch (e: any) {
       message.error(e?.message || t('instanceDetail.retryFromNodeFailed'));
     } finally {
@@ -325,17 +331,10 @@ export default function WorkflowInstanceDetailPage() {
     selectedNodeId && data.dsl
       ? data.dsl.nodes.find((n) => n.id === selectedNodeId)
       : null;
-  const selectedNodeWasReused = selectedNodeId
-    ? data.reusedNodeIds.includes(selectedNodeId)
-    : false;
   const latestRetryAttempt = data.retryAttempts[0];
-  const selectedRetryAttempt = selectedNodeId
-    ? data.retryAttempts.find(
-        (attempt) => attempt.retryFromNodeId === selectedNodeId,
-      )
-    : undefined;
-  const workflowFailure =
-    data.status === 'FAILED' ? getWorkflowFailureSummary(data.result) : null;
+  const workflowFailure = ['FAILED', 'WAITING_RETRY'].includes(data.status)
+    ? getWorkflowFailureSummary(data.result)
+    : null;
 
   return (
     <div className="workflow-page-stack">
@@ -383,7 +382,7 @@ export default function WorkflowInstanceDetailPage() {
                 {t('instanceDetail.openTemporal')}
               </Button>
             </Tooltip>
-            {(data.status === 'RUNNING' || data.status === 'PENDING') && (
+            {['RUNNING', 'PENDING', 'WAITING_RETRY'].includes(data.status) && (
               <Popconfirm
                 title="Cancel this workflow execution?"
                 onConfirm={handleCancel}
@@ -480,17 +479,10 @@ export default function WorkflowInstanceDetailPage() {
               </Button>
             </Descriptions.Item>
           )}
-          {data.reusedNodeIds.length > 0 && (
-            <Descriptions.Item label={t('instanceDetail.reusedResults')}>
-              {t('instanceDetail.reusedResultsCount', {
-                count: data.reusedNodeIds.length,
-              })}
-            </Descriptions.Item>
-          )}
         </Descriptions>
         {workflowFailure && (
           <Alert
-            type="error"
+            type={data.status === 'WAITING_RETRY' ? 'warning' : 'error'}
             showIcon
             style={{ marginTop: 16 }}
             message={workflowFailure.message}
@@ -571,9 +563,6 @@ export default function WorkflowInstanceDetailPage() {
                     const canRetryFromNode =
                       ne.status === 'FAILED' &&
                       data.retryableNodeIds.includes(ne.nodeId);
-                    const retryAttempt = data.retryAttempts.find(
-                      (attempt) => attempt.retryFromNodeId === ne.nodeId,
-                    );
                     return {
                       title: (
                         <Space
@@ -620,7 +609,7 @@ export default function WorkflowInstanceDetailPage() {
                               description={t(
                                 'instanceDetail.retryFromNodeDescription',
                               )}
-                              onConfirm={() => handleRetryFromNode(ne.nodeId)}
+                              onConfirm={() => handleRetryFailedNode(ne.nodeId)}
                               okText={t('instanceDetail.retryFromNode')}
                               cancelText={t('common.cancel')}
                             >
@@ -635,23 +624,6 @@ export default function WorkflowInstanceDetailPage() {
                               </Button>
                             </Popconfirm>
                           )}
-                          {retryAttempt && (
-                            <Button
-                              size="small"
-                              type="link"
-                              icon={<LinkOutlined />}
-                              onClick={(event) => {
-                                event.stopPropagation();
-                                navigate(
-                                  `/admin/workflow/instance/show/${retryAttempt.id}`,
-                                );
-                              }}
-                            >
-                              {t('instanceDetail.viewRetryAttempt', {
-                                id: retryAttempt.id,
-                              })}
-                            </Button>
-                          )}
                         </Space>
                       ),
                       description: (
@@ -821,7 +793,6 @@ export default function WorkflowInstanceDetailPage() {
                     showExecutionStatus={true}
                     selectedNodeId={selectedNodeId}
                     readonly={true}
-                    reusedNodeIds={data.reusedNodeIds}
                     onNodeClick={(nodeId) => setSelectedNodeId(nodeId)}
                   />
                 </div>
@@ -982,7 +953,7 @@ export default function WorkflowInstanceDetailPage() {
                                 'instanceDetail.retryFromNodeDescription',
                               )}
                               onConfirm={() =>
-                                handleRetryFromNode(selectedExecution.nodeId)
+                                handleRetryFailedNode(selectedExecution.nodeId)
                               }
                               okText={t('instanceDetail.retryFromNode')}
                               cancelText={t('common.cancel')}
@@ -997,22 +968,6 @@ export default function WorkflowInstanceDetailPage() {
                             </Popconfirm>
                           )}
 
-                        {selectedExecution.status === 'FAILED' &&
-                          selectedRetryAttempt && (
-                            <Button
-                              icon={<LinkOutlined />}
-                              onClick={() =>
-                                navigate(
-                                  `/admin/workflow/instance/show/${selectedRetryAttempt.id}`,
-                                )
-                              }
-                            >
-                              {t('instanceDetail.viewRetryAttempt', {
-                                id: selectedRetryAttempt.id,
-                              })}
-                            </Button>
-                          )}
-
                         {/* Approval actions */}
                         {selectedExecution.nodeType === 'approval' &&
                           selectedExecution.status === 'RUNNING' &&
@@ -1047,14 +1002,10 @@ export default function WorkflowInstanceDetailPage() {
                       <div>
                         <div style={{ marginBottom: 16 }}>
                           <Title level={5}>{selectedDslNode.label}</Title>
-                          <Tag
-                            color={selectedNodeWasReused ? 'green' : 'default'}
-                          >
-                            {selectedNodeWasReused
-                              ? t('instanceDetail.reusedResult')
-                              : instanceHasFinished
-                                ? 'Not Executed / Skipped'
-                                : 'Not Executed'}
+                          <Tag>
+                            {instanceHasFinished
+                              ? 'Not Executed / Skipped'
+                              : 'Not Executed'}
                           </Tag>
                         </div>
                         <Descriptions column={1} size="small">
@@ -1063,11 +1014,9 @@ export default function WorkflowInstanceDetailPage() {
                           </Descriptions.Item>
                           <Descriptions.Item label="Status">
                             <Text type="secondary">
-                              {selectedNodeWasReused
-                                ? t('instanceDetail.reusedResultDescription')
-                                : instanceHasFinished
-                                  ? 'Not executed in this run'
-                                  : 'Waiting for execution'}
+                              {instanceHasFinished
+                                ? 'Not executed in this run'
+                                : 'Waiting for execution'}
                             </Text>
                           </Descriptions.Item>
                         </Descriptions>

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%' }}>