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][UI] Fix the preTask options are unavailable when creating a tas… #11501

Merged
merged 1 commit into from
Aug 17, 2022
Merged

[Fix][UI] Fix the preTask options are unavailable when creating a tas… #11501

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dolphinscheduler-ui/src/views/projects/task/components/node/fields/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export { useExecutorMemory } from './use-executor-memory'
export { useExecutorCores } from './use-executor-cores'
export { useMainJar } from './use-main-jar'
export { useResources } from './use-resources'
export { useTaskDefinition } from './use-task-definition'

export { useShell } from './use-shell'
export { useSpark } from './use-spark'
Expand Down
11 changes: 10 additions & 1 deletion dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pre-tasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,22 @@
* limitations under the License.
*/

import { ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useTaskNodeStore } from '@/store/project/task-node'
import type { IJsonItem } from '../types'

export function usePreTasks(): IJsonItem {
const { t } = useI18n()
const taskStore = useTaskNodeStore()
const options = ref(taskStore.getPreTaskOptions)

watch(
() => taskStore.getPreTaskOptions,
(value) => {
options.value = value
}
)

return {
type: 'select',
Expand All @@ -33,6 +42,6 @@ export function usePreTasks(): IJsonItem {
multiple: true,
filterable: true
},
options: taskStore.getPreTaskOptions
options
}
}
8 changes: 6 additions & 2 deletions dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-process-name.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,26 @@ import {
querySimpleList,
queryProcessDefinitionByCode
} from '@/service/modules/process-definition'
import { useTaskNodeStore } from '@/store/project/task-node'
import type { IJsonItem } from '../types'

export function useProcessName({
model,
projectCode,
isCreate,
from,
processName
processName,
taskCode
}: {
model: { [field: string]: any }
projectCode: number
isCreate: boolean
from?: number
processName?: number
taskCode?: number
}): IJsonItem {
const { t } = useI18n()

const taskStore = useTaskNodeStore()
const options = ref([] as { label: string; value: string }[])
const loading = ref(false)

Expand All @@ -55,6 +58,7 @@ export function useProcessName({
if (!processCode) return
const res = await queryProcessDefinitionByCode(processCode, projectCode)
model.definition = res
taskStore.updateDefinition(res, taskCode)
}

const onChange = (code: number) => {
Expand Down
46 changes: 46 additions & 0 deletions dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-task-definition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { useTaskType, useProcessName } from '.'
import type { IJsonItem, ITaskData } from '../types'

export const useTaskDefinition = ({
projectCode,
from = 0,
readonly,
data,
model
}: {
projectCode: number
from?: number
readonly?: boolean
data?: ITaskData
model: { [field: string]: any }
}): IJsonItem[] => {
if (from === 0) return []
return [
useTaskType(model, readonly),
useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName,
taskCode: data?.code
})
]
}
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-chunjun.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,10 @@ export function useChunjun({
timeoutNotifyStrategy: ['WARN']
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-conditions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,10 @@ export function useConditions({
timeoutNotifyStrategy: ['WARN']
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-data-quality.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,10 @@ export function useDataQuality({
others: '--conf spark.yarn.maxAppAttempts=1'
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,10 @@ export function useDataX({
timeoutNotifyStrategy: ['WARN']
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-dependent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,10 @@ export function useDependent({
...data
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-dinky.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,10 @@ export function useDinky({
timeoutNotifyStrategy: ['WARN']
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
18 changes: 2 additions & 16 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-dvc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,13 @@ export function useDvc({
delayTime: 0,
timeout: 30,
timeoutNotifyStrategy: ['WARN'],
dvcTaskType: 'Upload',
dvcTaskType: 'Upload'
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,10 @@ export function useEmr({
timeoutNotifyStrategy: ['WARN']
} as INodeData)

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,10 @@ export function useFlinkStream({
timeoutNotifyStrategy: ['WARN']
})

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
16 changes: 1 addition & 15 deletions dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,10 @@ export function useFlink({
timeoutNotifyStrategy: ['WARN']
})

let extra: IJsonItem[] = []
if (from === 1) {
extra = [
Fields.useTaskType(model, readonly),
Fields.useProcessName({
model,
projectCode,
isCreate: !data?.id,
from,
processName: data?.processName
})
]
}

return {
json: [
Fields.useName(from),
...extra,
...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
Fields.useRunFlag(),
Fields.useDescription(),
Fields.useTaskPriority(),
Expand Down
Loading