Skip to content

Commit

Permalink
ui: revert automated code formating
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Oct 7, 2021
1 parent 7bb2478 commit 309e599
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 96 deletions.
78 changes: 22 additions & 56 deletions ui/app/templates/components/job-page/parameterized-child.hbs
Original file line number Diff line number Diff line change
@@ -1,68 +1,44 @@
<JobPage::Parts::Body @job={{this.job}}>
<JobPage::Parts::Error
@errorMessage={{this.errorMessage}}
@onDismiss={{action "clearErrorMessage"}}
/>
<JobPage::Parts::Title
@job={{this.job}}
@title={{this.job.trimmedName}}
@handleError={{action "handleError"}}
/>
<JobPage::Parts::Error @errorMessage={{this.errorMessage}} @onDismiss={{action "clearErrorMessage"}} />

<JobPage::Parts::Title @job={{this.job}} @title={{this.job.trimmedName}} @handleError={{action "handleError"}} />

<div class="boxed-section job-stats">
<div class="boxed-section-body">
<span data-test-job-stat="type">
<strong>
Type:
</strong>
{{this.job.type}}
|
</span>
<span data-test-job-stat="priority">
<strong>
Priority:
</strong>
{{this.job.priority}}
|
</span>
<span data-test-job-stat="type"><strong>Type:</strong> {{this.job.type}} | </span>
<span data-test-job-stat="priority"><strong>Priority:</strong> {{this.job.priority}} |</span>
<span data-test-job-stat="parent">
<strong>
Parent:
</strong>
<LinkTo
@route="jobs.job"
@model={{this.job.parent}}
@query={{hash jobNamespace=this.job.parent.namespace.name}}
>
<strong>Parent:</strong>
<LinkTo @route="jobs.job" @model={{this.job.parent}} @query={{hash jobNamespace=this.job.parent.namespace.name}}>
{{this.job.parent.name}}
</LinkTo>
</span>
{{#if (and this.job.namespace this.system.shouldShowNamespaces)}}
<span data-test-job-stat="namespace">
|
<strong>
Namespace:
</strong>
{{this.job.namespace.name}}
</span>
<span data-test-job-stat="namespace"> | <strong>Namespace:</strong> {{this.job.namespace.name}}</span>
{{/if}}
</div>
</div>

{{#if this.job.hasClientStatus}}
<JobPage::Parts::JobClientStatusSummary
@gotoClient={{this.gotoClient}}
@job={{this.job}}
@jobClientStatus={{this.jobClientStatus}}
/>
{{/if}}

<JobPage::Parts::Summary @job={{this.job}} @forceCollapsed={{this.job.hasClientStatus}} />

<JobPage::Parts::PlacementFailures @job={{this.job}} />

<JobPage::Parts::TaskGroups
@job={{this.job}}
@sortProperty={{this.sortProperty}}
@sortDescending={{this.sortDescending}}
@gotoTaskGroup={{this.gotoTaskGroup}}
/>
@gotoTaskGroup={{this.gotoTaskGroup}} />

<JobPage::Parts::RecentAllocations @job={{this.job}} />

<div class="boxed-section">
<div class="boxed-section-head">
Meta
Expand All @@ -72,35 +48,25 @@
<AttributesTable
data-test-meta
@attributePairs={{this.job.definition.Meta}}
@class="attributes-table"
/>
@class="attributes-table" />
</div>
{{else}}
<div class="boxed-section-body">
<div data-test-empty-meta-message class="empty-message">
<h3 class="empty-message-headline">
No Meta Attributes
</h3>
<p class="empty-message-body">
This job is configured with no meta attributes.
</p>
<h3 class="empty-message-headline">No Meta Attributes</h3>
<p class="empty-message-body">This job is configured with no meta attributes.</p>
</div>
</div>
{{/if}}
</div>

<div class="boxed-section">
<div class="boxed-section-head">
Payload
</div>
<div class="boxed-section-head">Payload</div>
<div class="boxed-section-body is-dark">
{{#if this.payloadJSON}}
<JsonViewer @json={{this.payloadJSON}} />
{{else}}
<pre class="cli-window is-elastic">
<code>
{{this.payload}}
</code>
</pre>
<pre class="cli-window is-elastic"><code>{{this.payload}}</code></pre>
{{/if}}
</div>
</div>
Expand Down
55 changes: 15 additions & 40 deletions ui/app/templates/components/job-page/periodic-child.hbs
Original file line number Diff line number Diff line change
@@ -1,66 +1,41 @@
<JobPage::Parts::Body @job={{this.job}}>
<JobPage::Parts::Error
@errorMessage={{this.errorMessage}}
@onDismiss={{action "clearErrorMessage"}}
/>
<JobPage::Parts::Title
@job={{this.job}}
@title={{this.job.trimmedName}}
@handleError={{action "handleError"}}
/>
<JobPage::Parts::Error @errorMessage={{this.errorMessage}} @onDismiss={{action "clearErrorMessage"}} />

<JobPage::Parts::Title @job={{this.job}} @title={{this.job.trimmedName}} @handleError={{action "handleError"}} />

<div class="boxed-section job-stats">
<div class="boxed-section-body">
<span data-test-job-stat="type">
<strong>
Type:
</strong>
{{this.job.type}}
|
</span>
<span data-test-job-stat="priority">
<strong>
Priority:
</strong>
{{this.job.priority}}
|
</span>
<span data-test-job-stat="type"><strong>Type:</strong> {{this.job.type}} | </span>
<span data-test-job-stat="priority"><strong>Priority:</strong> {{this.job.priority}} |</span>
<span data-test-job-stat="parent">
<strong>
Parent:
</strong>
<LinkTo
@route="jobs.job"
@model={{this.job.parent}}
@query={{hash namespace=this.job.parent.namespace.name}}
>
<strong>Parent:</strong>
<LinkTo @route="jobs.job" @model={{this.job.parent}} @query={{hash namespace=this.job.parent.namespace.name}}>
{{this.job.parent.name}}
</LinkTo>
</span>
{{#if (and this.job.namespace this.system.shouldShowNamespaces)}}
<span data-test-job-stat="namespace">
|
<strong>
Namespace:
</strong>
{{this.job.namespace.name}}
</span>
<span data-test-job-stat="namespace"> | <strong>Namespace:</strong> {{this.job.namespace.name}}</span>
{{/if}}
</div>
</div>

{{#if this.job.hasClientStatus}}
<JobPage::Parts::JobClientStatusSummary
@gotoClient={{this.gotoClient}}
@job={{this.job}}
@jobClientStatus={{this.jobClientStatus}}
/>
{{/if}}

<JobPage::Parts::Summary @job={{this.job}} @forceCollapsed={{this.job.hasClientStatus}} />

<JobPage::Parts::PlacementFailures @job={{this.job}} />

<JobPage::Parts::TaskGroups
@job={{this.job}}
@sortProperty={{this.sortProperty}}
@sortDescending={{this.sortDescending}}
@gotoTaskGroup={{this.gotoTaskGroup}}
/>
@gotoTaskGroup={{this.gotoTaskGroup}} />

<JobPage::Parts::RecentAllocations @job={{this.job}} />
</JobPage::Parts::Body>

0 comments on commit 309e599

Please sign in to comment.