This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/alert_plugin_design by this
push:
new ffc5420 Delete the receivers, receiversCc fields, delete api
alert-group/grant-user, projects/{projectName}/executors/get-receiver-cc (#4409)
ffc5420 is described below
commit ffc5420ba9ab9b4462065387d05254786a02aa9a
Author: break60 <[email protected]>
AuthorDate: Mon Jan 11 14:05:03 2021 +0800
Delete the receivers, receiversCc fields, delete api
alert-group/grant-user, projects/{projectName}/executors/get-receiver-cc (#4409)
* Replace the front-end code of the plugin branch with the front-end code
of the dev branch
* fix
* fix
* fix
* fix
* Delete the receivers, receiversCc fields, delete api
alert-group/grant-user, projects/{projectName}/executors/get-receiver-cc
---
.../home/pages/dag/_source/formModel/tasks/sql.vue | 37 +-------------
.../pages/dag/_source/formModel/tasks/sqoop.vue | 1 -
.../home/pages/dag/_source/startingParam/index.vue | 2 -
.../pages/definition/pages/list/_source/list.vue | 27 ++--------
.../pages/definition/pages/list/_source/start.vue | 30 +----------
.../pages/definition/pages/list/_source/timing.vue | 27 +---------
.../pages/definition/timing/_source/list.vue | 27 ++--------
.../security/pages/warningGroups/_source/list.vue | 59 ++--------------------
.../src/js/conf/home/store/dag/actions.js | 12 -----
9 files changed, 14 insertions(+), 208 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 7e3ae46..39009b2 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -55,18 +55,6 @@
</el-input>
</div>
</m-list-box>
- <m-list-box>
- <div slot="text"><strong
class='requiredIcon'>*</strong>{{$t('Recipient')}}</div>
- <div slot="content">
- <m-email ref="refEmail" v-model="receivers" :disabled="isDetails"
:repeat-data="receiversCc"></m-email>
- </div>
- </m-list-box>
- <m-list-box>
- <div slot="text">{{$t('Cc')}}</div>
- <div slot="content">
- <m-email ref="refCc" v-model="receiversCc" :disabled="isDetails"
:repeat-data="receivers"></m-email>
- </div>
- </m-list-box>
</template>
<m-list-box v-show="type === 'HIVE'">
<div slot="text">{{$t('SQL Parameter')}}</div>
@@ -155,7 +143,6 @@
import mLocalParams from './_source/localParams'
import mStatementList from './_source/statementList'
import disabledState from '@/module/mixin/disabledState'
- import mEmail from
'@/conf/home/pages/projects/pages/definition/pages/list/_source/email'
import codemirror from
'@/conf/home/pages/resource/pages/file/pages/_source/codemirror'
let editor
@@ -278,10 +265,6 @@
if (this.sqlType === 0 && !this.$refs.refEmail._manualEmail()) {
return false
}
- // receiversCc Subcomponent verification
- if (this.sqlType === 0 && !this.$refs.refCc._manualEmail()) {
- return false
- }
// udfs Subcomponent verification Verification only if the data type
is HIVE
if (this.type === 'HIVE') {
if (!this.$refs.refUdfs._verifUdfs()) {
@@ -366,19 +349,6 @@
return editor
},
- _getReceiver () {
- let param = {}
- let current = this.router.history.current
- if (current.name === 'projects-definition-details') {
- param.processDefinitionId = current.params.id
- } else {
- param.processInstanceId = current.params.id
- }
- this.store.dispatch('dag/getReceiver', param).then(res => {
- this.receivers = res.receivers && res.receivers.split(',') || []
- this.receiversCc = res.receiversCc && res.receiversCc.split(',') ||
[]
- })
- },
_cacheParams () {
this.$emit('on-cache-params', {
type: this.type,
@@ -419,8 +389,6 @@
}
if (val !== 0) {
this.title = ''
- this.receivers = []
- this.receiversCc = []
}
},
// Listening data source
@@ -455,13 +423,10 @@
this.preStatements = o.params.preStatements || []
this.postStatements = o.params.postStatements || []
this.title = o.params.title || ''
- this.receivers = o.params.receivers && o.params.receivers.split(',')
|| []
- this.receiversCc = o.params.receiversCc &&
o.params.receiversCc.split(',') || []
}
// read tasks from cache
if (!_.some(this.store.state.dag.cacheTasks, { id: this.createNodeId })
&&
this.router.history.current.name !== 'definition-create') {
- this._getReceiver()
}
},
mounted () {
@@ -504,6 +469,6 @@
}
}
},
- components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType,
mStatementList, mEmail, mScriptBox }
+ components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType,
mStatementList, mScriptBox }
}
</script>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
index 7647e67..2513393 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
@@ -1176,7 +1176,6 @@
if (val !== 0) {
this.title = ''
this.receivers = []
- this.receiversCc = []
}
},
// Listening data source
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 9520386..4132a0c 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
@@ -27,8 +27,6 @@
<li><span class="tab">{{$t('Worker group')}}：</span><span
class="content"
v-if="workerGroupList.length">{{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>
- <li><span class="tab">{{$t('Cc')}}：</span><span
class="content">{{startupParam.receiversCc || '-'}}</span></li>
</ul>
</div>
</template>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index c3b7799..1aee167 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -177,8 +177,6 @@
timingDialog: false,
timingData: {
item: {},
- receiversD: [],
- receiversCcD: [],
type: ''
},
relatedItemsDialog: false,
@@ -191,7 +189,7 @@
pageSize: Number
},
methods: {
- ...mapActions('dag', ['editProcessState', 'getStartCheck',
'getReceiver', 'deleteDefinition', 'batchDeleteDefinition', 'exportDefinition',
'getProcessDefinitionVersionsPage', 'copyProcess',
'switchProcessDefinitionVersion', 'deleteProcessDefinitionVersion',
'moveProcess']),
+ ...mapActions('dag', ['editProcessState', 'getStartCheck',
'deleteDefinition', 'batchDeleteDefinition', 'exportDefinition',
'getProcessDefinitionVersionsPage', 'copyProcess',
'switchProcessDefinitionVersion', 'deleteProcessDefinitionVersion',
'moveProcess']),
...mapActions('security', ['getWorkerGroupsAll']),
selectable (row, index) {
@@ -227,29 +225,12 @@
this.startDialog = false
},
/**
- * get emial
- */
- _getReceiver (id) {
- return new Promise((resolve, reject) => {
- this.getReceiver({ processDefinitionId: id }).then(res => {
- resolve({
- receivers: res.receivers && res.receivers.split(',') || [],
- receiversCc: res.receiversCc && res.receiversCc.split(',') || []
- })
- })
- })
- },
- /**
* timing
*/
_timing (item) {
- this._getReceiver(item.id).then(res => {
- this.timingData.item = item
- this.timingData.receiversD = res.receivers
- this.timingData.receiversCcD = res.receiversCc
- this.timingData.type = 'timing'
- this.timingDialog = true
- })
+ this.timingData.item = item
+ this.timingData.type = 'timing'
+ this.timingDialog = true
},
onUpdateTiming () {
this._onUpdate()
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 cb6cc67..97ddf8c 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
@@ -101,22 +101,6 @@
</div>
<div class="clearfix list">
<div class="text">
- {{$t('Recipient')}}
- </div>
- <div class="cont" style="width: 688px;">
- <m-email v-model="receivers" :repeat-data="receiversCc"></m-email>
- </div>
- </div>
- <div class="clearfix list">
- <div class="text">
- {{$t('Cc')}}
- </div>
- <div class="cont" style="width: 688px;">
- <m-email v-model="receiversCc" :repeat-data="receivers"></m-email>
- </div>
- </div>
- <div class="clearfix list">
- <div class="text">
{{$t('Complement Data')}}
</div>
<div class="cont">
@@ -164,7 +148,6 @@
</template>
<script>
import dayjs from 'dayjs'
- import mEmail from './email.vue'
import store from '@/conf/home/store'
import { warningTypeList } from './util'
import mPriority from '@/module/components/priority/priority'
@@ -186,8 +169,6 @@
spinnerLoading: false,
execType: false,
taskDependType: 'TASK_POST',
- receivers: [],
- receiversCc: [],
runMode: 'RUN_MODE_SERIAL',
processInstancePriority: 'MEDIUM',
workerGroup: 'default'
@@ -219,8 +200,6 @@
taskDependType: this.taskDependType,
runMode: this.runMode,
processInstancePriority: this.processInstancePriority,
- receivers: this.receivers.join(',') || '',
- receiversCc: this.receiversCc.join(',') || '',
workerGroup: this.workerGroup
}
// Executed from the specified node
@@ -247,12 +226,6 @@
})
})
},
- _getReceiver () {
- this.store.dispatch('dag/getReceiver', { processDefinitionId:
this.startData.id }).then(res => {
- this.receivers = res.receivers && res.receivers.split(',') || []
- this.receiversCc = res.receiversCc && res.receiversCc.split(',') ||
[]
- })
- },
ok () {
this._start()
},
@@ -269,7 +242,6 @@
this.warningType = this.warningTypeList[0].id
this.workflowName = this.startData.name
- this._getReceiver()
let stateWorkerGroupsList =
this.store.state.security.workerGroupsListAll || []
if (stateWorkerGroupsList.length) {
this.workerGroup = stateWorkerGroupsList[0].id
@@ -292,7 +264,7 @@
this.workflowName = this.startData.name
},
computed: {},
- components: { mEmail, mPriority, mWorkerGroups }
+ components: { mPriority, mWorkerGroups }
}
</script>
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 51c2787..9cb5d1b 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
@@ -136,22 +136,6 @@
</el-select>
</div>
</div>
- <div class="clearfix list">
- <div class="text">
- {{$t('Recipient')}}
- </div>
- <div class="cont" style="width: 680px;">
- <m-email v-model="receivers" :repeat-data="receiversCc"></m-email>
- </div>
- </div>
- <div class="clearfix list">
- <div class="text">
- {{$t('Cc')}}
- </div>
- <div class="cont" style="width: 680px;">
- <m-email v-model="receiversCc" :repeat-data="receivers"></m-email>
- </div>
- </div>
<div class="submit">
<el-button type="text" size="small" @click="close()"> {{$t('Cancel')}}
</el-button>
<el-button type="primary" size="small" round :loading="spinnerLoading"
@click="ok()">{{spinnerLoading ? 'Loading...' : (timingData.item.crontab ?
$t('Edit') : $t('Create'))}} </el-button>
@@ -159,9 +143,7 @@
</div>
</template>
<script>
- import _ from 'lodash'
import i18n from '@/module/i18n'
- import mEmail from './email.vue'
import store from '@/conf/home/store'
import { warningTypeList } from './util'
import { vCrontab } from '@/module/components/crontab/index'
@@ -184,8 +166,6 @@
scheduleTime: '',
crontab: '0 0 * * * ? *',
cronPopover: false,
- receivers: [],
- receiversCc: [],
i18n: i18n.globalScope.LOCALE,
processInstancePriority: 'MEDIUM',
workerGroup: '',
@@ -229,8 +209,6 @@
warningType: this.warningType,
processInstancePriority: this.processInstancePriority,
warningGroupId: this.warningGroupId === '' ? 0 :
this.warningGroupId,
- receivers: this.receivers.join(',') || '',
- receiversCc: this.receiversCc.join(',') || '',
workerGroup: this.workerGroup
}
let msg = ''
@@ -337,8 +315,6 @@
this.crontab = '0 0 * * * ? *'
this.scheduleTime = times
}
- this.receivers = _.cloneDeep(this.timingData.receiversD)
- this.receiversCc = _.cloneDeep(this.timingData.receiversCcD)
},
mounted () {
let item = this.timingData.item
@@ -351,7 +327,6 @@
this.processInstancePriority = item.processInstancePriority
this._getNotifyGroupList().then(() => {
this.$nextTick(() => {
- // let list = _.filter(this.notifyGroupList, v => v.id ===
item.warningGroupId)
this.warningGroupId = item.warningGroupId
})
}).catch(() => { this.warningGroupId = '' })
@@ -363,7 +338,7 @@
}).catch(() => { this.warningGroupId = '' })
}
},
- components: { vCrontab, mEmail, mPriority, mWorkerGroups }
+ components: { vCrontab, mPriority, mWorkerGroups }
}
</script>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
index f773edf..f7c122f 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
@@ -124,16 +124,14 @@
list: [],
timingDialog: false,
timingData: {
- item: {},
- receiversD: [],
- receiversCcD: []
+ item: {}
}
}
},
props: {
},
methods: {
- ...mapActions('dag', ['getScheduleList', 'scheduleOffline',
'scheduleOnline', 'getReceiver', 'deleteTiming']),
+ ...mapActions('dag', ['getScheduleList', 'scheduleOffline',
'scheduleOnline', 'deleteTiming']),
/**
* delete
*/
@@ -230,28 +228,11 @@
})
},
/**
- * get email
- */
- _getReceiver (id) {
- return new Promise((resolve, reject) => {
- this.getReceiver({ processDefinitionId: id }).then(res => {
- resolve({
- receivers: res.receivers && res.receivers.split(',') || [],
- receiversCc: res.receiversCc && res.receiversCc.split(',') || []
- })
- })
- })
- },
- /**
* timing
*/
_editTiming (item) {
- this._getReceiver(item.processDefinitionId).then(res => {
- this.timingData.item = item
- this.timingData.receiversD = res.receivers
- this.timingData.receiversCcD = res.receiversCc
- this.timingDialog = true
- })
+ this.timingData.item = item
+ this.timingDialog = true
},
onUpdateTiming () {
this.pageNo = 1
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index a4fd982..2c86737 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -38,9 +38,6 @@
</el-table-column>
<el-table-column :label="$t('Operation')" width="130">
<template slot-scope="scope">
- <el-tooltip :content="$t('Managing Users')" placement="top">
- <el-button type="primary" size="mini" icon="el-icon-user"
@click="_mangeUser(scope.row, scope.$index)" circle></el-button>
- </el-tooltip>
<el-tooltip :content="$t('Edit')" placement="top">
<span><el-button type="primary" size="mini"
icon="el-icon-edit-outline" @click="_edit(scope.row)" circle></el-button></span>
</el-tooltip>
@@ -60,33 +57,17 @@
</el-table-column>
</el-table>
</div>
- <el-dialog
- :visible.sync="transferDialog"
- width="auto">
- <m-transfer :transferData="transferData" @onUpdate="onUpdate"
@close="close"></m-transfer>
- </el-dialog>
</div>
</template>
<script>
- import _ from 'lodash'
- import i18n from '@/module/i18n'
import { mapActions } from 'vuex'
- import mTransfer from '@/module/components/transfer/transfer'
export default {
name: 'user-list',
data () {
return {
list: [],
- transferDialog: false,
- item: {},
- transferData: {
- sourceListPrs: [],
- targetListPrs: [],
- type: {
- name: `${i18n.$t('Managing Users')}`
- }
- }
+ item: {}
}
},
props: {
@@ -95,7 +76,7 @@
pageSize: Number
},
methods: {
- ...mapActions('security', ['deleteAlertgrou', 'getAuthList',
'grantAuthorization']),
+ ...mapActions('security', ['deleteAlertgrou', 'grantAuthorization']),
_delete (item, i) {
this.deleteAlertgrou({
id: item.id
@@ -109,40 +90,6 @@
_edit (item) {
this.$emit('on-edit', item)
},
- _mangeUser (item, i) {
- this.getAuthList({
- id: item.id,
- type: 'user',
- category: 'users'
- }).then(data => {
- let sourceListPrs = _.map(data[0], v => {
- return {
- id: v.id,
- name: v.userName
- }
- })
- let targetListPrs = _.map(data[1], v => {
- return {
- id: v.id,
- name: v.userName
- }
- })
- this.item = item
- this.transferData.sourceListPrs = sourceListPrs
- this.transferData.targetListPrs = targetListPrs
- this.transferDialog = true
- })
- },
- onUpdate (userIds) {
- this._grantAuthorization('alert-group/grant-user', {
- userIds: userIds,
- alertgroupId: this.item.id
- })
- this.transferDialog = false
- },
- close () {
- this.transferDialog = false
- },
_grantAuthorization (api, param) {
this.grantAuthorization({
@@ -168,6 +115,6 @@
},
mounted () {
},
- components: { mTransfer }
+ components: {}
}
</script>
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 7f895db..9591302 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -806,18 +806,6 @@ export default {
})
})
},
- /**
- * Get the mailbox list interface
- */
- getReceiver ({ state }, payload) {
- return new Promise((resolve, reject) => {
- io.get(`projects/${state.projectName}/executors/get-receiver-cc`,
payload, res => {
- resolve(res.data)
- }).catch(e => {
- reject(e)
- })
- })
- },
getTaskListDefIdAll ({ state }, payload) {
return new Promise((resolve, reject) => {
io.get(`projects/${state.projectName}/process/get-task-list`, payload,
res => {
