From a95ae41d23e1222a8a9a51bb375ca6bc2a639658 Mon Sep 17 00:00:00 2001
From: Jody <qizhaodi@koderover.com>
Date: Fri, 31 Dec 2021 15:02:06 +0800
Subject: [PATCH 1/4] feat: add notification in test case

Signed-off-by: Jody <qizhaodi@koderover.com>
---
 .../product_pipeline/switch_tab/notify.vue    | 54 +++++++++++++------
 .../test/common/function/function_detail.vue  | 37 ++++++++++++-
 2 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
index 22ad40fe5..ff14c54ef 100644
--- a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
+++ b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
@@ -1,8 +1,6 @@
 <template>
-  <div class="notify">
-    <el-card class="box-card">
-      <div>
-        <div class="script dashed-container">
+    <el-card class="notify box-card">
+        <div class="script dashed-container" v-if="showTitle">
           <span class="title">通知</span>
         </div>
         <div class="notify dashed-container">
@@ -102,18 +100,13 @@
                              @change="handleCheckAllChange">全选</el-checkbox>
                 <el-checkbox-group @change="handleCheckedValueChange"
                                    v-model="notify.notify_type">
-                  <el-checkbox label="passed">任务成功</el-checkbox>
-                  <el-checkbox label="failed">任务失败</el-checkbox>
-                  <el-checkbox label="timeout">任务超时</el-checkbox>
-                  <el-checkbox label="cancelled">任务取消</el-checkbox>
+                  <el-checkbox v-for="type in notifyType" :key="type.label" :label="type.label">{{type.desc}}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-form>
           </div>
         </div>
-      </div>
     </el-card>
-  </div>
 </template>
 
 <script type="text/javascript">
