diff --git a/.changelog/11357.txt b/.changelog/11357.txt new file mode 100644 index 0000000000000000000000000000000000000000..f1f4c819b45ee06eb092039775711914950f64bd --- /dev/null +++ b/.changelog/11357.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: Display jobs from all namespaces by default +``` diff --git a/ui/app/controllers/csi/volumes/index.js b/ui/app/controllers/csi/volumes/index.js index da67964c90f4ff82c842e352966ec703d2d87d1f..eb3b12e78ffe63ffce854f7ecbf485c18dfe5363 100644 --- a/ui/app/controllers/csi/volumes/index.js +++ b/ui/app/controllers/csi/volumes/index.js @@ -80,7 +80,7 @@ export default class IndexController extends Controller.extend( // eslint-disable-next-line ember/no-incorrect-calls-with-inline-anonymous-functions scheduleOnce('actions', () => { // eslint-disable-next-line ember/no-side-effects - this.set('qpNamespace', this.system.cachedNamespace || 'default'); + this.set('qpNamespace', this.system.cachedNamespace || '*'); }); } diff --git a/ui/app/controllers/jobs/index.js b/ui/app/controllers/jobs/index.js index 4dcf47d622717a72cbd11c6ee0630eee48ff5157..0fb9e0288c2dff3d5c703c3fbcdb87a64e208d86 100644 --- a/ui/app/controllers/jobs/index.js +++ b/ui/app/controllers/jobs/index.js @@ -169,7 +169,7 @@ export default class IndexController extends Controller.extend(Sortable, Searcha if (!availableNamespaces.mapBy('key').includes(this.qpNamespace)) { scheduleOnce('actions', () => { // eslint-disable-next-line ember/no-side-effects - this.set('qpNamespace', this.system.cachedNamespace || 'default'); + this.set('qpNamespace', this.system.cachedNamespace || '*'); }); } diff --git a/ui/app/controllers/optimize.js b/ui/app/controllers/optimize.js index eed3f33eabf40bf877b9c0437b08f0fbdec7052c..b5c438a99fc20d1eea22a1f6e20538a1f9005771 100644 --- a/ui/app/controllers/optimize.js +++ b/ui/app/controllers/optimize.js @@ -84,7 +84,7 @@ export default class OptimizeController extends Controller { if (!availableNamespaces.mapBy('key').includes(this.qpNamespace)) { scheduleOnce('actions', () => { // eslint-disable-next-line ember/no-side-effects - this.qpNamespace = this.system.cachedNamespace || 'default'; + this.qpNamespace = this.system.cachedNamespace || '*'; }); } diff --git a/ui/tests/acceptance/jobs-list-test.js b/ui/tests/acceptance/jobs-list-test.js index ada334696460e431a7f6d4b3bcc436891c0c9977..6a0038303f4ca1cf97ea9a1e296b32c0df711c5e 100644 --- a/ui/tests/acceptance/jobs-list-test.js +++ b/ui/tests/acceptance/jobs-list-test.js @@ -162,7 +162,10 @@ module('Acceptance | jobs list', function(hooks) { const job2 = server.create('job', { namespaceId: server.db.namespaces[1].id }); await JobsList.visit(); + assert.equal(JobsList.jobs.length, 2, 'All jobs by default'); + const firstNamespace = server.db.namespaces[0]; + await JobsList.visit({ namespace: firstNamespace.id }); assert.equal(JobsList.jobs.length, 1, 'One job in the default namespace'); assert.equal(JobsList.jobs.objectAt(0).name, job1.name, 'The correct job is shown'); diff --git a/ui/tests/acceptance/optimize-test.js b/ui/tests/acceptance/optimize-test.js index 435d9ae682658eb3b47a8783babaf7c13492c20c..1826e33c670c1aad79f7187350ef991823abf3d1 100644 --- a/ui/tests/acceptance/optimize-test.js +++ b/ui/tests/acceptance/optimize-test.js @@ -359,7 +359,7 @@ module('Acceptance | optimize', function(hooks) { window.localStorage.nomadTokenSecret = clientToken.secretId; await Optimize.visit(); - assert.equal(currentURL(), '/jobs?namespace=default'); + assert.equal(currentURL(), '/jobs?namespace=*'); assert.ok(Layout.gutter.optimize.isHidden); }); diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js index 4a8a92fd477a5371c91229cd106a23f25f65400e..e15f47b627479d1e4cd17e812ef7b0c0eec64d46 100644 --- a/ui/tests/acceptance/task-detail-test.js +++ b/ui/tests/acceptance/task-detail-test.js @@ -298,7 +298,7 @@ module('Acceptance | task detail (different namespace)', function(hooks) { const job = server.db.jobs.find(jobId); await Layout.breadcrumbFor('jobs.index').visit(); - assert.equal(currentURL(), '/jobs?namespace=default', 'Jobs breadcrumb links correctly'); + assert.equal(currentURL(), '/jobs?namespace=*', 'Jobs breadcrumb links correctly'); await Task.visit({ id: allocation.id, name: task.name }); await Layout.breadcrumbFor('jobs.job.index').visit(); diff --git a/ui/tests/acceptance/volumes-list-test.js b/ui/tests/acceptance/volumes-list-test.js index 193d115f02ce26c4b50cf81d8e85dd4ea72faca0..bec92893f39577bbf78795245df78c9efdfad763 100644 --- a/ui/tests/acceptance/volumes-list-test.js +++ b/ui/tests/acceptance/volumes-list-test.js @@ -156,7 +156,10 @@ module('Acceptance | volumes list', function(hooks) { const volume2 = server.create('csi-volume', { namespaceId: server.db.namespaces[1].id }); await VolumesList.visit(); + assert.equal(VolumesList.volumes.length, 2); + const firstNamespace = server.db.namespaces[0]; + await VolumesList.visit({ namespace: firstNamespace.id }); assert.equal(VolumesList.volumes.length, 1); assert.equal(VolumesList.volumes.objectAt(0).name, volume1.id);