Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-16567] Unable to delete copied nodes in unsaved workflow #16576

Merged
merged 12 commits into from
Sep 24, 2024
Merged

[Fix-16567] Unable to delete copied nodes in unsaved workflow #16576

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5204ec5
1. Fix the handling logic for when the backend API returns an empty a…
Xuxiaotuan Sep 3, 2024
7402224
Merge branch 'dev' into fixbug-issue-16567
SbloodyS Sep 4, 2024
f232ae0
`pnpm run lint` to format the code
Xuxiaotuan Sep 4, 2024
2c9242c
Merge remote-tracking branch 'origin/fixbug-issue-16567' into fixbug-…
Xuxiaotuan Sep 4, 2024
58a08b6
Update dolphinscheduler-ui/src/views/projects/components/dependencies…
Xuxiaotuan Sep 5, 2024
48afa0d
Merge branch 'refs/heads/dev' into fixbug-issue-16567
Xuxiaotuan Sep 11, 2024
d747b14
fix: replace processDefinitionCode、processDefinitionName to workflowD…
Xuxiaotuan Sep 17, 2024
6d2c77e
`pnpm run lint` to format the code
Xuxiaotuan Sep 19, 2024
0358147
Merge branch 'dev' into fixbug-issue-16567
SbloodyS Sep 19, 2024
0cd27f0
Merge branch 'dev' into fixbug-issue-16567
SbloodyS Sep 20, 2024
b0e2cab
Merge branch 'dev' into fixbug-issue-16567
SbloodyS Sep 22, 2024
564a583
Merge branch 'dev' into fixbug-issue-16567
SbloodyS Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...rc/main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowLineageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,16 +260,19 @@ public List<DependentLineageTask> queryDependentWorkflowDefinitions(long project
if (project == null) {
throw new ServiceException(Status.PROJECT_NOT_FOUND, projectCode);
}
List<DependentLineageTask> dependentLineageTaskList = new ArrayList<>();
List<WorkflowTaskLineage> workflowTaskLineageList =
workflowTaskLineageDao.queryWorkFlowLineageByDept(projectCode,
workflowDefinitionCode, taskCode == null ? 0 : taskCode);
if (workflowTaskLineageList.isEmpty()) {
return dependentLineageTaskList;
}
List<WorkflowDefinition> workflowDefinitionList =
workflowDefinitionMapper.queryByCodes(workflowTaskLineageList.stream()
.map(WorkflowTaskLineage::getWorkflowDefinitionCode).distinct().collect(Collectors.toList()));
List<TaskDefinition> taskDefinitionList = taskDefinitionMapper.queryByCodeList(workflowTaskLineageList.stream()
.map(WorkflowTaskLineage::getTaskDefinitionCode).filter(code -> code != 0).distinct()
.collect(Collectors.toList()));
List<DependentLineageTask> dependentLineageTaskList = new ArrayList<>();
for (WorkflowTaskLineage workflowTaskLineage : workflowTaskLineageList) {
DependentLineageTask dependentLineageTask = new DependentLineageTask();
taskDefinitionList.stream()
Expand Down
108 changes: 60 additions & 48 deletions dolphinscheduler-ui/src/views/projects/components/dependencies/use-dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,18 @@ export function useDependencies() {
workFlowCode: workflowCode,
taskCode: taskCode
} as DependentTaskReq
const res = await queryDependentTasks(projectCode, dependentTaskReq)
res
.filter((item: any) => item.processDefinitionCode !== workflowCode)
.forEach((item: any) => {
tasks.push(
item.processDefinitionName + '->' + item.taskDefinitionName
)
})
await queryDependentTasks(projectCode, dependentTaskReq)
.then((res: any) => {
if (res?.data?.length > 0) {
res.data
.filter((item: any) => item.processDefinitionCode !== workflowCode)
.forEach((item: any) => {
tasks.push(
item.processDefinitionName + '->' + item.taskDefinitionName
)
})
}
})
}
return tasks
}
Expand All @@ -51,14 +55,18 @@ export function useDependencies() {
const dependentTaskReq = {
workFlowCode: workflowCode
} as DependentTaskReq
const res = await queryDependentTasks(projectCode, dependentTaskReq)
res
.filter((item: any) => item.processDefinitionCode !== workflowCode)
.forEach((item: any) => {
tasks.push(
item.processDefinitionName + '->' + item.taskDefinitionName
)
})
await queryDependentTasks(projectCode, dependentTaskReq)
.then((res: any) => {
if (res?.data?.length > 0) {
res.data
.filter((item: any) => item.processDefinitionCode !== workflowCode)
.forEach((item: any) => {
tasks.push(
item.processDefinitionName + '->' + item.taskDefinitionName
)
})
}
})
}
return tasks
}
Expand Down Expand Up @@ -110,25 +118,27 @@ export function useDependencies() {
if (workflowCode && projectCode) {
await queryDependentTasks(projectCode, dependentTaskReq).then(
(res: any) => {
res.data
.filter((item: any) => {
if (item.processDefinitionCode) {
return item.processDefinitionCode !== workflowCode
} else {
return false
}
})
.forEach((item: any) => {
dependentTaskLinks.push({
text:
item.processDefinitionName + '->' + item.taskDefinitionName,
show: true,
action: () => {
const url = `/projects/${item.projectCode}/workflow/definitions/${item.processDefinitionCode}`
window.open(url, '_blank')
}
})
})
if (res?.data?.length > 0) {
res.data
.filter((item: any) => {
if (item.processDefinitionCode) {
return item.processDefinitionCode !== workflowCode
} else {
return false
}
})
.forEach((item: any) => {
dependentTaskLinks.push({
text:
item.processDefinitionName + '->' + item.taskDefinitionName,
show: true,
action: () => {
const url = `/projects/${item.projectCode}/workflow/definitions/${item.processDefinitionCode}`
window.open(url, '_blank')
}
})
})
}
}
)
}
Expand All @@ -148,19 +158,21 @@ export function useDependencies() {
if (workflowCode && projectCode) {
await queryDependentTasks(projectCode, dependentTaskReq).then(
(res: any) => {
res
.filter((item: any) => item.processDefinitionCode !== workflowCode)
.forEach((item: any) => {
dependentTaskLinks.push({
text:
item.processDefinitionName + '->' + item.taskDefinitionName,
show: true,
action: () => {
const url = `/projects/${item.projectCode}/workflow/definitions/${item.processDefinitionCode}`
window.open(url, '_blank')
}
})
})
if (res?.data?.length > 0) {
res.data
.filter((item: any) => item.processDefinitionCode !== workflowCode)
.forEach((item: any) => {
dependentTaskLinks.push({
text:
item.processDefinitionName + '->' + item.taskDefinitionName,
show: true,
action: () => {
const url = `/projects/${item.projectCode}/workflow/definitions/${item.processDefinitionCode}`
window.open(url, '_blank')
}
})
})
}
}
)
}
Expand Down
Loading