fix: display of tags on job/pipeline template details page (#1288)

screwdriver-cd · Dec 10, 2024 · ff5b06d · ff5b06d
1 parent 9c3963f
commit ff5b06d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/app/templates/job/detail/route.js b/app/templates/job/detail/route.js
@@ -61,18 +61,14 @@ export default Route.extend(AuthenticatedRouteMixin, {
         this.router.transitionTo('/404');
       }
 
-      templateTagData.forEach(tagObj => {
-        [templateData, templateDataFiltered].forEach(verPayload => {
-          const taggedVerObj = verPayload.find(
-            verObj => verObj.version === tagObj.version
-          );
+      [...templateData, ...templateDataFiltered].forEach(template => {
+        const tags = templateTagData.filter(
+          tag => template.version === tag.version
+        );
 
-          if (taggedVerObj) {
-            taggedVerObj.tag = taggedVerObj.tag
-              ? `${taggedVerObj.tag} ${tagObj.tag}`
-              : tagObj.tag;
-          }
-        });
+        if (!template.tag) {
+          template.tag = tags.map(tag => tag.tag).join(' ');
+        }
       });
 
       this.setProperties({

diff --git a/app/templates/pipeline/detail/controller.js b/app/templates/pipeline/detail/controller.js
@@ -137,11 +137,12 @@ export default class TemplatesPipelineDetailController extends Controller {
   }
 
   get filteredTemplates() {
+    const { pipelineTemplateVersions, pipelineTemplateTags } = this.model;
     const { startTime, endTime } = this;
     const startTimeInDate = new Date(startTime);
     const endTimeInDate = new Date(endTime);
 
-    let filteredVersions = this.model.pipelineTemplateVersions.filter(v => {
+    const filteredVersions = pipelineTemplateVersions.filter(v => {
       // TODO: polyfill pipeline template metrics data
       v.metrics = {
         jobs: { count: '' },
@@ -156,6 +157,16 @@ export default class TemplatesPipelineDetailController extends Controller {
       );
     });
 
+    filteredVersions.forEach(template => {
+      const tags = pipelineTemplateTags.filter(
+        tag => template.version === tag.version
+      );
+
+      if (!template.tag) {
+        template.tag = tags.map(tag => tag.tag).join(' ');
+      }
+    });
+
     return filteredVersions;
   }
 

diff --git a/tests/acceptance/pipeline-template-test.js b/tests/acceptance/pipeline-template-test.js
@@ -431,5 +431,9 @@ module('Acceptance | pipeline template', function (hooks) {
     assert
       .dom('div.parameters > span.value > ul > li > span.value')
       .includesText('value1');
+
+    assert
+      .dom('table.table td div.version-cell')
+      .includesText('1.0.3 - latest');
   });
 });