From 20efcd7277a08504560a4060b9b6cc723b59e32d Mon Sep 17 00:00:00 2001 From: dailidong Date: Sat, 25 Apr 2020 11:23:14 +0800 Subject: [PATCH 1/5] add DolphinScheduler slack channel --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 84f9ccfa66..626cc5d04e 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ It is because of the shoulders of these open source projects that the birth of t ### Get Help 1. Submit an issue 1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html. then send mail to dev@dolphinscheduler.apache.org +1. Slack channel: [Slack channel](https://join.slack.com/share/zt-do3gvfhj-UUhrAX2GxkVX_~JJt1jpKA) 1. Contact WeChat(dailidong66). This is just for Mandarin(CN) discussion. ### License From df220c9e5335a7604dab00dd9c601be91d4a3e92 Mon Sep 17 00:00:00 2001 From: dailidong Date: Sat, 25 Apr 2020 23:04:09 +0800 Subject: [PATCH 2/5] Update README.md Co-Authored-By: Jiajie Zhong --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 626cc5d04e..b88fdbed53 100644 --- a/README.md +++ b/README.md @@ -99,10 +99,9 @@ It is because of the shoulders of these open source projects that the birth of t ### Get Help 1. Submit an issue 1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html. then send mail to dev@dolphinscheduler.apache.org -1. Slack channel: [Slack channel](https://join.slack.com/share/zt-do3gvfhj-UUhrAX2GxkVX_~JJt1jpKA) +1. Slack channel: [![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://join.slack.com/share/zt-do3gvfhj-UUhrAX2GxkVX_~JJt1jpKA) 1. Contact WeChat(dailidong66). This is just for Mandarin(CN) discussion. ### License Please refer to [LICENSE](https://github.com/apache/incubator-dolphinscheduler/blob/dev/LICENSE) file. - From e94b02f27982744a1c88c5c81da579e22d8326ba Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Thu, 21 May 2020 17:49:37 +0800 Subject: [PATCH 3/5] Worker group adds check --- .../pages/dag/_source/formModel/formModel.vue | 17 +++++++++++++++-- .../src/js/module/i18n/locale/en_US.js | 3 ++- .../src/js/module/i18n/locale/zh_CN.js | 3 ++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 459f9a8605..3eb3b0c3d0 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -484,6 +484,16 @@ } return true }, + _verifWorkGroup() { + let item = this.store.state.security.workerGroupsListAll.find(item => { + return item.id == this.workerGroup; + }); + if(item==undefined) { + this.$message.warning(`${i18n.$t('The Worker group no longer exists, please select the correct Worker group!')}`) + return false; + } + return true + }, /** * Global verification procedure */ @@ -492,6 +502,10 @@ if (!this._verifName()) { return } + // verif workGroup + if(!this._verifWorkGroup()) { + return + } // Verify task alarm parameters if (!this.$refs['timeout']._verification()) { return @@ -619,8 +633,7 @@ break; } } - - if(!hasMatch){ + if(!hasMatch && o.workerGroupId==-1){ this.workerGroup = 'default' } else { this.workerGroup = o.workerGroup diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 678acb1283..fdb897fc9c 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -592,5 +592,6 @@ export default { 'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow', 'Successful branch flow and failed branch flow are required': 'conditions node Successful and failed branch flow are required', 'Unauthorized or deleted resources': 'Unauthorized or deleted resources', - 'Please delete all non-existent resources': 'Please delete all non-existent resources' + 'Please delete all non-existent resources': 'Please delete all non-existent resources', + 'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!' } diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index 628ee6151e..2cdf09db7b 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -592,5 +592,6 @@ export default { 'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点', 'Successful branch flow and failed branch flow are required': 'conditions节点成功和失败分支流转必填', 'Unauthorized or deleted resources': '未授权或已删除资源', - 'Please delete all non-existent resources': '请删除所有未授权或已删除资源' + 'Please delete all non-existent resources': '请删除所有未授权或已删除资源', + 'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在，请选择正确的Worker分组！' } From e83237f37e352efbb14e37f431d94ad68186c276 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Thu, 21 May 2020 18:31:35 +0800 Subject: [PATCH 4/5] fix --- .../src/js/conf/home/pages/dag/_source/formModel/formModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 3eb3b0c3d0..b079e941fe 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -633,7 +633,7 @@ break; } } - if(!hasMatch && o.workerGroupId==-1){ + if(!hasMatch && o.workerGroupId!=undefined){ this.workerGroup = 'default' } else { this.workerGroup = o.workerGroup From 06ce6fbf519c2df99c88409527ea64b942140b4c Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Fri, 22 May 2020 11:58:47 +0800 Subject: [PATCH 5/5] Modify startup parameter worker group value --- .../js/conf/home/pages/dag/_source/startingParam/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue index 7927976059..bea5d92227 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue @@ -24,7 +24,7 @@
  • {{$t('Complement range')}}：{{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}}-
  • {{$t('Failure Strategy')}}：{{startupParam.failureStrategy === 'END' ? $t('End') : $t('Continue')}}
  • {{$t('Process priority')}}：{{startupParam.processInstancePriority}}
    • -
  • {{$t('Worker group')}}：{{_rtWorkerGroupName(startupParam.workerGroup)}}
    • +
  • {{$t('Worker group')}}：{{startupParam.workerGroup}}
  • {{$t('Notification strategy')}}：{{_rtWarningType(startupParam.warningType)}}
  • {{$t('Notification group')}}：{{_rtNotifyGroupName(startupParam.warningGroupId)}}
  • {{$t('Recipient')}}：{{startupParam.receivers || '-'}}
    • @@ -38,7 +38,7 @@ import store from '@/conf/home/store' import { runningType } from '@/conf/home/pages/dag/_source/config' import { warningTypeList } from '@/conf/home/pages/projects/pages/definition/pages/list/_source/util' - + export default { name: 'starting-params-dag-index', data () {