Merge pull request #272 from leozhang2018/fix-no-connectors

Show repo info in task list.
lilianzhu · Dec 8, 2021 · d1cdb28 · d1cdb28
2 parents 5a98aca + d318aa7
commit d1cdb28
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/src/common/task_list.vue b/src/common/task_list.vue
@@ -35,7 +35,20 @@
                        label="服务名称"
                        show-overflow-tooltip>
         <template slot-scope="{ row }">
-          <span>{{ row.build_services && row.build_services.length > 0 && row.build_services.slice().sort().join(', ') || 'N/A' }}</span>
+          <div v-for="(item,index) in getRepo(row)" :key="index">
+            <el-tooltip v-if="item.builds.length > 0" class="item" effect="light"  :open-delay="250" placement="right">
+              <div slot="content">
+                <div v-for="(build,buildIndex) in item.builds" :key="buildIndex">
+                  <span v-if="build.tag">Tag-{{build.tag }}</span>
+                  <span v-if="build.branch">Branch-{{ build.branch }}</span>
+                  <span v-if="build.pr">PR-{{ build.pr }}</span>
+                  <span v-if="build.commit_id">{{build.commit_id.substring(0, 7)}}</span>
+                </div>
+              </div>
+              <span class="service-name pointer">{{item.service_name}}</span>
+            </el-tooltip>
+             <span v-else class="service-name">{{item.service_name}}</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column width="120"
@@ -150,6 +163,7 @@
 <script>
 import { wordTranslate } from '@utils/word_translate.js'
 import moment from 'moment'
+import { get, orderBy } from 'lodash'
 export default {
   data () {
     return {
@@ -166,6 +180,16 @@ export default {
       })
       return env_name
     },
+    getRepo (row) {
+      const buildStage = row.stages.find(stage => stage.type === 'buildv2')
+      const buildStageArray = this.$utils.mapToArray(buildStage.sub_tasks, 'service_name').map((element) => {
+        return {
+          service_name: element.service_name,
+          builds: get(element, 'job_ctx.builds', '')
+        }
+      })
+      return orderBy(buildStageArray, ['service_name'], ['asc'])
+    },
     convertTimestamp (value) {
       return moment.unix(value).format('MM-DD HH:mm')
     },
@@ -249,3 +273,16 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+
+.task-list-container {
+  .service-name {
+    color: #000;
+    font-weight: 500;
+
+    &.pointer {
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/src/components/projects/pipeline/workflow_list/pipeline_row.vue b/src/components/projects/pipeline/workflow_list/pipeline_row.vue
@@ -31,6 +31,9 @@
         </header>
 
         <slot name="more"></slot>
+        <section class="desc">
+          <span>{{description}}</span>
+        </section>
         <section class="dash-basicinfo">
           <span class="avg-run-time">平均执行时间</span>
           <span class="value">{{avgRuntime}}</span>
@@ -113,6 +116,10 @@ export default {
     avgSuccessRate: {
       type: String,
       required: false
+    },
+    description: {
+      type: String,
+      required: false
     }
   },
   computed: {
@@ -266,6 +273,11 @@ export default {
         width: 19%;
       }
 
+      .desc {
+        color: #666;
+        font-size: 14px;
+      }
+
       .dash-basicinfo {
         width: 80px;
 

diff --git a/src/components/projects/pipeline/workflow_list/virtual_list_item.vue b/src/components/projects/pipeline/workflow_list/virtual_list_item.vue
@@ -13,6 +13,7 @@
                   :recentFailID="workflow.recentFailedTask?`#${workflow.recentFailedTask.taskID}`:'-'"
                   :recentFailLink="makeTaskDetailLink(workflow.projectName,workflow.recentFailedTask)"
                   :updateTime="$utils.convertTimestamp(workflow.update_time)"
+                  :description="workflow.description"
                   @refreshWorkflow="refreshWorkflow">
       <section slot="more"
                class="stages">