This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch refactor-worker
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/refactor-worker by this push:
new 290772d Modify workgroupid parameter name (#2105)
290772d is described below
commit 290772dfaa1f47b5e14167e8085038bd0861bf4e
Author: break60 <[email protected]>
AuthorDate: Sun Mar 8 15:59:13 2020 +0800
Modify workgroupid parameter name (#2105)
* Delete worker group management page
* Modify workgroupid parameter name
---
.../dag/_source/formModel/_source/workerGroups.vue | 4 ++--
.../home/pages/dag/_source/formModel/formModel.vue | 18 +++++++++---------
.../home/pages/dag/_source/startingParam/index.vue | 2 +-
.../pages/dag/_source/udp/_source/selectTenant.vue | 6 +++---
.../pages/definition/pages/list/_source/start.vue | 6 +++---
.../pages/definition/pages/list/_source/timing.vue | 8 ++++----
dolphinscheduler-ui/src/js/conf/home/router/index.js | 8 --------
.../src/js/conf/home/store/dag/actions.js | 2 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../js/module/components/secondaryMenu/_source/menu.js | 9 ---------
10 files changed, 24 insertions(+), 41 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
index 8b10d2b..8efe5c2 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
@@ -40,8 +40,8 @@
mixins: [disabledState],
props: {
value: {
- type: Number,
- default: -1
+ type: String,
+ default: 'default'
}
},
model: {
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 e05de8e..f4b83e7 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
@@ -90,7 +90,7 @@
<m-priority v-model="taskInstancePriority"></m-priority>
</span>
<span class="text-b">{{$t('Worker group')}}</span>
- <m-worker-groups v-model="workerGroupId"></m-worker-groups>
+ <m-worker-groups v-model="workerGroup"></m-worker-groups>
</div>
</div>
@@ -271,7 +271,7 @@
// Task priority
taskInstancePriority: 'MEDIUM',
// worker group id
- workerGroupId: -1
+ workerGroup: 'default'
}
},
/**
@@ -378,7 +378,7 @@
retryInterval: this.retryInterval,
timeout: this.timeout,
taskInstancePriority: this.taskInstancePriority,
- workerGroupId: this.workerGroupId
+ workerGroup: this.workerGroup
},
fromThis: this
})
@@ -433,7 +433,7 @@
retryInterval: this.retryInterval,
timeout: this.timeout,
taskInstancePriority: this.taskInstancePriority,
- workerGroupId: this.workerGroupId
+ workerGroup: this.workerGroup
},
fromThis: this
})
@@ -522,17 +522,17 @@
// If the workergroup has been deleted, set the default workergroup
var hasMatch = false;
for (let i = 0; i <
this.store.state.security.workerGroupsListAll.length; i++) {
- var workerGroupId =
this.store.state.security.workerGroupsListAll[i].id
- if (o.workerGroupId == workerGroupId) {
+ var workerGroup =
this.store.state.security.workerGroupsListAll[i].id
+ if (o.workerGroup == workerGroup) {
hasMatch = true;
break;
}
}
if(!hasMatch){
- this.workerGroupId = -1
+ this.workerGroup = 'default'
}else{
- this.workerGroupId = o.workerGroupId
+ this.workerGroup = o.workerGroup
}
this.params = o.params || {}
@@ -572,7 +572,7 @@
retryInterval: this.retryInterval,
timeout: this.timeout,
taskInstancePriority: this.taskInstancePriority,
- workerGroupId: this.workerGroupId
+ workerGroup: this.workerGroup
}
}
},
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 892cead..7927976 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 @@
<li><span class="tab">{{$t('Complement range')}}：</span><span
class="content" v-if="startupParam.commandParam &&
startupParam.commandParam.complementStartDate">{{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}}</span><span
class="content" v-else>-</span></li>
<li><span class="tab">{{$t('Failure Strategy')}}：</span><span
class="content">{{startupParam.failureStrategy === 'END' ? $t('End') :
$t('Continue')}}</span></li>
<li><span class="tab">{{$t('Process priority')}}：</span><span
class="content">{{startupParam.processInstancePriority}}</span></li>
- <li><span class="tab">{{$t('Worker group')}}：</span><span
class="content"
v-if="workerGroupList.length">{{_rtWorkerGroupName(startupParam.workerGroupId)}}</span></li>
+ <li><span class="tab">{{$t('Worker group')}}：</span><span
class="content"
v-if="workerGroupList.length">{{_rtWorkerGroupName(startupParam.workerGroup)}}</span></li>
<li><span class="tab">{{$t('Notification strategy')}}：</span><span
class="content">{{_rtWarningType(startupParam.warningType)}}</span></li>
<li><span class="tab">{{$t('Notification group')}}：</span><span
class="content"
v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
<li><span class="tab">{{$t('Recipient')}}：</span><span
class="content">{{startupParam.receivers || '-'}}</span></li>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
index 08672eb..feaba86 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
@@ -40,8 +40,8 @@
mixins: [disabledState],
props: {
value: {
- type: Number,
- default: -1
+ type: String,
+ default: 'default'
}
},
model: {
@@ -55,7 +55,7 @@
}
})
if(!result) {
- this.value = -1
+ this.value = 'default'
}
},
methods: {
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index 0a22e22..0b0d2ba 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -76,7 +76,7 @@
{{$t('Worker group')}}
</div>
<div class="cont">
- <m-worker-groups v-model="workerGroupId"></m-worker-groups>
+ <m-worker-groups v-model="workerGroup"></m-worker-groups>
</div>
</div>
<div class="clearfix list">
@@ -192,7 +192,7 @@
receiversCc: [],
runMode: 'RUN_MODE_SERIAL',
processInstancePriority: 'MEDIUM',
- workerGroupId: -1
+ workerGroup: 'default'
}
},
props: {
@@ -222,7 +222,7 @@
processInstancePriority: this.processInstancePriority,
receivers: this.receivers.join(',') || '',
receiversCc: this.receiversCc.join(',') || '',
- workerGroupId: this.workerGroupId
+ workerGroup: this.workerGroup
}
// Executed from the specified node
if (this.sourceType === 'contextmenu') {
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
index 16f7020..a78967e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -109,7 +109,7 @@
{{$t('Worker group')}}
</div>
<div class="cont">
- <m-worker-groups v-model="workerGroupId"></m-worker-groups>
+ <m-worker-groups v-model="workerGroup"></m-worker-groups>
</div>
</div>
<div class="clearfix list">
@@ -186,7 +186,7 @@
receiversCc: [],
i18n: i18n.globalScope.LOCALE,
processInstancePriority: 'MEDIUM',
- workerGroupId: -1,
+ workerGroup: 'default',
previewTimes: []
}
},
@@ -232,7 +232,7 @@
warningGroupId: this.warningGroupId =='' ? 0 : this.warningGroupId,
receivers: this.receivers.join(',') || '',
receiversCc: this.receiversCc.join(',') || '',
- workerGroupId: this.workerGroupId
+ workerGroup: this.workerGroup
}
let msg = ''
@@ -344,7 +344,7 @@
this.failureStrategy = item.failureStrategy
this.warningType = item.warningType
this.processInstancePriority = item.processInstancePriority
- this.workerGroupId = item.workerGroupId || -1
+ this.workerGroup = item.workerGroup || 'default'
this._getNotifyGroupList().then(() => {
this.$nextTick(() => {
// let list = _.filter(this.notifyGroupList, v => v.id ===
item.warningGroupId)
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js
b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index 21e211d..0ec26e2 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -319,14 +319,6 @@ const router = new Router({
}
},
{
- path: '/security/worker-groups',
- name: 'worker-groups-manage',
- component: resolve =>
require(['../pages/security/pages/workerGroups/index'], resolve),
- meta: {
- title: `${i18n.$t('Worker group manage')}`
- }
- },
- {
path: '/security/token',
name: 'token-manage',
component: resolve =>
require(['../pages/security/pages/token/index'], resolve),
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index 20bc113..0e3d855 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -160,7 +160,7 @@ export default {
state.tenantId = processInstanceJson.tenantId
//startup parameters
- state.startup = _.assign(state.startup, _.pick(res.data,
['commandType', 'failureStrategy', 'processInstancePriority', 'workerGroupId',
'warningType', 'warningGroupId', 'receivers', 'receiversCc']))
+ state.startup = _.assign(state.startup, _.pick(res.data,
['commandType', 'failureStrategy', 'processInstancePriority', 'workerGroup',
'warningType', 'warningGroupId', 'receivers', 'receiversCc']))
state.startup.commandParam = JSON.parse(res.data.commandParam)
resolve(res.data)
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index ff96adc..082366f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -452,7 +452,7 @@ export default {
io.get(`worker-group/all-groups`, payload, res => {
let list = res.data
list.unshift({
- id: -1,
+ id: 'default',
name: 'Default'
})
state.workerGroupsListAll = list
diff --git
a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index 2ed0fc1..1aeac5c 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -110,15 +110,6 @@ let menu = {
children: []
},
{
- name: `${i18n.$t('Worker group manage')}`,
- id: 4,
- path: 'worker-groups-manage',
- isOpen: true,
- disabled: true,
- icon: 'ans-icon-diary',
- children: []
- },
- {
name: `${i18n.$t('Token manage')}`,
id: 2,
path: 'token-manage',
