From b1ef9d17a8e1bfb81e761c6c84c31aa64faebf27 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Wed, 29 Jul 2020 11:17:39 -0500 Subject: [PATCH] Change job search navigation to use id This fixes #8548. It was a significant oversight to use the name instead of the id! --- ui/app/components/global-search/control.js | 2 +- ui/tests/acceptance/search-test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/app/components/global-search/control.js b/ui/app/components/global-search/control.js index 6c97b767f393..ef125dda5ef2 100644 --- a/ui/app/components/global-search/control.js +++ b/ui/app/components/global-search/control.js @@ -92,7 +92,7 @@ export default class GlobalSearchControl extends Component { const itemModelName = model.constructor.modelName; if (itemModelName === 'job') { - this.router.transitionTo('jobs.job', model.name, { + this.router.transitionTo('jobs.job', model.plainId, { queryParams: { namespace: model.get('namespace.name') }, }); } else if (itemModelName === 'node') { diff --git a/ui/tests/acceptance/search-test.js b/ui/tests/acceptance/search-test.js index a07869c10666..055f36247593 100644 --- a/ui/tests/acceptance/search-test.js +++ b/ui/tests/acceptance/search-test.js @@ -22,7 +22,7 @@ module('Acceptance | search', function(hooks) { const otherNode = server.create('node', { name: 'aaa' }); server.create('job', { id: 'vwxyz', namespaceId: 'default' }); - server.create('job', { id: 'xyz', namespace: 'default' }); + server.create('job', { id: 'xyz', name: 'xyz job', namespace: 'default' }); server.create('job', { id: 'abc', namespace: 'default' }); await visit('/'); @@ -43,7 +43,7 @@ module('Acceptance | search', function(hooks) { search.groups[0].as(jobs => { assert.equal(jobs.name, 'Jobs (2)'); assert.equal(jobs.options.length, 2); - assert.equal(jobs.options[0].text, 'xyz'); + assert.equal(jobs.options[0].text, 'xyz job'); assert.equal(jobs.options[1].text, 'vwxyz'); });