Skip to content

Commit 23e60cd

Browse files
committed
2867 - replace all new usages of getTaskDispatcherTask with getTask
1 parent a89caa4 commit 23e60cd

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

client/src/pages/platform/cluster-element-editor/hooks/useClusterElementsLayout.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import useDataPillPanelStore from '../../workflow-editor/stores/useDataPillPanel
1414
import useWorkflowDataStore from '../../workflow-editor/stores/useWorkflowDataStore';
1515
import useWorkflowEditorStore from '../../workflow-editor/stores/useWorkflowEditorStore';
1616
import useWorkflowNodeDetailsPanelStore from '../../workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
17+
import {getTask} from '../../workflow-editor/utils/getTask';
1718
import {getLayoutedElements} from '../../workflow-editor/utils/layoutUtils';
18-
import {getTaskDispatcherTask} from '../../workflow-editor/utils/taskDispatcherConfig';
1919
import useClusterElementsDataStore from '../stores/useClusterElementsDataStore';
2020
import {isPlainObject} from '../utils/clusterElementsUtils';
2121
import createClusterElementsEdges from '../utils/createClusterElementsEdges';
@@ -112,9 +112,9 @@ const useClusterElementsLayout = () => {
112112
return undefined;
113113
}
114114

115-
return getTaskDispatcherTask({
116-
taskDispatcherId: rootClusterElementNodeData.workflowNodeName,
115+
return getTask({
117116
tasks: workflowDefinitionTasks,
117+
workflowNodeName: rootClusterElementNodeData.workflowNodeName,
118118
});
119119
}, [workflowDefinitionTasks, rootClusterElementNodeData?.workflowNodeName]);
120120

