From 35f388a712654fc12e76432f93c48ee13fb8c2b8 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 26 Jan 2018 16:27:04 -0800
Subject: [PATCH] Trim the parent job prefix off the child job names when
 displaying them

---
 ui/app/components/job-page/periodic-child.js                 | 2 +-
 ui/app/models/job.js                                         | 5 +++++
 ui/app/templates/components/job-page/parameterized-child.hbs | 2 +-
 ui/app/templates/components/job-page/periodic-child.hbs      | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/app/components/job-page/periodic-child.js b/ui/app/components/job-page/periodic-child.js
index ea19ed4d3..060627d93 100644
--- a/ui/app/components/job-page/periodic-child.js
+++ b/ui/app/components/job-page/periodic-child.js
@@ -13,7 +13,7 @@ export default AbstractJobPage.extend({
         args: ['jobs.job', parent],
       },
       {
-        label: job.get('name'),
+        label: job.get('trimmedName'),
         args: ['jobs.job', job],
       },
     ];
diff --git a/ui/app/models/job.js b/ui/app/models/job.js
index 2fbf90626..b77fc7a66 100644
--- a/ui/app/models/job.js
+++ b/ui/app/models/job.js
@@ -34,6 +34,11 @@ export default Model.extend({
   parent: belongsTo('job', { inverse: 'children' }),
   children: hasMany('job', { inverse: 'parent' }),
 
+  // The parent job name is prepended to child launch job names
+  trimmedName: computed('name', 'parent', function() {
+    return this.get('parent.content') ? this.get('name').replace(/.+?\//, '') : this.get('name');
+  }),
+
   // A composite of type and other job attributes to determine
   // a better type descriptor for human interpretation rather
   // than for scheduling.
diff --git a/ui/app/templates/components/job-page/parameterized-child.hbs b/ui/app/templates/components/job-page/parameterized-child.hbs
index 245395c9f..b01ad400f 100644
--- a/ui/app/templates/components/job-page/parameterized-child.hbs
+++ b/ui/app/templates/components/job-page/parameterized-child.hbs
@@ -7,7 +7,7 @@
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   <h1 class="title">
-    {{job.name}}
+    {{job.trimmedName}}
     <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
   </h1>
 
diff --git a/ui/app/templates/components/job-page/periodic-child.hbs b/ui/app/templates/components/job-page/periodic-child.hbs
index 387f0a585..e39aed637 100644
--- a/ui/app/templates/components/job-page/periodic-child.hbs
+++ b/ui/app/templates/components/job-page/periodic-child.hbs
@@ -7,7 +7,7 @@
 {{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   <h1 class="title">
-    {{job.name}}
+    {{job.trimmedName}}
     <span class="bumper-left tag {{job.statusClass}}" data-test-job-status>{{job.status}}</span>
   </h1>