@@ -121,6 +114,28 @@ import bus from '@utils/event_bus'
 
 export default {
   data () {
+    this.notifyType = [
+      {
+        label: 'passed',
+        desc: '任务成功'
+      },
+      {
+        label: 'failed',
+        desc: '任务失败'
+      },
+      {
+        label: 'timeout',
+        desc: '任务超时'
+      },
+      {
+        label: 'cancelled',
+        desc: '任务取消'
+      },
+      {
+        label: 'update',
+        desc: '状态变更'
+      }
+    ]
     return {
       isIndeterminate: true,
       notifyRules: {
@@ -170,7 +185,10 @@ export default {
   computed: {
     checkAll: {
       get: function () {
-        return this.notify.notify_type.length === 4
+        return this.notify.notify_type.length === this.notifyType.length
+      },
+      set (val) {
+        return val
       }
     },
     'notify.at_mobiles': {
@@ -200,13 +218,13 @@ export default {
   },
   methods: {
     handleCheckAllChange (val) {
-      this.notify.notify_type = val ? ['timeout', 'passed', 'failed', 'cancelled'] : []
+      this.notify.notify_type = val ? this.notifyType.map(type => type.label) : []
       this.isIndeterminate = false
     },
     handleCheckedValueChange (value) {
+      const typeLength = this.notifyType.length
       const checkedCount = value.length
-      this.checkAll = (checkedCount === 4)
-      this.isIndeterminate = (checkedCount > 0 && checkedCount < 4)
+      this.isIndeterminate = (checkedCount > 0 && checkedCount < typeLength)
     },
     clearForm () {
       this.$refs.notify.clearValidate()
@@ -220,6 +238,10 @@ export default {
     editMode: {
       required: true,
       type: Boolean
+    },
+    showTitle: {
+      type: Boolean,
+      default: true
     }
   },
 
@@ -238,8 +260,7 @@ export default {
 </script>
 
 <style lang="less">
-.notify {
-  .box-card {
+  .notify.box-card {
     .el-card__header {
       text-align: center;
     }
@@ -286,5 +307,4 @@ export default {
       }
     }
   }
-}
 </style>
diff --git a/src/components/projects/test/common/function/function_detail.vue b/src/components/projects/test/common/function/function_detail.vue
index fe8009e21..10b550690 100644
--- a/src/components/projects/test/common/function/function_detail.vue
+++ b/src/components/projects/test/common/function/function_detail.vue
@@ -207,6 +207,19 @@
       </div>
       <div class="divider">
       </div>
+      <label class="title">
+        <span>通知</span>
+        <el-button @click="test.notify_ctl.enabled = !test.notify_ctl.enabled"
+                    type="text">{{test.notify_ctl.enabled ? '删除': '添加'}}</el-button>
+      </label>
+      <Notify v-if="test.notify_ctl.enabled"
+              ref="notify"
+              class="notification"
+              :editMode="isEdit"
+              :notify="test.notify_ctl"
+              :showTitle="false"></Notify>
+      <div class="divider">
+      </div>
       <label class="title">
         <slot name="label">
           <span>测试报告</span>
@@ -354,6 +367,8 @@ import testTrigger from '@/components/common/test_trigger.vue'
 import bus from '@utils/event_bus'
 import ValidateSubmit from '@utils/validate_async'
 import Editor from 'vue2-ace-bind'
+import Notify from '@/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue'
+
 import {
   getAllAppsAPI, getCodeSourceMaskedAPI, createTestAPI, updateTestAPI, singleTestAPI
 } from '@api'
@@ -388,6 +403,11 @@ export default {
           enabled: false,
           items: []
         },
+        notify_ctl: {
+          enabled: false,
+          weChat_webHook: '',
+          notify_type: []
+        },
         pre_test: {
           enable_proxy: false,
           clean_workspace: false,
@@ -607,6 +627,7 @@ export default {
       const refs = [this.$refs['test-form']]
         .concat(this.$refs.install_items_ref)
         .concat(this.$refs.env_ref)
+        .concat(this.$refs.notify && this.$refs.notify.$refs.notify)
         .filter(r => r)
       const res = await this.validObj.validateAll()
       if (!res[1]) {
@@ -697,6 +718,13 @@ export default {
             items: []
           })
         }
+        if (!res.notify_ctl) {
+          this.$set(this.test, 'notify_ctl', {
+            enabled: false,
+            weChat_webHook: '',
+            notify_type: []
+          })
+        }
         if (this.test.artifact_paths.length === 0) {
           this.addArtifactPath()
         }
@@ -719,7 +747,8 @@ export default {
   components: {
     Editor,
     testTrigger,
-    BuildEnv
+    BuildEnv,
+    Notify
   }
 }
 </script>
@@ -755,6 +784,12 @@ export default {
     .el-form-item__label {
       text-align: left;
     }
+
+    .notification {
+      /deep/.el-card__body {
+        padding: 0 20px 6px;
+      }
+    }
   }
 
   .show-one-line {

From d68ba1b91ffd2be8b235ad8084b8f310b3a26519 Mon Sep 17 00:00:00 2001
From: Jody <qizhaodi@koderover.com>
Date: Fri, 31 Dec 2021 15:08:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style=EF=BC=9A=20delete=20useless=20space?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jody <qizhaodi@koderover.com>
---
 .../product_pipeline/switch_tab/notify.vue    | 284 +++++++++---------
 1 file changed, 142 insertions(+), 142 deletions(-)

diff --git a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
index ff14c54ef..204d75942 100644
--- a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
+++ b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
@@ -1,112 +1,112 @@
 <template>
-    <el-card class="notify box-card">
-        <div class="script dashed-container" v-if="showTitle">
-          <span class="title">通知</span>
-        </div>
-        <div class="notify dashed-container">
-          <div class="notify-container">
-            <el-form :model="notify"
-                     :rules="notifyRules"
-                     label-position="top"
-                     ref="notify">
-              <el-form-item prop="webhook_type">
-                <span slot="label">
-                  <span>Webhook 类型：</span>
-                </span>
-                <el-select v-model="notify.webhook_type"
-                           @change="clearForm"
-                           style="width: 350px;"
-                           size="small"
-                           placeholder="请选择类型">
-                  <el-option label="钉钉"
-                             value="dingding">
-                  </el-option>
-                  <el-option label="企业微信"
-                             value="wechat">
-                  </el-option>
-                  <el-option label="飞书"
-                             value="feishu">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item v-if="notify.webhook_type==='feishu'"
-                            prop="feishu_webhook">
-                <span slot="label">
-                  <span>Webhook 地址：
-                    <el-tooltip class="item"
-                                effect="dark"
-                                content="点击查看飞书 webhook 配置文档"
-                                placement="top">
-                      <a class="help-link"
-                         href="https://docs.koderover.com/zadig/project/workflow/#%E7%8A%B6%E6%80%81%E9%80%9A%E7%9F%A5"
-                         target="_blank"><i class="el-icon-question"></i></a>
-                    </el-tooltip></span>
-                </span>
-                <el-input style="width: 350px;"
-                          size="small"
-                          v-model="notify.feishu_webhook"></el-input>
-              </el-form-item>
-              <el-form-item v-if="notify.webhook_type==='wechat'"
-                            prop="weChat_webHook">
-                <span slot="label">
-                  <span>Webhook 地址：
-                    <el-tooltip class="item"
-                                effect="dark"
-                                content="点击查看企业微信 webhook 配置文档"
-                                placement="top">
-                      <a class="help-link"
-                         href="https://docs.koderover.com/zadig/project/workflow/#%E7%8A%B6%E6%80%81%E9%80%9A%E7%9F%A5"
-                         target="_blank"><i class="el-icon-question"></i></a>
-                    </el-tooltip></span>
-                </span>
-                <el-input style="width: 350px;"
-                          size="small"
-                          v-model="notify.weChat_webHook"></el-input>
-              </el-form-item>
-              <el-form-item v-if="notify.webhook_type==='dingding'"
-                            prop="dingding_webhook">
-                <span slot="label">
-                  <span>Webhook 地址：
-                    <el-tooltip class="item"
-                                effect="dark"
-                                content="点击查看钉钉 webhook 配置文档"
-                                placement="top">
-                      <a class="help-link"
-                         href="https://docs.koderover.com/zadig/project/workflow/#%E7%8A%B6%E6%80%81%E9%80%9A%E7%9F%A5"
-                         target="_blank"><i class="el-icon-question"></i></a>
-                    </el-tooltip></span>
-                </span>
-                <el-input style="width: 350px;"
-                          size="small"
-                          v-model="notify.dingding_webhook"></el-input>
-              </el-form-item>
-              <el-form-item v-if="notify.webhook_type==='dingding'"
-                            prop="at_mobiles">
-                <span slot="label">
-                  <span>@指定成员（输入指定通知接收人的手机号码，使用 ; 分割，为空则全员通知）：</span>
-                </span>
-                <el-input style="width: 350px;"
-                          type="textarea"
-                          :rows="3"
-                          placeholder="输入指定通知接收人的手机号码，使用用 ; 分割"
-                          v-model="mobileStr">
-                </el-input>
-              </el-form-item>
+  <el-card class="notify box-card">
+    <div class="script dashed-container" v-if="showTitle">
+      <span class="title">通知</span>
+    </div>
+    <div class="notify dashed-container">
+      <div class="notify-container">
+        <el-form :model="notify"
+                  :rules="notifyRules"
+                  label-position="top"
+                  ref="notify">
+          <el-form-item prop="webhook_type">
+            <span slot="label">
+              <span>Webhook 类型：</span>
+            </span>
+            <el-select v-model="notify.webhook_type"
+                        @change="clearForm"
+                        style="width: 350px;"
+                        size="small"
+                        placeholder="请选择类型">
+              <el-option label="钉钉"
+                          value="dingding">
+              </el-option>
+              <el-option label="企业微信"
+                          value="wechat">
+              </el-option>
+              <el-option label="飞书"
+                          value="feishu">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="notify.webhook_type==='feishu'"
+                        prop="feishu_webhook">
+            <span slot="label">
+              <span>Webhook 地址：
+                <el-tooltip class="item"
+                            effect="dark"
+                            content="点击查看飞书 webhook 配置文档"
+                            placement="top">
+                  <a class="help-link"
+                      href="https://docs.koderover.com/zadig/project/workflow/#%E7%8A%B6%E6%80%81%E9%80%9A%E7%9F%A5"
+                      target="_blank"><i class="el-icon-question"></i></a>
+                </el-tooltip></span>
+            </span>
+            <el-input style="width: 350px;"
+                      size="small"
+                      v-model="notify.feishu_webhook"></el-input>
+          </el-form-item>
+          <el-form-item v-if="notify.webhook_type==='wechat'"
+                        prop="weChat_webHook">
+            <span slot="label">
+              <span>Webhook 地址：
+                <el-tooltip class="item"
+                            effect="dark"
+                            content="点击查看企业微信 webhook 配置文档"
+                            placement="top">
+                  <a class="help-link"
+                      href="https://docs.koderover.com/zadig/project/workflow/#%E7%8A%B6%E6%80%81%E9%80%9A%E7%9F%A5"
+                      target="_blank"><i class="el-icon-question"></i></a>
+                </el-tooltip></span>
+            </span>
+            <el-input style="width: 350px;"
+                      size="small"
+                      v-model="notify.weChat_webHook"></el-input>
+          </el-form-item>
+          <el-form-item v-if="notify.webhook_type==='dingding'"
+                        prop="dingding_webhook">
+            <span slot="label">
+              <span>Webhook 地址：
+                <el-tooltip class="item"
+                            effect="dark"
+                            content="点击查看钉钉 webhook 配置文档"
+                            placement="top">
+                  <a class="help-link"
+                      href="https://docs.koderover.com/zadig/project/workflow/#%E7%8A%B6%E6%80%81%E9%80%9A%E7%9F%A5"
+                      target="_blank"><i class="el-icon-question"></i></a>
+                </el-tooltip></span>
+            </span>
+            <el-input style="width: 350px;"
+                      size="small"
+                      v-model="notify.dingding_webhook"></el-input>
+          </el-form-item>
+          <el-form-item v-if="notify.webhook_type==='dingding'"
+                        prop="at_mobiles">
+            <span slot="label">
+              <span>@指定成员（输入指定通知接收人的手机号码，使用 ; 分割，为空则全员通知）：</span>
+            </span>
+            <el-input style="width: 350px;"
+                      type="textarea"
+                      :rows="3"
+                      placeholder="输入指定通知接收人的手机号码，使用用 ; 分割"
+                      v-model="mobileStr">
+            </el-input>
+          </el-form-item>
 
-              <el-form-item prop="notify_type"
-                            label="通知事件：">
-                <el-checkbox :indeterminate="isIndeterminate"
-                             v-model="checkAll"
-                             @change="handleCheckAllChange">全选</el-checkbox>
-                <el-checkbox-group @change="handleCheckedValueChange"
-                                   v-model="notify.notify_type">
-                  <el-checkbox v-for="type in notifyType" :key="type.label" :label="type.label">{{type.desc}}</el-checkbox>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-form>
-          </div>
-        </div>
-    </el-card>
+          <el-form-item prop="notify_type"
+                        label="通知事件：">
+            <el-checkbox :indeterminate="isIndeterminate"
+                          v-model="checkAll"
+                          @change="handleCheckAllChange">全选</el-checkbox>
+            <el-checkbox-group @change="handleCheckedValueChange"
+                                v-model="notify.notify_type">
+              <el-checkbox v-for="type in notifyType" :key="type.label" :label="type.label">{{type.desc}}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </el-card>
 </template>
 
 <script type="text/javascript">
@@ -260,51 +260,51 @@ export default {
 </script>
 
 <style lang="less">
-  .notify.box-card {
-    .el-card__header {
-      text-align: center;
-    }
+.notify.box-card {
+  .el-card__header {
+    text-align: center;
+  }
 
-    .el-form {
-      .el-form-item {
-        margin-bottom: 5px;
+  .el-form {
+    .el-form-item {
+      margin-bottom: 5px;
 
-        .env-form-inline {
-          width: 100%;
-        }
+      .env-form-inline {
+        width: 100%;
       }
     }
+  }
 
-    .divider {
-      width: 100%;
-      height: 1px;
-      margin: 13px 0;
-      background-color: #dfe0e6;
-    }
+  .divider {
+    width: 100%;
+    height: 1px;
+    margin: 13px 0;
+    background-color: #dfe0e6;
+  }
 
-    .notify-container {
-      margin: 10px 0;
-    }
+  .notify-container {
+    margin: 10px 0;
+  }
 
-    .help-link {
-      color: #303133;
-    }
+  .help-link {
+    color: #303133;
+  }
 
-    .script {
-      padding: 5px 0;
+  .script {
+    padding: 5px 0;
 
-      .title {
-        display: inline-block;
-        width: 100px;
-        padding-top: 6px;
-        color: #606266;
-        font-size: 14px;
-      }
+    .title {
+      display: inline-block;
+      width: 100px;
+      padding-top: 6px;
+      color: #606266;
+      font-size: 14px;
+    }
 
-      .item-title {
-        margin-left: 5px;
-        color: #909399;
-      }
+    .item-title {
+      margin-left: 5px;
+      color: #909399;
     }
   }
+}
 </style>

From c9e0441fe8169b97e9285535a18bb19be4a7b098 Mon Sep 17 00:00:00 2001
From: Jody <qizhaodi@koderover.com>
Date: Thu, 13 Jan 2022 14:32:33 +0800
Subject: [PATCH 3/4] fix: workflow notify don't support status changed

Signed-off-by: Jody <qizhaodi@koderover.com>
---
 .../product_pipeline/switch_tab/notify.vue    | 51 +++++++++++--------
 .../test/common/function/function_detail.vue  |  3 +-
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
index 204d75942..ae38db410 100644
--- a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
+++ b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
@@ -114,29 +114,29 @@ import bus from '@utils/event_bus'
 
 export default {
   data () {
-    this.notifyType = [
-      {
-        label: 'passed',
-        desc: '任务成功'
-      },
-      {
-        label: 'failed',
-        desc: '任务失败'
-      },
-      {
-        label: 'timeout',
-        desc: '任务超时'
-      },
-      {
-        label: 'cancelled',
-        desc: '任务取消'
-      },
-      {
-        label: 'update',
-        desc: '状态变更'
-      }
-    ]
     return {
+      notifyType: [
+        {
+          label: 'passed',
+          desc: '任务成功'
+        },
+        {
+          label: 'failed',
+          desc: '任务失败'
+        },
+        {
+          label: 'timeout',
+          desc: '任务超时'
+        },
+        {
+          label: 'cancelled',
+          desc: '任务取消'
+        },
+        {
+          label: 'changed',
+          desc: '状态变更'
+        }
+      ],
       isIndeterminate: true,
       notifyRules: {
         webhook_type: [
@@ -242,6 +242,10 @@ export default {
     showTitle: {
       type: Boolean,
       default: true
+    },
+    fromWorkflow: {
+      type: Boolean,
+      default: true
     }
   },
 
@@ -251,6 +255,9 @@ export default {
         bus.$emit('receive-tab-check:notify', valid)
       })
     })
+    if (this.fromWorkflow) {
+      this.notifyType.pop()
+    }
   },
   beforeDestroy () {
     bus.$off('check-tab:notify')
diff --git a/src/components/projects/test/common/function/function_detail.vue b/src/components/projects/test/common/function/function_detail.vue
index 10b550690..b4e2e41fb 100644
--- a/src/components/projects/test/common/function/function_detail.vue
+++ b/src/components/projects/test/common/function/function_detail.vue
@@ -217,7 +217,8 @@
               class="notification"
               :editMode="isEdit"
               :notify="test.notify_ctl"
-              :showTitle="false"></Notify>
+              :showTitle="false"
+              :fromWorkflow="false"></Notify>
       <div class="divider">
       </div>
       <label class="title">

From b4ece98ffe3fb0135ba21a150a2ee282a152b743 Mon Sep 17 00:00:00 2001
From: Jody <qizhaodi@koderover.com>
Date: Mon, 17 Jan 2022 17:21:33 +0800
Subject: [PATCH 4/4] chore: add comment for status changed

Signed-off-by: Jody <qizhaodi@koderover.com>
---
 .../edit_pipeline/product_pipeline/switch_tab/notify.vue      | 1 +
 .../projects/test/common/function/function_detail.vue         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
index a0d1faa34..425c8df11 100644
--- a/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
+++ b/src/components/projects/edit_pipeline/product_pipeline/switch_tab/notify.vue
@@ -255,6 +255,7 @@ export default {
         bus.$emit('receive-tab-check:notify', valid)
       })
     })
+    // workflow don't show status changed
     if (this.fromWorkflow) {
       this.notifyType.pop()
     }
diff --git a/src/components/projects/test/common/function/function_detail.vue b/src/components/projects/test/common/function/function_detail.vue
index 39ab0a780..850873bc3 100644
--- a/src/components/projects/test/common/function/function_detail.vue
+++ b/src/components/projects/test/common/function/function_detail.vue
@@ -213,7 +213,7 @@
                     type="text">{{test.notify_ctl.enabled ? '删除': '添加'}}</el-button>
       </label>
       <Notify v-if="test.notify_ctl.enabled"
-              ref="notify"
+              ref="notifyComp"
               class="notification"
               :editMode="isEdit"
               :notify="test.notify_ctl"
@@ -628,7 +628,7 @@ export default {
       const refs = [this.$refs['test-form']]
         .concat(this.$refs.install_items_ref)
         .concat(this.$refs.env_ref)
-        .concat(this.$refs.notify && this.$refs.notify.$refs.notify)
+        .concat(this.$refs.notifyComp && this.$refs.notifyComp.$refs.notify)
         .filter(r => r)
       const res = await this.validObj.validateAll()
       if (!res[1]) {