luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Refactor job-page components to use common title and error parts

This commit is contained in:
Michael Lange 2018-04-19 10:18:16 -07:00
parent cf7d5543c3
commit f0cf931c7b
7 changed files with 23 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/templates/components/job-page/batch.hbs
View File

@ -6,10 +6,9 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
<h1 class="title"> {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
{{job.name}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span> {{job-page/parts/title job=job handleError=(action "handleError")}}
</h1>
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">

7
ui/app/templates/components/job-page/parameterized-child.hbs
View File

@ -6,10 +6,9 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
<h1 class="title"> {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
{{job.trimmedName}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span> {{job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}}
</h1>
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">

8
ui/app/templates/components/job-page/parameterized.hbs
View File

@ -6,11 +6,11 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
<h1 class="title"> {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
{{job.name}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span> {{#job-page/parts/title job=job handleError=(action "handleError")}}
<span class="tag is-hollow">Parameterized</span> <span class="tag is-hollow">Parameterized</span>
</h1> {{/job-page/parts/title}}
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">

7
ui/app/templates/components/job-page/periodic-child.hbs
View File

@ -6,10 +6,9 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
<h1 class="title"> {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
{{job.trimmedName}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span> {{job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}}
</h1>
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">

21
ui/app/templates/components/job-page/periodic.hbs
View File

@ -6,25 +6,12 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
{{#if errorMessage}} {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
<div class="notification is-danger">
<div class="columns"> {{#job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}}
<div class="column">
<h3 data-test-force-error-title class="title is-4">Could Not Force Launch</h3>
<p data-test-force-error-body>Your ACL token does not grant permission to submit jobs.</p>
</div>
<div class="column is-centered is-minimum">
<button data-test-force-error-close class="button is-danger" {{action "clearErrorMessage"}}>Okay</button>
</div>
</div>
</div>
{{/if}}
<h1 class="title">
{{job.name}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
<span class="tag is-hollow">periodic</span> <span class="tag is-hollow">periodic</span>
<button data-test-force-launch class="button is-warning is-small is-inline" onclick={{action "forceLaunch"}}>Force Launch</button> <button data-test-force-launch class="button is-warning is-small is-inline" onclick={{action "forceLaunch"}}>Force Launch</button>
</h1> {{/job-page/parts/title}}
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">

15
ui/app/templates/components/job-page/service.hbs
View File

@ -6,18 +6,9 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
<h1 class="title"> {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
{{job.name}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span> {{job-page/parts/title job=job handleError=(action "handleError")}}
{{#if (not (eq job.status "dead"))}}
{{two-step-button
idleText="Stop"
cancelText="Cancel"
confirmText="Yes, Stop"
confirmationMessage="Are you sure you want to stop this job?"
onConfirm=(action "stopJob")}}
{{/if}}
</h1>
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">

7
ui/app/templates/components/job-page/system.hbs
View File

@ -6,10 +6,9 @@
{{/each}} {{/each}}
{{/global-header}} {{/global-header}}
{{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}} {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
<h1 class="title"> {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
{{job.name}}
<span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span> {{job-page/parts/title job=job handleError=(action "handleError")}}
</h1>
<div class="boxed-section job-stats"> <div class="boxed-section job-stats">
<div class="boxed-section-body"> <div class="boxed-section-body">