You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2020/09/14 02:25:43 UTC
[GitHub] [incubator-dolphinscheduler] break60 opened a new pull request #3734: [feature][ui]Alert plugin design
break60 opened a new pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734
issue 3049
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] sonarcloud[bot] commented on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-692409349
Kudos, SonarCloud Quality Gate passed!
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug.png' alt='Bug' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability.png' alt='Vulnerability' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) (and [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot.png' alt='Security Hotspot' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/proje
ct/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=SECURITY_HOTSPOT) to review)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell.png' alt='Code Smell' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL) [2 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo.png' alt='No Coverage information' width='16' height='16' />](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=coverage&view=list) No Coverage information
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/3.png' alt='0.0%' width='16' height='16' />](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=new_duplicated_lines_density&view=list)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] qiaozhanwei merged pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
qiaozhanwei merged pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] gaojun2048 commented on a change in pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
gaojun2048 commented on a change in pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#discussion_r492489445
##########
File path: dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
##########
@@ -0,0 +1,224 @@
+/*
+ * 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.
+ */
+<template>
+ <div class="list-model">
+ <!-- <div class="table-box">
+ <table>
+ <tr>
+ <th>
+ <span>{{$t('#')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Instance type')}}</span>
+ </th>
+ <th>
+ <span>{{$t('name')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Create Time')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Update Time')}}</span>
+ </th>
+ <th width="120">
+ <span>{{$t('Operation')}}</span>
+ </th>
+ </tr>
+ <tr v-for="(item, $index) in list" :key="$index">
+ <td>
+ <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
+ </td>
+ <td>
+ <span>
+ {{item.groupName}}
+ </span>
+ </td>
+ <td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}}</span></td>
Review comment:
groupType need be delete too.
##########
File path: dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.
+ */
+<template>
+ <m-popup
+ ref="popup"
+ :ok-text="item ? $t('Edit') : $t('Submit')"
+ :nameText="item ? $t('Edit alarm group') : $t('Create alarm group')"
+ @ok="_ok">
+ <template slot="content">
+ <div class="create-warning-model">
+ <m-list-box-f>
+ <template slot="name"><strong>*</strong>{{$t('Group Name')}}</template>
+ <template slot="content">
+ <x-input
+ type="input"
+ v-model="groupName"
+ maxlength="60"
+ :placeholder="$t('Please enter group name')">
+ </x-input>
+ </template>
+ </m-list-box-f>
+ <m-list-box-f>
+ <template slot="name"><strong>*</strong>{{$t('Group Type')}}</template>
Review comment:
In this feature GroupType need be delete.
The previous options for groupType were email and SMS, but in this feature, AlertGroup no longer belongs to email or SMS. AlertGroup is just a collection of instances of alert plugins. So groupType should be deleted
##########
File path: dolphinscheduler-ui/src/js/conf/home/router/index.js
##########
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
Review comment:
can you change `alarm` to `alert` ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] gaojun2048 commented on a change in pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
gaojun2048 commented on a change in pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#discussion_r492498067
##########
File path: dolphinscheduler-ui/src/js/conf/home/router/index.js
##########
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
Review comment:
ok
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] break60 commented on a change in pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
break60 commented on a change in pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#discussion_r492496886
##########
File path: dolphinscheduler-ui/src/js/conf/home/router/index.js
##########
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
Review comment:
Okay, because the local library is re-forked, merge first, and then I modify it together
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] sonarcloud[bot] removed a comment on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] removed a comment on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-691777841
Kudos, SonarCloud Quality Gate passed!
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug.png' alt='Bug' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability.png' alt='Vulnerability' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) (and [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot.png' alt='Security Hotspot' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/proje
ct/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=SECURITY_HOTSPOT) to review)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell.png' alt='Code Smell' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL) [2 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo.png' alt='No Coverage information' width='16' height='16' />](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=coverage&view=list) No Coverage information
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/3.png' alt='0.0%' width='16' height='16' />](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=new_duplicated_lines_density&view=list)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] qiaozhanwei merged pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
qiaozhanwei merged pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] break60 commented on a change in pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
break60 commented on a change in pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#discussion_r492496886
##########
File path: dolphinscheduler-ui/src/js/conf/home/router/index.js
##########
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
Review comment:
Okay, because the local library is re-forked, merge first, and then I modify it together
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] break60 edited a comment on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
break60 edited a comment on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-696529232
At present, only a new instance page of the alarm plug-in is added. The fields in the list are copied from other pages. The back end can be coordinated and adjusted in the return field.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] codecov-commenter commented on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-692408643
# [Codecov](https://codecov.io/gh/apache/incubator-dolphinscheduler/pull/3734?src=pr&el=h1) Report
> :exclamation: No coverage uploaded for pull request base (`alert_plugin_design@5ee12d9`). [Click here to learn what that means](https://docs.codecov.io/docs/error-reference#section-missing-base-commit).
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-dolphinscheduler/pull/3734?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## alert_plugin_design #3734 +/- ##
======================================================
Coverage ? 39.89%
Complexity ? 2893
======================================================
Files ? 457
Lines ? 21665
Branches ? 2637
======================================================
Hits ? 8643
Misses ? 12205
Partials ? 817
```
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-dolphinscheduler/pull/3734?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-dolphinscheduler/pull/3734?src=pr&el=footer). Last update [5ee12d9...47e6196](https://codecov.io/gh/apache/incubator-dolphinscheduler/pull/3734?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] sonarcloud[bot] commented on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-691777841
Kudos, SonarCloud Quality Gate passed!
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug.png' alt='Bug' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=BUG)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability.png' alt='Vulnerability' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=VULNERABILITY) (and [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot.png' alt='Security Hotspot' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/proje
ct/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=SECURITY_HOTSPOT) to review)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell.png' alt='Code Smell' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL) [<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A.png' alt='A' width='16' height='16' />](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL) [2 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=3734&resolved=false&types=CODE_SMELL)
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo.png' alt='No Coverage information' width='16' height='16' />](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=coverage&view=list) No Coverage information
[<img src='https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/3.png' alt='0.0%' width='16' height='16' />](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=3734&metric=new_duplicated_lines_density&view=list)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] break60 commented on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
break60 commented on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-696529232
At present, only a new instance page of the alarm plug-in is added. The fields in the list are copied from other pages. The back end can be coordinated and adjusted in the return field.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] gaojun2048 commented on a change in pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
gaojun2048 commented on a change in pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#discussion_r492489445
##########
File path: dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
##########
@@ -0,0 +1,224 @@
+/*
+ * 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.
+ */
+<template>
+ <div class="list-model">
+ <!-- <div class="table-box">
+ <table>
+ <tr>
+ <th>
+ <span>{{$t('#')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Instance type')}}</span>
+ </th>
+ <th>
+ <span>{{$t('name')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Create Time')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Update Time')}}</span>
+ </th>
+ <th width="120">
+ <span>{{$t('Operation')}}</span>
+ </th>
+ </tr>
+ <tr v-for="(item, $index) in list" :key="$index">
+ <td>
+ <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
+ </td>
+ <td>
+ <span>
+ {{item.groupName}}
+ </span>
+ </td>
+ <td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}}</span></td>
Review comment:
groupType need be delete too.
##########
File path: dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.
+ */
+<template>
+ <m-popup
+ ref="popup"
+ :ok-text="item ? $t('Edit') : $t('Submit')"
+ :nameText="item ? $t('Edit alarm group') : $t('Create alarm group')"
+ @ok="_ok">
+ <template slot="content">
+ <div class="create-warning-model">
+ <m-list-box-f>
+ <template slot="name"><strong>*</strong>{{$t('Group Name')}}</template>
+ <template slot="content">
+ <x-input
+ type="input"
+ v-model="groupName"
+ maxlength="60"
+ :placeholder="$t('Please enter group name')">
+ </x-input>
+ </template>
+ </m-list-box-f>
+ <m-list-box-f>
+ <template slot="name"><strong>*</strong>{{$t('Group Type')}}</template>
Review comment:
In this feature GroupType need be delete.
The previous options for groupType were email and SMS, but in this feature, AlertGroup no longer belongs to email or SMS. AlertGroup is just a collection of instances of alert plugins. So groupType should be deleted
##########
File path: dolphinscheduler-ui/src/js/conf/home/router/index.js
##########
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
Review comment:
can you change `alarm` to `alert` ?
##########
File path: dolphinscheduler-ui/src/js/conf/home/router/index.js
##########
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
Review comment:
ok
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] break60 commented on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
break60 commented on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-696529232
At present, only a new instance page of the alarm plug-in is added. The fields in the list are copied from other pages. The back end can be coordinated and adjusted in the return field.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] break60 edited a comment on pull request #3734: [feature][ui]Alert plugin design
Posted by GitBox <gi...@apache.org>.
break60 edited a comment on pull request #3734:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/3734#issuecomment-696529232
At present, only a new instance page of the alarm plug-in is added. The fields in the list are copied from other pages. The back end can be coordinated and adjusted in the return field.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org