You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/09/15 07:25:05 UTC
[dolphinscheduler] branch 3.0.1-prepare updated: [3.0.1-prepare][cherry-pick][Fix-11877][UI] Fix the problem that the environment cannot be delete (#11934)
This is an automated email from the ASF dual-hosted git repository.
songjian pushed a commit to branch 3.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.0.1-prepare by this push:
new 5b6c6ac2b9 [3.0.1-prepare][cherry-pick][Fix-11877][UI] Fix the problem that the environment cannot be delete (#11934)
5b6c6ac2b9 is described below
commit 5b6c6ac2b9ac57516c155464da9ce1a131e6bc8e
Author: Kerwin <37...@users.noreply.github.com>
AuthorDate: Thu Sep 15 15:24:55 2022 +0800
[3.0.1-prepare][cherry-pick][Fix-11877][UI] Fix the problem that the environment cannot be delete (#11934)
* cherry-pick [Fix-11877][UI] Fix the problem that the environment cannot be delete...
* Remove non-existing task plugins
Co-authored-by: rickchengx <38...@users.noreply.github.com>
---
.../src/views/projects/task/components/node/tasks/use-datax.ts | 2 +-
.../src/views/projects/task/components/node/tasks/use-emr.ts | 2 +-
.../src/views/projects/task/components/node/tasks/use-procedure.ts | 2 +-
.../src/views/projects/task/components/node/tasks/use-python.ts | 2 +-
.../src/views/projects/task/components/node/tasks/use-sea-tunnel.ts | 2 +-
.../src/views/projects/task/components/node/tasks/use-sql.ts | 2 +-
.../src/views/projects/task/components/node/tasks/use-zeppelin.ts | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
index 4b69960b51..a75c852a8e 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-datax.ts
@@ -73,7 +73,7 @@ export function useDataX({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
index 3ce2fead6c..4f4695d897 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts
@@ -68,7 +68,7 @@ export function useEmr({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
index 1ace30e0e9..130853d549 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-procedure.ts
@@ -71,7 +71,7 @@ export function useProcedure({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
index 2f58a13257..0d35d7a01a 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-python.ts
@@ -69,7 +69,7 @@ export function usePython({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
index 85fedf8d3b..4f619a8695 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
@@ -73,7 +73,7 @@ export function useSeaTunnel({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
index 63111d54fe..c23311c257 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts
@@ -76,7 +76,7 @@ export function useSql({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
index 7e96d46d12..a625c7461c 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-zeppelin.ts
@@ -67,7 +67,7 @@ export function useZeppelin({
Fields.useDescription(),
Fields.useTaskPriority(),
Fields.useWorkerGroup(),
- Fields.useEnvironmentName(model, !model.id),
+ Fields.useEnvironmentName(model, !data?.id),
...Fields.useTaskGroup(model, projectCode),
...Fields.useFailed(),
Fields.useDelayTime(model),