From f0cf931c7b98fd981b8586a7fedd93f7472797c5 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Thu, 19 Apr 2018 10:18:16 -0700
Subject: [PATCH] Refactor job-page components to use common title and error
 parts

---
 .../templates/components/job-page/batch.hbs   |  7 +++----
 .../job-page/parameterized-child.hbs          |  7 +++----
 .../components/job-page/parameterized.hbs     |  8 +++----
 .../components/job-page/periodic-child.hbs    |  7 +++----
 .../components/job-page/periodic.hbs          | 21 ++++---------------
 .../templates/components/job-page/service.hbs | 15 +++----------
 .../templates/components/job-page/system.hbs  |  7 +++----
 7 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/ui/app/templates/components/job-page/batch.hbs b/ui/app/templates/components/job-page/batch.hbs
index 74b7f5c28..d92573add 100644
--- a/ui/app/templates/components/job-page/batch.hbs
+++ b/ui/app/templates/components/job-page/batch.hbs
@@ -6,10 +6,9 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  <h1 class="title">
-    {{job.name}}
-    <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
-  </h1>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{job-page/parts/title job=job handleError=(action "handleError")}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">
diff --git a/ui/app/templates/components/job-page/parameterized-child.hbs b/ui/app/templates/components/job-page/parameterized-child.hbs
index b01ad400f..cd3d18f0b 100644
--- a/ui/app/templates/components/job-page/parameterized-child.hbs
+++ b/ui/app/templates/components/job-page/parameterized-child.hbs
@@ -6,10 +6,9 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  <h1 class="title">
-    {{job.trimmedName}}
-    <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
-  </h1>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">
diff --git a/ui/app/templates/components/job-page/parameterized.hbs b/ui/app/templates/components/job-page/parameterized.hbs
index a8e3ed47f..b976e73a8 100644
--- a/ui/app/templates/components/job-page/parameterized.hbs
+++ b/ui/app/templates/components/job-page/parameterized.hbs
@@ -6,11 +6,11 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  <h1 class="title">
-    {{job.name}}
-    <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{#job-page/parts/title job=job handleError=(action "handleError")}}
     <span class="tag is-hollow">Parameterized</span>
-  </h1>
+  {{/job-page/parts/title}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">
diff --git a/ui/app/templates/components/job-page/periodic-child.hbs b/ui/app/templates/components/job-page/periodic-child.hbs
index e39aed637..946ce2579 100644
--- a/ui/app/templates/components/job-page/periodic-child.hbs
+++ b/ui/app/templates/components/job-page/periodic-child.hbs
@@ -6,10 +6,9 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  <h1 class="title">
-    {{job.trimmedName}}
-    <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
-  </h1>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">
diff --git a/ui/app/templates/components/job-page/periodic.hbs b/ui/app/templates/components/job-page/periodic.hbs
index 25fcdc102..31e0ffe32 100644
--- a/ui/app/templates/components/job-page/periodic.hbs
+++ b/ui/app/templates/components/job-page/periodic.hbs
@@ -6,25 +6,12 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  {{#if errorMessage}}
-    <div class="notification is-danger">
-      <div class="columns">
-        <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>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{#job-page/parts/title job=job title=job.trimmedName handleError=(action "handleError")}}
     <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>
-  </h1>
+  {{/job-page/parts/title}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">
diff --git a/ui/app/templates/components/job-page/service.hbs b/ui/app/templates/components/job-page/service.hbs
index 136749f0c..80e2ab721 100644
--- a/ui/app/templates/components/job-page/service.hbs
+++ b/ui/app/templates/components/job-page/service.hbs
@@ -6,18 +6,9 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  <h1 class="title">
-    {{job.name}}
-    <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
-    {{#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>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{job-page/parts/title job=job handleError=(action "handleError")}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">
diff --git a/ui/app/templates/components/job-page/system.hbs b/ui/app/templates/components/job-page/system.hbs
index 74b7f5c28..d92573add 100644
--- a/ui/app/templates/components/job-page/system.hbs
+++ b/ui/app/templates/components/job-page/system.hbs
@@ -6,10 +6,9 @@
   {{/each}}
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
-  <h1 class="title">
-    {{job.name}}
-    <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
-  </h1>
+  {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
+
+  {{job-page/parts/title job=job handleError=(action "handleError")}}
 
   <div class="boxed-section job-stats">
     <div class="boxed-section-body">