Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ui] Fix a bug where redirects after planning/editing a job didn't include namespace #13588

Merged
merged 3 commits into from
Jul 5, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Job editing and planning handles namespace as part of ID instead of q…
…ueryParam
  • Loading branch information
philrenaud committed Jul 5, 2022
commit 896837c1114f947a0e0c582dc2a812b595b0ac5e
8 changes: 4 additions & 4 deletions ui/app/controllers/jobs/job/definition.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import Controller from '@ember/controller';
import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
import { alias } from '@ember/object/computed';
import classic from 'ember-classic-decorator';
import { inject as service } from '@ember/service';

@classic
export default class DefinitionController extends Controller.extend(
WithNamespaceResetting
) {
@alias('model.job') job;
@alias('model.definition') definition;
@service router;

isEditing = false;

Expand All @@ -21,9 +23,7 @@ export default class DefinitionController extends Controller.extend(
this.set('isEditing', false);
}

onSubmit(id, jobNamespace) {
this.transitionToRoute('jobs.job', id, {
queryParams: { jobNamespace },
});
onSubmit() {
this.router.transitionTo('jobs.job', this.job.idWithNamespace);
}
}
6 changes: 3 additions & 3 deletions ui/app/controllers/jobs/run.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';

export default class RunController extends Controller {
@service router;
onSubmit(id, namespace) {
this.transitionToRoute('jobs.job', id, {
queryParams: { namespace },
});
this.router.transitionTo('jobs.job', `${id}@${namespace || 'default'}`);
}
}