Skip to content

Commit

Permalink
Remove partials
Browse files Browse the repository at this point in the history
This is mostly a direct replacement of partials with components.
In some cases, the components needed a layout or injected services
that were formerly available via containing scope.
  • Loading branch information
backspace committed Jun 30, 2020
1 parent c0ccd82 commit 66e55aa
Show file tree
Hide file tree
Showing 35 changed files with 65 additions and 45 deletions.
5 changes: 4 additions & 1 deletion ui/app/components/forbidden-message.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import Component from '@ember/component';
import { tagName } from '@ember-decorators/component';
import { inject as service } from '@ember/service';

@tagName('')
export default class ForbiddenMessage extends Component {}
export default class ForbiddenMessage extends Component {
@service token;
}
6 changes: 6 additions & 0 deletions ui/app/components/hamburger-menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Component from '@ember/component';
import { tagName } from '@ember-decorators/component';

@tagName('')
export default class HamburgerMenu extends Component {
}
6 changes: 6 additions & 0 deletions ui/app/components/job-subnav.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Component from '@ember/component';
import { tagName } from '@ember-decorators/component';

@tagName('')
export default class JobSubnav extends Component {
}
6 changes: 6 additions & 0 deletions ui/app/components/loading-spinner.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Component from '@ember/component';
import { tagName } from '@ember-decorators/component';

@tagName('')
export default class LoadingSpinner extends Component {
}
3 changes: 3 additions & 0 deletions ui/app/components/stats-time-series.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ import d3Format from 'd3-format';
import d3Scale from 'd3-scale';
import d3Array from 'd3-array';
import LineChart from 'nomad-ui/components/line-chart';
import layout from '../templates/components/line-chart';
import formatDuration from 'nomad-ui/utils/format-duration';
import classic from 'ember-classic-decorator';

