diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 21:07:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 21:07:29 +0000 |
commit | 1da3754b25657f49afdcb0b942506d365b1ee89d (patch) | |
tree | 9f4bfa94fdd1762ef99e6a61bf180ac8cd7b5616 /app/assets | |
parent | 25521def84a6987fe9d4265b560e930bfb32c195 (diff) | |
download | gitlab-ce-1da3754b25657f49afdcb0b942506d365b1ee89d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/monitoring/utils.js | 8 | ||||
-rw-r--r-- | app/assets/javascripts/reports/store/utils.js | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index 46b01f753f8..a134b4e3c33 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -1,19 +1,21 @@ import { secondsIn, timeWindowsKeyNames } from './constants'; +const secondsToMilliseconds = seconds => seconds * 1000; + export const getTimeDiff = timeWindow => { const end = Math.floor(Date.now() / 1000); // convert milliseconds to seconds const difference = secondsIn[timeWindow] || secondsIn.eightHours; const start = end - difference; return { - start: new Date(start * 1000).toISOString(), - end: new Date(end * 1000).toISOString(), + start: new Date(secondsToMilliseconds(start)).toISOString(), + end: new Date(secondsToMilliseconds(end)).toISOString(), }; }; export const getTimeWindow = ({ start, end }) => Object.entries(secondsIn).reduce((acc, [timeRange, value]) => { - if (end - start === value) { + if (new Date(end) - new Date(start) === secondsToMilliseconds(value)) { return timeRange; } return acc; diff --git a/app/assets/javascripts/reports/store/utils.js b/app/assets/javascripts/reports/store/utils.js index 10560d0ae8e..7381f038eaf 100644 --- a/app/assets/javascripts/reports/store/utils.js +++ b/app/assets/javascripts/reports/store/utils.js @@ -11,7 +11,7 @@ const textBuilder = results => { const { failed, resolved, total } = results; const failedString = failed - ? n__('%d failed test result', '%d failed test results', failed) + ? n__('%d failed/error test result', '%d failed/error test results', failed) : null; const resolvedString = resolved ? n__('%d fixed test result', '%d fixed test results', resolved) |