client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,9 @@ const WorkflowNodeDetailsPanel = ({
447447
return undefined;
448448
}
449449

450-
const mainClusterRootTask = getTaskDispatcherTask({
451-
taskDispatcherId: rootClusterElementNodeData.workflowNodeName,
450+
const mainClusterRootTask = getTask({
452451
tasks: workflow.tasks || [],
452+
workflowNodeName: rootClusterElementNodeData.workflowNodeName,
453453
});
454454

455455
if (!mainClusterRootTask) {
@@ -1147,9 +1147,9 @@ const WorkflowNodeDetailsPanel = ({
11471147
const workflowDefinitionTasks = JSON.parse(workflow.definition).tasks;
11481148

11491149
const mainClusterRootTask = rootClusterElementNodeData?.workflowNodeName
1150-
? getTaskDispatcherTask({
1151-
taskDispatcherId: rootClusterElementNodeData.workflowNodeName,
1150+
? getTask({
11521151
tasks: workflowDefinitionTasks,
1152+
workflowNodeName: rootClusterElementNodeData.workflowNodeName,
11531153
})
11541154
: undefined;
11551155

client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenuOperationList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPa
2929
import calculateNodeInsertIndex from '../utils/calculateNodeInsertIndex';
3030
import getFormattedName from '../utils/getFormattedName';
3131
import getParametersWithDefaultValues from '../utils/getParametersWithDefaultValues';
32+
import {getTask} from '../utils/getTask';
3233
import getTaskDispatcherContext from '../utils/getTaskDispatcherContext';
3334
import handleComponentAddedSuccess from '../utils/handleComponentAddedSuccess';
3435
import handleTaskDispatcherSubtaskOperationClick from '../utils/handleTaskDispatcherSubtaskOperationClick';
3536
import processClusterElementsHierarchy from '../utils/processClusterElementsHierarchy';
3637
import saveWorkflowDefinition from '../utils/saveWorkflowDefinition';
37-
import {getTaskDispatcherTask} from '../utils/taskDispatcherConfig';
3838

3939
interface WorkflowNodesPopoverMenuOperationListProps {
4040
clusterElementType?: string;
@@ -196,9 +196,9 @@ const WorkflowNodesPopoverMenuOperationList = ({
196196

197197
const workflowDefinitionTasks = JSON.parse(workflow.definition).tasks;
198198

199-
const mainClusterRootTask = getTaskDispatcherTask({
200-
taskDispatcherId: rootClusterElementNodeData.workflowNodeName,
199+
const mainClusterRootTask = getTask({
201200
tasks: workflowDefinitionTasks,
201+
workflowNodeName: rootClusterElementNodeData.workflowNodeName,
202202
});
203203

204204
if (!mainClusterRootTask) {

client/src/pages/platform/workflow-editor/utils/handleDeleteTask.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import {WorkflowDataType} from '../stores/useWorkflowDataStore';
1010
import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
1111
import findAndRemoveClusterElement from './findAndRemoveClusterElement';
1212
import getRecursivelyUpdatedTasks from './getRecursivelyUpdatedTasks';
13-
import {TASK_DISPATCHER_CONFIG, getTaskDispatcherTask} from './taskDispatcherConfig';
13+
import {getTask} from './getTask';
14+
import {TASK_DISPATCHER_CONFIG} from './taskDispatcherConfig';
1415

1516
interface HandleDeleteTaskProps {
1617
rootClusterElementNodeData?: NodeDataType;
@@ -194,9 +195,9 @@ export default function handleDeleteTask({
194195
return parentForkJoinTask;
195196
}) as Array<WorkflowTaskType>;
196197
} else if (clusterElementsCanvasOpen && rootClusterElementNodeData) {
197-
const mainRootClusterElementTask = getTaskDispatcherTask({
198-
taskDispatcherId: rootClusterElementNodeData.name,
198+
const mainRootClusterElementTask = getTask({
199199
tasks: workflowTasks,
200+
workflowNodeName: rootClusterElementNodeData.name,
200201
});
201202

202203
if (!mainRootClusterElementTask || !mainRootClusterElementTask.clusterElements) {

client/src/pages/platform/workflow-editor/utils/saveClusterElementFieldChange.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import useWorkflowEditorStore from '../stores/useWorkflowEditorStore';
77
import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
88
import {updateClusterRootElementField, updateNestedClusterElementField} from './clusterElementsFieldChangeUtils';
99
import getParametersWithDefaultValues from './getParametersWithDefaultValues';
10+
import {getTask} from './getTask';
1011
import saveWorkflowDefinition from './saveWorkflowDefinition';
11-
import {getTaskDispatcherTask} from './taskDispatcherConfig';
1212

1313
type FieldUpdateType = {
1414
field: 'operation' | 'label' | 'description';
@@ -49,9 +49,9 @@ export default function saveClusterElementFieldChange({
4949

5050
const workflowDefinitionTasks = JSON.parse(workflow.definition).tasks;
5151

52-
const mainClusterRootTask = getTaskDispatcherTask({
53-
taskDispatcherId: rootClusterElementNodeData.workflowNodeName,
52+
const mainClusterRootTask = getTask({
5453
tasks: workflowDefinitionTasks,
54+
workflowNodeName: rootClusterElementNodeData.workflowNodeName,
5555
});
5656

5757
if (!mainClusterRootTask) {

client/src/pages/platform/workflow-editor/utils/saveWorkflowDefinition.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {UseMutationResult} from '@tanstack/react-query';
44

55
import useWorkflowDataStore from '../stores/useWorkflowDataStore';
66
import getRecursivelyUpdatedTasks from './getRecursivelyUpdatedTasks';
7+
import {getTask} from './getTask';
78
import insertTaskDispatcherSubtask from './insertTaskDispatcherSubtask';
8-
import {getTaskDispatcherTask} from './taskDispatcherConfig';
99

1010
const SPACE = 4;
1111

@@ -187,9 +187,9 @@ export default async function saveWorkflowDefinition({
187187
...updatedWorkflowDefinitionTasks.slice(existingTaskIndex + 1),
188188
];
189189
} else {
190-
const nestedTask = getTaskDispatcherTask({
191-
taskDispatcherId: existingWorkflowTask.name,
190+
const nestedTask = getTask({
192191
tasks: workflowDefinitionTasks,
192+
workflowNodeName: existingWorkflowTask.name,
193193
});
194194

195195
if (!nestedTask) {

0 commit comments

Comments
 (0)