[GitHub] [dolphinscheduler] ruanwenjun commented on a diff in pull request #12100: [Fix] [Bug] Fix bugs such as missing status and workflow when creating and modifying task definitions

[GitBox]

ruanwenjun commented on code in PR #12100:
URL: https://github.com/apache/dolphinscheduler/pull/12100#discussion_r977270859


##########
dolphinscheduler-ui/src/views/projects/task/definition/use-task.ts:
##########
@@ -88,7 +88,9 @@ export function useTask(projectCode: number) {
 
   const onEditTask = async (row: IRecord, readonly: boolean) => {
     const result = await queryTaskDefinitionByCode(row.taskCode, projectCode)
-    task.taskData = { ...result, processName: row.processDefinitionCode }
+    // debugger
+    task.taskData = {...result, processName: row.processDefinitionCode, 
upstreamTaskMapKey: row.upstreamTaskMapKey}
+    // task.taskData = { ...result, processName: row.processDefinitionCode }

Review Comment:
   ```suggestion
   
   ```



##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java:
##########
@@ -506,28 +516,46 @@ public Map<String, Object> updateTaskWithUpstream(User 
loginUser, long projectCo
             ProcessTaskRelation taskRelation = upstreamTaskRelations.get(0);
             List<ProcessTaskRelation> processTaskRelations = 
processTaskRelationMapper.queryByProcessCode(projectCode, 
taskRelation.getProcessDefinitionCode());
             List<ProcessTaskRelation> processTaskRelationList = 
Lists.newArrayList(processTaskRelations);
-            List<ProcessTaskRelation> relationList = Lists.newArrayList();
+//            List<ProcessTaskRelation> relationList = Lists.newArrayList();
             for (ProcessTaskRelation processTaskRelation : 
processTaskRelationList) {
                 if (processTaskRelation.getPostTaskCode() == taskCode) {
                     if 
(queryUpStreamTaskCodeMap.containsKey(processTaskRelation.getPreTaskCode()) && 
processTaskRelation.getPreTaskCode() != 0L) {
                         
queryUpStreamTaskCodeMap.remove(processTaskRelation.getPreTaskCode());
                     } else {
                         processTaskRelation.setPreTaskCode(0L);
                         processTaskRelation.setPreTaskVersion(0);
-                        relationList.add(processTaskRelation);
+//                        relationList.add(processTaskRelation);

Review Comment:
   ```suggestion
   
   ```



##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java:
##########
@@ -506,28 +516,46 @@ public Map<String, Object> updateTaskWithUpstream(User 
loginUser, long projectCo
             ProcessTaskRelation taskRelation = upstreamTaskRelations.get(0);
             List<ProcessTaskRelation> processTaskRelations = 
processTaskRelationMapper.queryByProcessCode(projectCode, 
taskRelation.getProcessDefinitionCode());
             List<ProcessTaskRelation> processTaskRelationList = 
Lists.newArrayList(processTaskRelations);
-            List<ProcessTaskRelation> relationList = Lists.newArrayList();
+//            List<ProcessTaskRelation> relationList = Lists.newArrayList();
             for (ProcessTaskRelation processTaskRelation : 
processTaskRelationList) {
                 if (processTaskRelation.getPostTaskCode() == taskCode) {
                     if 
(queryUpStreamTaskCodeMap.containsKey(processTaskRelation.getPreTaskCode()) && 
processTaskRelation.getPreTaskCode() != 0L) {
                         
queryUpStreamTaskCodeMap.remove(processTaskRelation.getPreTaskCode());
                     } else {
                         processTaskRelation.setPreTaskCode(0L);
                         processTaskRelation.setPreTaskVersion(0);
-                        relationList.add(processTaskRelation);
+//                        relationList.add(processTaskRelation);
                     }
                 }
             }
-            processTaskRelationList.removeAll(relationList);
+//            processTaskRelationList.removeAll(relationList);

Review Comment:
   ```suggestion
   
   ```



##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java:
##########
@@ -506,28 +516,46 @@ public Map<String, Object> updateTaskWithUpstream(User 
loginUser, long projectCo
             ProcessTaskRelation taskRelation = upstreamTaskRelations.get(0);
             List<ProcessTaskRelation> processTaskRelations = 
processTaskRelationMapper.queryByProcessCode(projectCode, 
taskRelation.getProcessDefinitionCode());
             List<ProcessTaskRelation> processTaskRelationList = 
Lists.newArrayList(processTaskRelations);
-            List<ProcessTaskRelation> relationList = Lists.newArrayList();
+//            List<ProcessTaskRelation> relationList = Lists.newArrayList();

Review Comment:
   ```suggestion
   
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@dolphinscheduler.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org