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

[Improvement-15723][UI] Work out the issue that project preferences doesn't replace all places that they need to affect. #15724

Merged
merged 1 commit into from
Mar 16, 2024
Merged

[Improvement-15723][UI] Work out the issue that project preferences doesn't replace all places that they need to affect. #15724

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
75 changes: 73 additions & 2 deletions dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import {
} from '@vicons/antd'
import { IDefinitionData } from '../types'
import styles from '../index.module.scss'
import { queryProjectPreferenceByProjectCode } from '@/service/modules/projects-preference'

const props = {
row: {
Expand Down Expand Up @@ -172,6 +173,75 @@ export default defineComponent({
]
}

const projectPreferences = ref({} as any)

const initProjectPreferences = async (projectCode: number) => {
if (projectCode) {
await queryProjectPreferenceByProjectCode(projectCode).then(
(result: any) => {
if (result?.preferences && result.state === 1) {
projectPreferences.value = JSON.parse(result.preferences)
}
}
)
}
}

const containValueInOptions = (
options: Array<any>,
findingValue: string
): boolean => {
for (let { value } of options) {
if (findingValue === value) {
return true
}
}
return false
}

const restructureForm = async (form: any) => {
await initProjectPreferences(props.row.projectCode)
if (projectPreferences.value?.taskPriority) {
form.processInstancePriority = projectPreferences.value.taskPriority
}
if (projectPreferences.value?.warningType) {
form.warningType = projectPreferences.value.warningType
}
if (projectPreferences.value?.workerGroup) {
if (
containValueInOptions(
variables.workerGroups,
projectPreferences.value.workerGroup
)
) {
form.workerGroup = projectPreferences.value.workerGroup
}
}
if (projectPreferences.value?.tenant) {
if (
containValueInOptions(
variables.tenantList,
projectPreferences.value.tenant
)
) {
form.tenantCode = projectPreferences.value.tenant
}
}
if (
projectPreferences.value?.environmentCode &&
variables?.environmentList
) {
if (
containValueInOptions(
variables.environmentList,
projectPreferences.value.environmentCode
)
) {
form.environmentCode = projectPreferences.value.environmentCode
}
}
}

const updateWorkerGroup = () => {
startState.startForm.environmentCode = null
}
Expand Down Expand Up @@ -206,6 +276,7 @@ export default defineComponent({
() => {
if (props.show) {
getStartParamsList(props.row.code)
restructureForm(startState.startForm)
if (props.taskCode)
startState.startForm.startNodeList = props.taskCode
}
Expand Down Expand Up @@ -438,8 +509,8 @@ export default defineComponent({
</NFormItem>
)}
<NFormItem
label={t('project.workflow.order_of_execution')}
path='executionOrder'
label={t('project.workflow.order_of_execution')}
path='executionOrder'
>
<NRadioGroup v-model:value={this.startForm.executionOrder}>
<NSpace>
Expand Down