diff --git a/ui/app/components/job-page/abstract.js b/ui/app/components/job-page/abstract.js index 01f63b2cf..931c5c6db 100644 --- a/ui/app/components/job-page/abstract.js +++ b/ui/app/components/job-page/abstract.js @@ -11,7 +11,6 @@ export default Component.extend({ sortDescending: null, // Provide actions that require routing - onNamespaceChange() {}, gotoTaskGroup() {}, gotoJob() {}, diff --git a/ui/app/templates/components/job-page/batch.hbs b/ui/app/templates/components/job-page/batch.hbs index d9f8a1fa6..f11a77849 100644 --- a/ui/app/templates/components/job-page/batch.hbs +++ b/ui/app/templates/components/job-page/batch.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{job-page/parts/title job=job handleError=(action "handleError")}} diff --git a/ui/app/templates/components/job-page/parameterized-child.hbs b/ui/app/templates/components/job-page/parameterized-child.hbs index f0fcad10e..a5cbfb846 100644 --- a/ui/app/templates/components/job-page/parameterized-child.hbs +++ b/ui/app/templates/components/job-page/parameterized-child.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}} diff --git a/ui/app/templates/components/job-page/parameterized.hbs b/ui/app/templates/components/job-page/parameterized.hbs index 8fca16924..b0b753c24 100644 --- a/ui/app/templates/components/job-page/parameterized.hbs +++ b/ui/app/templates/components/job-page/parameterized.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{#job-page/parts/title job=job handleError=(action "handleError")}} diff --git a/ui/app/templates/components/job-page/parts/body.hbs b/ui/app/templates/components/job-page/parts/body.hbs index 12c339ce4..f139b52ab 100644 --- a/ui/app/templates/components/job-page/parts/body.hbs +++ b/ui/app/templates/components/job-page/parts/body.hbs @@ -1,4 +1,4 @@ -{{#gutter-menu class="page-body" onNamespaceChange=onNamespaceChange}} +{{#gutter-menu class="page-body"}} {{partial "jobs/job/subnav"}}
{{yield}} diff --git a/ui/app/templates/components/job-page/periodic-child.hbs b/ui/app/templates/components/job-page/periodic-child.hbs index 398cb9327..2accceb84 100644 --- a/ui/app/templates/components/job-page/periodic-child.hbs +++ b/ui/app/templates/components/job-page/periodic-child.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}} diff --git a/ui/app/templates/components/job-page/periodic.hbs b/ui/app/templates/components/job-page/periodic.hbs index bc70771dc..af9d6e989 100644 --- a/ui/app/templates/components/job-page/periodic.hbs +++ b/ui/app/templates/components/job-page/periodic.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{#job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}} diff --git a/ui/app/templates/components/job-page/service.hbs b/ui/app/templates/components/job-page/service.hbs index f65dd4b6f..7df69f730 100644 --- a/ui/app/templates/components/job-page/service.hbs +++ b/ui/app/templates/components/job-page/service.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{job-page/parts/title job=job handleError=(action "handleError")}} diff --git a/ui/app/templates/components/job-page/system.hbs b/ui/app/templates/components/job-page/system.hbs index d9f8a1fa6..f11a77849 100644 --- a/ui/app/templates/components/job-page/system.hbs +++ b/ui/app/templates/components/job-page/system.hbs @@ -1,4 +1,4 @@ -{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} +{{#job-page/parts/body job=job}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}} {{job-page/parts/title job=job handleError=(action "handleError")}} diff --git a/ui/app/templates/jobs/job/definition.hbs b/ui/app/templates/jobs/job/definition.hbs index 924d18000..efe10b578 100644 --- a/ui/app/templates/jobs/job/definition.hbs +++ b/ui/app/templates/jobs/job/definition.hbs @@ -1,4 +1,4 @@ -{{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} +{{#gutter-menu class="page-body"}} {{partial "jobs/job/subnav"}}
diff --git a/ui/app/templates/jobs/job/deployments.hbs b/ui/app/templates/jobs/job/deployments.hbs index 241a0d32d..bd67069d6 100644 --- a/ui/app/templates/jobs/job/deployments.hbs +++ b/ui/app/templates/jobs/job/deployments.hbs @@ -1,4 +1,4 @@ -{{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} +{{#gutter-menu class="page-body"}} {{partial "jobs/job/subnav"}}
{{job-deployments-stream deployments=model.deployments}} diff --git a/ui/app/templates/jobs/job/evaluations.hbs b/ui/app/templates/jobs/job/evaluations.hbs index 4f5a9be8b..ca660ff74 100644 --- a/ui/app/templates/jobs/job/evaluations.hbs +++ b/ui/app/templates/jobs/job/evaluations.hbs @@ -1,4 +1,4 @@ -{{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} +{{#gutter-menu class="page-body"}} {{partial "jobs/job/subnav"}}
diff --git a/ui/app/templates/jobs/job/index.hbs b/ui/app/templates/jobs/job/index.hbs index 7d81851b2..8cd4928e6 100644 --- a/ui/app/templates/jobs/job/index.hbs +++ b/ui/app/templates/jobs/job/index.hbs @@ -3,6 +3,5 @@ sortProperty=sortProperty sortDescending=sortDescending currentPage=currentPage - onNamespaceChange=(action "gotoJobs") gotoJob=(action "gotoJob") gotoTaskGroup=(action "gotoTaskGroup")}} diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs index b2b08c701..3446a306f 100644 --- a/ui/app/templates/jobs/job/task-group.hbs +++ b/ui/app/templates/jobs/job/task-group.hbs @@ -1,4 +1,4 @@ -{{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} +{{#gutter-menu class="page-body"}}
  • {{#link-to "jobs.job.task-group" model.job model activeClass="is-active"}}Overview{{/link-to}}
  • diff --git a/ui/app/templates/jobs/job/versions.hbs b/ui/app/templates/jobs/job/versions.hbs index 9b03e23ad..7e659a237 100644 --- a/ui/app/templates/jobs/job/versions.hbs +++ b/ui/app/templates/jobs/job/versions.hbs @@ -1,4 +1,4 @@ -{{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} +{{#gutter-menu class="page-body"}} {{partial "jobs/job/subnav"}}
    {{job-versions-stream versions=model.versions verbose=true}} diff --git a/ui/tests/integration/job-page/parts/body-test.js b/ui/tests/integration/job-page/parts/body-test.js index 042d1048b..3454113ac 100644 --- a/ui/tests/integration/job-page/parts/body-test.js +++ b/ui/tests/integration/job-page/parts/body-test.js @@ -1,11 +1,9 @@ import { run } from '@ember/runloop'; import { getOwner } from '@ember/application'; import { test, moduleForComponent } from 'ember-qunit'; -import { click, find, findAll } from 'ember-native-dom-helpers'; +import { find, findAll } from 'ember-native-dom-helpers'; import wait from 'ember-test-helpers/wait'; import hbs from 'htmlbars-inline-precompile'; -import sinon from 'sinon'; -import { clickTrigger } from 'ember-power-select/test-support/helpers'; import { startMirage } from 'nomad-ui/initializers/ember-cli-mirage'; moduleForComponent('job-page/parts/body', 'Integration | Component | job-page/parts/body', { @@ -23,10 +21,9 @@ moduleForComponent('job-page/parts/body', 'Integration | Component | job-page/pa test('includes a subnav for the job', function(assert) { this.set('job', {}); - this.set('onNamespaceChange', () => {}); this.render(hbs` - {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} + {{#job-page/parts/body job=job}}
    Inner content
    {{/job-page/parts/body}} `); @@ -48,10 +45,9 @@ test('the subnav includes the deployments link when the job is a service', funct }); this.set('job', job); - this.set('onNamespaceChange', () => {}); this.render(hbs` - {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} + {{#job-page/parts/body job=job}}
    Inner content
    {{/job-page/parts/body}} `); @@ -76,10 +72,9 @@ test('the subnav does not include the deployments link when the job is not a ser }); this.set('job', job); - this.set('onNamespaceChange', () => {}); this.render(hbs` - {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} + {{#job-page/parts/body job=job}}
    Inner content
    {{/job-page/parts/body}} `); @@ -94,10 +89,9 @@ test('the subnav does not include the deployments link when the job is not a ser test('body yields content to a section after the subnav', function(assert) { this.set('job', {}); - this.set('onNamespaceChange', () => {}); this.render(hbs` - {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} + {{#job-page/parts/body job=job}}
    Inner content
    {{/job-page/parts/body}} `); @@ -113,25 +107,3 @@ test('body yields content to a section after the subnav', function(assert) { ); }); }); - -test('onNamespaceChange action is called when the namespace changes in the nested gutter menu', function(assert) { - const namespaceSpy = sinon.spy(); - - this.set('job', {}); - this.set('onNamespaceChange', namespaceSpy); - - this.render(hbs` - {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} -
    Inner content
    - {{/job-page/parts/body}} - `); - - return wait().then(() => { - clickTrigger('[data-test-namespace-switcher]'); - click(findAll('.ember-power-select-option')[1]); - - return wait().then(() => { - assert.ok(namespaceSpy.calledOnce, 'Switching namespaces calls the onNamespaceChange action'); - }); - }); -});