@classic
export default class StatsTimeSeries extends LineChart {
layout = layout;

xProp = 'timestamp';
yProp = 'percent';
timeseries = true;
Expand Down
6 changes: 6 additions & 0 deletions ui/app/components/svg-patterns.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Component from '@ember/component';
import { tagName } from '@ember-decorators/component';

@tagName('')
export default class SvgPatterns extends Component {
}
2 changes: 1 addition & 1 deletion ui/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<HeadLayout />
{{title (if system.shouldShowRegions (concat system.activeRegion " - ")) "Nomad" separator=" - "}}
{{partial "svg-patterns"}}
<SvgPatterns />
{{#unless error}}
{{outlet}}
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/clients/index.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{title "Clients"}}
<section class="section">
{{#if isForbidden}}
{{partial "partials/forbidden-message"}}
<ForbiddenMessage />
{{else}}
<div class="toolbar">
<div class="toolbar-item">
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/clients/loading.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
<section class="section has-text-centered"><LoadingSpinner /></section>
4 changes: 2 additions & 2 deletions ui/app/templates/components/global-header.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<nav class="navbar is-primary">
<div class="navbar-brand">
<span data-test-header-gutter-toggle class="gutter-toggle" aria-label="menu" onclick={{action onHamburgerClick}}>
{{partial "partials/hamburger-menu"}}
<HamburgerMenu />
</span>
<LinkTo @route="jobs" class="navbar-item is-logo">
{{partial "partials/nomad-logo"}}
<NomadLogo />
</LinkTo>
</div>
{{#unless (media "isMobile")}}
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/components/gutter-menu.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="gutter {{if isOpen "is-open"}}">
<header class="collapsed-menu {{if isOpen "is-open"}}">
<span data-test-gutter-gutter-toggle class="gutter-toggle" aria-label="menu" onclick={{action onHamburgerClick}}>
{{partial "partials/hamburger-menu"}}
<HamburgerMenu />
</span>
<span class="logo-container">
{{partial "partials/nomad-logo"}}
<NomadLogo />
</span>
</header>
<aside class="menu">
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/components/job-page/parts/body.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{partial "jobs/job/subnav"}}
<JobSubnav @job={{@job}} />
<section class="section">
{{yield}}
</section>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div data-test-subnav="job" class="tabs is-subnav">
<ul>
<li data-test-tab="overview"><LinkTo @route="jobs.job.index" @model={{job}} @activeClass="is-active">Overview</LinkTo></li>
<li data-test-tab="definition"><LinkTo @route="jobs.job.definition" @model={{job}} @activeClass="is-active">Definition</LinkTo></li>
<li data-test-tab="versions"><LinkTo @route="jobs.job.versions" @model={{job}} @activeClass="is-active">Versions</LinkTo></li>
<li data-test-tab="overview"><LinkTo @route="jobs.job.index" @model={{@job}} @activeClass="is-active">Overview</LinkTo></li>
<li data-test-tab="definition"><LinkTo @route="jobs.job.definition" @model={{@job}} @activeClass="is-active">Definition</LinkTo></li>
<li data-test-tab="versions"><LinkTo @route="jobs.job.versions" @model={{@job}} @activeClass="is-active">Versions</LinkTo></li>
{{#if job.supportsDeployments}}
<li data-test-tab="deployments"><LinkTo @route="jobs.job.deployments" @model={{job}} @activeClass="is-active">Deployments</LinkTo></li>
<li data-test-tab="deployments"><LinkTo @route="jobs.job.deployments" @model={{@job}} @activeClass="is-active">Deployments</LinkTo></li>
{{/if}}
<li data-test-tab="allocations"><LinkTo @route="jobs.job.allocations" @model={{job}} @activeClass="is-active">Allocations</LinkTo></li>
<li data-test-tab="evaluations"><LinkTo @route="jobs.job.evaluations" @model={{job}} @activeClass="is-active">Evaluations</LinkTo></li>
<li data-test-tab="allocations"><LinkTo @route="jobs.job.allocations" @model={{@job}} @activeClass="is-active">Allocations</LinkTo></li>
<li data-test-tab="evaluations"><LinkTo @route="jobs.job.evaluations" @model={{@job}} @activeClass="is-active">Evaluations</LinkTo></li>
</ul>
</div>
File renamed without changes.
1 change: 0 additions & 1 deletion ui/app/templates/components/stats-time-series.hbs

This file was deleted.

2 changes: 1 addition & 1 deletion ui/app/templates/csi/plugins/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>
<section class="section">
{{#if isForbidden}}
{{partial "partials/forbidden-message"}}
<ForbiddenMessage />
{{else}}
<div class="toolbar">
<div class="toolbar-item">
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/csi/volumes/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>
<section class="section">
{{#if isForbidden}}
{{partial "partials/forbidden-message"}}
<ForbiddenMessage />
{{else}}
<div class="toolbar">
<div class="toolbar-item">
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/exec-loading.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<nav class="navbar is-popup">
<div class="navbar-brand">
<div class="navbar-item is-logo">
{{partial "partials/nomad-logo"}}
<NomadLogo />
</div>
</div>

Expand All @@ -13,5 +13,5 @@
</nav>

<div class="exec-window loading">
{{partial "partials/loading-spinner"}}
<LoadingSpinner />
</div>
2 changes: 1 addition & 1 deletion ui/app/templates/exec.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<nav class="navbar is-popup">
<div class="navbar-brand">
<div class="navbar-item is-logo">
{{partial "partials/nomad-logo"}}
<NomadLogo />
</div>
</div>
{{#if system.shouldShowRegions}}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/index.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{title "Jobs"}}
<section class="section">
{{#if isForbidden}}
{{partial "partials/forbidden-message"}}
<ForbiddenMessage />
{{else}}
<div class="toolbar">
<div class="toolbar-item">
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/job/allocations.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{title "Job " job.name " allocations"}}
{{partial "jobs/job/subnav"}}
<JobSubnav @job={{job}} />
<section class="section">
{{#if allocations.length}}
<div class="content">
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/job/definition.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{title "Job " job.name " definition"}}
{{partial "jobs/job/subnav"}}
<JobSubnav @job={{job}} />
<section class="section">
{{#unless isEditing}}
<div class="boxed-section">
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/job/deployments.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{title "Job " job.name " deployments"}}
{{partial "jobs/job/subnav"}}
<JobSubnav @job={{job}} />
<section class="section">
<JobDeploymentsStream @deployments={{model.deployments}} />
</section>
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/job/evaluations.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{title "Job " job.name " evaluations"}}
{{partial "jobs/job/subnav"}}
<JobSubnav @job={{job}} />
<section class="section">
{{#if sortedEvaluations.length}}
<ListTable
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/jobs/job/loading.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{partial "jobs/job/subnav"}}
<section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
<JobSubnav @job={{job}} />
<section class="section has-text-centered"><LoadingSpinner /></section>
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/job/versions.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{title "Job " job.name " versions"}}
{{partial "jobs/job/subnav"}}
<JobSubnav @job={{job}} />
<section class="section">
<JobVersionsStream @versions={{model.versions}} @verbose={{true}} />
</section>
2 changes: 1 addition & 1 deletion ui/app/templates/jobs/loading.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
<section class="section has-text-centered"><LoadingSpinner /></section>
2 changes: 1 addition & 1 deletion ui/app/templates/loading.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<PageLayout>
<section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
<section class="section has-text-centered"><LoadingSpinner /></section>
</PageLayout>
10 changes: 0 additions & 10 deletions ui/app/templates/partials/forbidden-message.hbs

This file was deleted.

2 changes: 1 addition & 1 deletion ui/app/templates/servers/index.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{title "Servers"}}
<section class="section">
{{#if isForbidden}}
{{partial "partials/forbidden-message"}}
<ForbiddenMessage />
{{else}}
<ListPagination
@source={{sortedAgents}}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/servers/loading.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
<section class="section has-text-centered"><LoadingSpinner /></section>
1 change: 1 addition & 0 deletions ui/config/deprecation-workflow.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ self.deprecationWorkflow.config = {
{ handler: 'throw', matchId: 'ember-console.deprecate-logger' },
{ handler: 'throw', matchId: 'ember-test-helpers.rendering-context.jquery-element' },
{ handler: 'throw', matchId: 'ember-cli-page-object.is-property' },
{ handler: 'throw', matchId: 'ember-views.partial' },
],
};
4 changes: 2 additions & 2 deletions ui/stories/components/header.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ export let Header = () => {
<nav class="navbar is-primary">
<div class="navbar-brand">
<span class="gutter-toggle" aria-label="menu">
{{partial "partials/hamburger-menu"}}
<HamburgerMenu />
</span>
<span class="navbar-item is-logo">
{{partial "partials/nomad-logo"}}
<NomadLogo />
</span>
</div>
<div class="navbar-end">
Expand Down

0 comments on commit 66e55aa

Please sign in to comment.