Skip to content

[Fix-18307][API] The frontend is correctly using the preferred values of the associated project for task creating and workflow scheduling #18308

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

Open
njnu-seafish wants to merge 6 commits into
base: dev
Choose a base branch
from
+17 −5
Open

[Fix-18307][API] The frontend is correctly using the preferred values of the associated project for task creating and workflow scheduling #18308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87c59e1
fix alertGroups
Jun 1, 2026
92306f9
fix the issue where project preference values are not correctly appli…
Jun 2, 2026
af21f5e
Merge branch 'dev' into Fix-18307
SbloodyS Jun 2, 2026
ade1755
use whitelist for project preference fields in task creation
Jun 3, 2026
c0e7c16
Merge branch 'dev' into Fix-18307
njnu-seafish Jun 5, 2026
52b1e41
Merge branch 'dev' into Fix-18307
SbloodyS Jun 7, 2026
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
16 changes: 14 additions & 2 deletions dolphinscheduler-ui/src/views/projects/task/components/node/detail-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,21 @@

const restructureNodeData = (data: INodeData) => {
if (!data?.id) {
const allowedFields = [

Check warning on line 133 in dolphinscheduler-ui/src/views/projects/task/components/node/detail-modal.tsx

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

`allowedFields` should be a `Set`, and use `allowedFields.has()` to check existence or non-existence. 


See more on https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&issues=AZ6ga7xmAQ80L8fBcIDW&open=AZ6ga7xmAQ80L8fBcIDW&pullRequest=18308
'taskPriority',
'workerGroup',
'environmentCode',
'failRetryTimes',
'failRetryInterval',
'cpuQuota',
'memoryMax',
'timeoutFlag',
'timeoutNotifyStrategy',
'timeout'
]
for (const item in projectPreferences.value) {
if (projectPreferences.value[item] !== null && item in data) {
Object.assign(data, { item: projectPreferences.value[item] })
if (projectPreferences.value[item] !== null && allowedFields.includes(item)) {
Object.assign(data, { [item]: projectPreferences.value[item] })
}
Comment on lines 132 to 148

@njnu-seafish njnu-seafish Jun 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix: use whitelist for project preference fields in task creation

  • Replace item in data check with explicit allowed fields list
  • Ensures project preferences are applied to new tasks even when initial data object is empty
  • Prevents unrelated fields (tenant, alertGroups) from being added to task node model
  • Whitelist includes: taskPriority, workerGroup, environmentCode, failRetryTimes, failRetryInterval, cpuQuota, memoryMax, timeoutFlag, timeoutNotifyStrategy, timeout

}
}
Expand Down
6 changes: 3 additions & 3 deletions dolphinscheduler-ui/src/views/projects/workflow/definition/components/timing-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,14 @@ export default defineComponent({
timingForm.environmentCode = projectPreferences.value.environmentCode
}
}
if (projectPreferences.value?.alertGroup && variables?.alertGroups) {
if (projectPreferences.value?.alertGroups && variables?.alertGroups) {
if (
containValueInOptions(
variables.alertGroups,
projectPreferences.value.alertGroup
projectPreferences.value.alertGroups
)
) {
timingForm.warningGroupId = projectPreferences.value.alertGroup
timingForm.warningGroupId = projectPreferences.value.alertGroups
}
}
}
Expand Down
Loading