Skip to content

Commit

Permalink
refact: clean-up breadcrumb invocations
Browse files Browse the repository at this point in the history
  • Loading branch information
ChaiWithJai committed Dec 23, 2021
1 parent b25f5ff commit 3bdf661
Show file tree
Hide file tree
Showing 32 changed files with 87 additions and 176 deletions.
20 changes: 10 additions & 10 deletions ui/app/controllers/allocations/allocation/task.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import Controller from '@ember/controller';

export default class AllocationsAllocationTaskController extends Controller {
get breadcrumbs() {
const model = this.model;
if (!model) return [];
return [
{
title: 'Task',
label: model.get('name'),
args: ['allocations.allocation.task', model.get('allocation'), model],
},
];
get task() {
return this.model;
}

get breadcrumb() {
return {
title: 'Task',
label: this.task.get('name'),
args: ['allocations.allocation.task', this.task.get('allocation'), this.task],
};
}
}
7 changes: 0 additions & 7 deletions ui/app/controllers/clients.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,4 @@ import Controller from '@ember/controller';

export default class ClientsController extends Controller {
isForbidden = false;

breadcrumbs = [
{
label: 'Clients',
args: ['clients.index'],
},
];
}
20 changes: 10 additions & 10 deletions ui/app/controllers/clients/client.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import Controller from '@ember/controller';

export default class ClientsClientController extends Controller {
get breadcrumbs() {
const model = this.model;
if (!model) return [];
return [
{
title: 'Client',
label: model.get('shortId'),
args: ['clients.client', model.get('id')],
},
];
get client() {
return this.model;
}

get breadcrumb() {
return {
title: 'Client',
label: this.client.get('shortId'),
args: ['clients.client', this.client.get('id')],
};
}
}
7 changes: 0 additions & 7 deletions ui/app/controllers/csi/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,4 @@ import Controller from '@ember/controller';

export default class PluginsController extends Controller {
isForbidden = false;

breadcrumbs = [
{
label: 'Storage',
args: ['csi.index'],
},
];
}
10 changes: 7 additions & 3 deletions ui/app/controllers/csi/plugins/plugin.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import Controller from '@ember/controller';

export default class CsiPluginsPluginController extends Controller {
get plugin() {
return this.model;
}

get breadcrumbs() {
const plugin = this.model;
const { plainId } = this.plugin;
return [
{
label: 'Plugins',
args: ['csi.plugins'],
},
{
label: plugin.plainId,
args: ['csi.plugins.plugin', plugin.plainId],
label: plainId,
args: ['csi.plugins.plugin', plainId],
},
];
}
Expand Down
7 changes: 0 additions & 7 deletions ui/app/controllers/csi/volumes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,4 @@ import Controller from '@ember/controller';

export default class VolumesController extends Controller {
isForbidden = false;

breadcrumbs = [
{
label: 'Storage',
args: ['csi.index'],
},
];
}
6 changes: 5 additions & 1 deletion ui/app/controllers/csi/volumes/volume.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ export default class VolumeController extends Controller {
];
volumeNamespace = 'default';

get volume() {
return this.model;
}

get breadcrumbs() {
const volume = this.model;
const volume = this.volume;
return [
{
label: 'Volumes',
Expand Down
10 changes: 2 additions & 8 deletions ui/app/controllers/jobs.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import Controller from '@ember/controller';

export default class JobsController extends Controller {
breadcrumbs = [
{
label: 'Jobs',
args: ['jobs.index'],
},
];
}
// The WithNamespaceResetting Mixin uses Controller Injection and requires us to keep this controller around
export default class JobsController extends Controller {}
4 changes: 2 additions & 2 deletions ui/app/controllers/jobs/job.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class JobController extends Controller {
];
jobNamespace = 'default';

get breadcrumbs() {
return [{ type: 'job', job: this.model }];
get job() {
return this.model;
}
}
10 changes: 2 additions & 8 deletions ui/app/controllers/jobs/job/dispatch.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import Controller from '@ember/controller';

export default class JobsJobDispatchController extends Controller {
breadcrumbs = [
{
label: 'Dispatch',
args: ['jobs.job.dispatch'],
},
];
}
// This may be safe to remove but we can't be sure, some route may try access this directly using this.controllerFor
export default class JobsJobDispatchController extends Controller {}
40 changes: 21 additions & 19 deletions ui/app/controllers/jobs/job/task-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import classic from 'ember-classic-decorator';

@classic
export default class TaskGroupController extends Controller.extend(
Sortable,
Searchable,
WithNamespaceResetting
) {
Sortable,
Searchable,
WithNamespaceResetting
) {
@service userSettings;
@service can;

Expand Down Expand Up @@ -142,20 +142,22 @@ export default class TaskGroupController extends Controller.extend(
setFacetQueryParam(queryParam, selection) {
this.set(queryParam, serialize(selection));
}
get breadcrumbs() {
const model = this.model;
if (!model) return [];
return [
{
title: 'Task Group',
label: model.get('name'),
args: [
'jobs.job.task-group',
model.get('job'),
model.get('name'),
qpBuilder({ jobNamespace: model.get('job.namespace.name') || 'default' }),
],
},
];

get taskGroup() {
return this.model;
}

get breadcrumb() {
const { job, name } = this.taskGroup;
return {
title: 'Task Group',
label: name,
args: [
'jobs.job.task-group',
job,
name,
qpBuilder({ jobNamespace: job.get('namespace.name') || 'default' }),
],
};
}
}
7 changes: 0 additions & 7 deletions ui/app/controllers/jobs/run.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import Controller from '@ember/controller';

export default class RunController extends Controller {
breadcrumbs = [
{
label: 'Run',
args: ['jobs.run'],
},
];

onSubmit(id, namespace) {
this.transitionToRoute('jobs.job', id, {
queryParams: { namespace },
Expand Down
7 changes: 0 additions & 7 deletions ui/app/controllers/optimize.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ export default class OptimizeController extends Controller {
{ key: 'dead', label: 'Dead' },
];
breadcrumbs = [
{
label: 'Recommendations',
args: ['optimize'],
},
];
get optionsDatacenter() {
const flatten = (acc, val) => acc.concat(val);
const allDatacenters = new Set(this.summaries.mapBy('job.datacenters').reduce(flatten, []));
Expand Down
18 changes: 9 additions & 9 deletions ui/app/controllers/optimize/summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ export default class OptimizeSummaryController extends Controller {
},
];

get breadcrumbs() {
const model = this.model;
if (!model) return [];
get summary() {
return this.model;
}

return [
{
label: model.slug.replace('/', ' / '),
args: ['optimize.summary', model.slug],
},
];
get breadcrumb() {
const { slug } = this.summary;
return {
label: slug.replace('/', ' / '),
args: ['optimize.summary', slug],
};
}
}
7 changes: 0 additions & 7 deletions ui/app/controllers/servers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,4 @@ import Controller from '@ember/controller';

export default class ServersController extends Controller {
isForbidden = false;

breadcrumbs = [
{
label: 'Servers',
args: ['servers.index'],
},
];
}
8 changes: 0 additions & 8 deletions ui/app/controllers/servers/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,4 @@ export default class ServersServerController extends Controller {
get server() {
return this.model;
}

get breadcrumb() {
return {
title: 'Server',
label: this.server.name,
args: ['servers.server', this.server.id],
};
}
}
7 changes: 0 additions & 7 deletions ui/app/controllers/topology.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,4 @@ export default class TopologyControllers extends Controller {
this.filteredNodes = filteredNodesError.context;
}
}

get breadcrumb() {
return {
label: 'Topology',
args: ['topology'],
};
}
}
5 changes: 1 addition & 4 deletions ui/app/templates/allocations/allocation/task.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
{{outlet}}
<Breadcrumb @crumb={{this.breadcrumb}} />{{outlet}}
4 changes: 1 addition & 3 deletions ui/app/templates/clients.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
<Breadcrumb @crumb={{hash label="Clients" args=(array "clients.index")}} />
<PageLayout>
{{outlet}}
</PageLayout>
5 changes: 1 addition & 4 deletions ui/app/templates/clients/client.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
{{outlet}}
<Breadcrumb @crumb={{this.breadcrumb}} />{{outlet}}
5 changes: 1 addition & 4 deletions ui/app/templates/csi/plugins.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
{{outlet}}
<Breadcrumb @crumb={{hash label="Storage" args=(array "csi.index")}} />{{outlet}}
5 changes: 1 addition & 4 deletions ui/app/templates/csi/volumes.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
{{outlet}}
<Breadcrumb @crumb={{hash label="Storage" args=(array "csi.index")}} />{{outlet}}
4 changes: 1 addition & 3 deletions ui/app/templates/jobs.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
<Breadcrumb @crumb={{hash label="Jobs" args=(array "jobs.index")}} />
<PageLayout>
{{outlet}}
</PageLayout>
5 changes: 1 addition & 4 deletions ui/app/templates/jobs/job.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
{{outlet}}
<Breadcrumb @crumb={{hash type="job" job=this.job}} />{{outlet}}
4 changes: 1 addition & 3 deletions ui/app/templates/jobs/job/dispatch.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
<Breadcrumb @crumb={{hash label="Dispatch" args=(array "jobs.job.dispatch")}} />
{{page-title "Dispatch new " this.model.name}}
<JobSubnav @job={{this.model}} />
<section class="section">
Expand Down
4 changes: 1 addition & 3 deletions ui/app/templates/jobs/job/task-group.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
<Breadcrumb @crumb={{this.breadcrumb}} />
{{page-title "Task group " this.model.name " - Job " this.model.job.name}}
<div class="tabs is-subnav">
<ul>
Expand Down
4 changes: 1 addition & 3 deletions ui/app/templates/jobs/run.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
<Breadcrumb @crumb={{hash label="Run" args=(array "jobs.run")}} />
{{page-title "Run a job"}}
<section class="section">
<JobEditor @job={{this.model}} @context="new" @onSubmit={{action this.onSubmit}} />
Expand Down
4 changes: 1 addition & 3 deletions ui/app/templates/optimize.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{{#each this.breadcrumbs as |crumb|}}
<Breadcrumb @crumb={{crumb}} />
{{/each}}
<Breadcrumb @crumb={{hash label="Recommendations" args=(array "optimize")}} />
<PageLayout>
<section class="section">
{{#if this.summaries}}
Expand Down
Loading

0 comments on commit 3bdf661

Please sign in to comment.