From bf1c8794476dca02c8634e8816f528ba9de4ac32 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Fri, 18 Sep 2020 17:33:43 -0700 Subject: [PATCH] Add job submit time to the job children list --- ui/app/components/job-row.js | 4 ++++ ui/app/models/job.js | 1 + ui/app/serializers/job.js | 2 ++ ui/app/templates/components/job-page/parts/children.hbs | 3 ++- ui/app/templates/components/job-row.hbs | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ui/app/components/job-row.js b/ui/app/components/job-row.js index 954332b09..0ac60b158 100644 --- a/ui/app/components/job-row.js +++ b/ui/app/components/job-row.js @@ -12,6 +12,10 @@ export default class JobRow extends Component { job = null; + // One of independent, parent, or child. Used to customize the template + // based on the relationship of this job to others. + context = 'independent'; + onClick() {} click(event) { diff --git a/ui/app/models/job.js b/ui/app/models/job.js index 7af777d4e..0f505201b 100644 --- a/ui/app/models/job.js +++ b/ui/app/models/job.js @@ -23,6 +23,7 @@ export default class Job extends Model { @attr('string') statusDescription; @attr('number') createIndex; @attr('number') modifyIndex; + @attr('date') submitTime; // True when the job is the parent periodic or parameterized jobs // Instances of periodic or parameterized jobs are false for both properties diff --git a/ui/app/serializers/job.js b/ui/app/serializers/job.js index d7f8c760a..2719bb981 100644 --- a/ui/app/serializers/job.js +++ b/ui/app/serializers/job.js @@ -7,6 +7,8 @@ export default class JobSerializer extends ApplicationSerializer { parameterized: 'ParameterizedJob', }; + separateNanos = ['SubmitTime']; + normalize(typeHash, hash) { hash.NamespaceID = hash.Namespace; diff --git a/ui/app/templates/components/job-page/parts/children.hbs b/ui/app/templates/components/job-page/parts/children.hbs index 49a92fd3d..4e5255523 100644 --- a/ui/app/templates/components/job-page/parts/children.hbs +++ b/ui/app/templates/components/job-page/parts/children.hbs @@ -14,6 +14,7 @@ @class="with-foot" as |t|> Name + Submitted At Status Type Priority @@ -21,7 +22,7 @@ Summary - +
diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/templates/components/job-row.hbs index 12cbef357..fd85c6777 100644 --- a/ui/app/templates/components/job-row.hbs +++ b/ui/app/templates/components/job-row.hbs @@ -1,4 +1,7 @@ {{this.job.name}} +{{#if (eq @context "child")}} + {{format-month-ts this.job.submitTime}} +{{/if}} {{this.job.status}}