fix: Fix job name search (#1282)

Co-authored-by: Tiffany K <[email protected]>
screwdriver-cd · Dec 5, 2024 · 1a114de · 1a114de
1 parent 9b92624
commit 1a114de
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 39 deletions.
diff --git a/app/components/pipeline/jobs/table/cell/job/component.js b/app/components/pipeline/jobs/table/cell/job/component.js
@@ -1,7 +1,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { statusIcon } from 'screwdriver-ui/utils/build';
-import getDisplayName from './util';
 
 export default class PipelineJobsTableCellJobComponent extends Component {
   @tracked latestBuild;
@@ -26,8 +25,4 @@ export default class PipelineJobsTableCellJobComponent extends Component {
 
     this.args.record.onDestroy(this.args.record.job);
   }
-
-  get jobName() {
-    return getDisplayName(this.args.record.job);
-  }
 }
diff --git a/app/components/pipeline/jobs/table/cell/job/template.hbs b/app/components/pipeline/jobs/table/cell/job/template.hbs
@@ -21,6 +21,6 @@
     <BsTooltip @placement="bottom">
       {{@record.job.name}}
     </BsTooltip>
-    {{this.jobName}}
+    {{@record.jobName}}
   </div>
 </div>
diff --git a/app/components/pipeline/jobs/table/component.js b/app/components/pipeline/jobs/table/component.js
@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { service } from '@ember/service';
 import { action } from '@ember/object';
 import DataReloader from './dataReloader';
+import getDisplayName from './util';
 
 const INITIAL_PAGE_SIZE = 10;
 
@@ -75,7 +76,7 @@ export default class PipelineJobsTableComponent extends Component {
     this.args.jobs.forEach(job => {
       this.data.push({
         job,
-        jobName: job.name,
+        jobName: getDisplayName(job),
         stageName: job?.permutations?.[0]?.stage?.name || 'N/A',
         pipeline: this.args.pipeline,
         jobs: this.args.jobs,

diff --git a/...ents/pipeline/jobs/table/cell/job/util.js → app/components/pipeline/jobs/table/util.js b/...ents/pipeline/jobs/table/cell/job/util.js → app/components/pipeline/jobs/table/util.js
diff --git a/tests/integration/components/pipeline/jobs/table/cell/job/component-test.js b/tests/integration/components/pipeline/jobs/table/cell/job/component-test.js
@@ -10,11 +10,12 @@ module(
     setupRenderingTest(hooks);
 
     test('it renders', async function (assert) {
-      const job = { id: 123, name: 'main' };
+      const jobName = 'main';
 
       this.setProperties({
         record: {
-          job,
+          job: { id: 123, name: 'main' },
+          jobName,
           onCreate: () => {},
           onDestroy: () => {}
         }
@@ -26,7 +27,7 @@ module(
         />`
       );
 
-      assert.dom('.job-name').hasText(job.name);
+      assert.dom('.job-name').hasText(jobName);
     });
 
     test('it calls onCreate', async function (assert) {
@@ -36,6 +37,7 @@ module(
       this.setProperties({
         record: {
           job,
+          jobName: 'main',
           onCreate,
           onDestroy: () => {}
         }
@@ -58,6 +60,7 @@ module(
       this.setProperties({
         record: {
           job,
+          jobName: 'main',
           onCreate: () => {},
           onDestroy
         }
@@ -73,32 +76,5 @@ module(
       assert.equal(onDestroy.calledOnce, true);
       assert.equal(onDestroy.calledWith(job), true);
     });
-
-    test('it uses display name if annotation is set', async function (assert) {
-      const displayName = 'Display me';
-      const job = {
-        id: 123,
-        name: 'main',
-        permutations: [
-          { annotations: { 'screwdriver.cd/displayName': displayName } }
-        ]
-      };
-
-      this.setProperties({
-        record: {
-          job,
-          onCreate: () => {},
-          onDestroy: () => {}
-        }
-      });
-
-      await render(
-        hbs`<Pipeline::Jobs::Table::Cell::Job
-            @record={{this.record}}
-        />`
-      );
-
-      assert.dom('.job-name').hasText(displayName);
-    });
   }
 );
diff --git a/...pipeline/jobs/table/cell/job/util-test.js → ...mponents/pipeline/jobs/table/util-test.js b/...pipeline/jobs/table/cell/job/util-test.js → ...mponents/pipeline/jobs/table/util-test.js
@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
-import getDisplayName from 'screwdriver-ui/components/pipeline/jobs/table/cell/job/util';
+import getDisplayName from 'screwdriver-ui/components/pipeline/jobs/table/util';
 
-module('Unit | Component | pipeline/jobs/table/cell/job/util', function () {
+module('Unit | Component | pipeline/jobs/table/util', function () {
   test('getDisplayName uses job name', function (assert) {
     const job = { name: 'abc123' };