From debbac5c7805d8959d2a9414e650f6196e52b820 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 10 Feb 2020 14:25:34 -0500 Subject: [PATCH] Use date object to format elapsed time --- .../src/screens/Job/JobOutput/JobOutput.jsx | 2 +- .../Job/JobOutput/shared/OutputToolbar.jsx | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx index e2f544c71e..76aed50c36 100644 --- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx +++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx @@ -175,7 +175,7 @@ class JobOutput extends Component { try { switch (job.type) { case 'project_update': - await ProjectUpdatesAPI.destroy(job.idd); + await ProjectUpdatesAPI.destroy(job.id); break; case 'system_job': await SystemJobsAPI.destroy(job.id); diff --git a/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx b/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx index 3546fece0f..5248d539b7 100644 --- a/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx +++ b/awx/ui_next/src/screens/Job/JobOutput/shared/OutputToolbar.jsx @@ -40,18 +40,19 @@ const Wrapper = styled.div` font-size: 14px; `; -function toHHMMSS(s) { - function pad(n) { +const toHHMMSS = elapsed => { + const pad = n => { return `00${n}`.slice(-2); - } + }; - const secs = s % 60; - s = (s - secs) / 60; - const mins = s % 60; - const hrs = (s - mins) / 60; + const date = new Date(); + date.setTime(elapsed * 1000); + const hrs = date.getUTCHours(); + const mins = date.getUTCMinutes(); + const secs = date.getUTCSeconds(); return `${pad(hrs)}:${pad(mins)}:${pad(secs)}`; -} +}; const OUTPUT_NO_COUNT_JOB_TYPES = [ 'ad_hoc_command',