mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-22 15:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Improve calculation of incident duration in IncidentView component

Browse Source
This commit is contained in:
Simon Larsen 2024-05-08 11:10:20 +01:00
parent f35e50bab3
commit 8a4afe992c
No known key found for this signature in database
GPG Key ID: 96C5DCA24769DBCA
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Types/Date.ts
View File

@ -870,7 +870,7 @@ export default class OneUptimeDate {
formattedString += hours + ' hours';
}
if (mins > 0) {
if (mins >= 0) {
if (formattedString.length > 0) {
formattedString += ', ';
}

22
Dashboard/src/Pages/Incidents/View/Index.tsx
View File

@ -154,16 +154,34 @@ const IncidentView: FunctionComponent<PageComponentProps> = (
}
)?.startsAt;
if (!acknowledgeTime) {
const resolveTime: Date | undefined = incidentStateTimeline.find(
(timeline: IncidentStateTimeline) => {
return (
timeline.incidentStateId?.toString() ===
getResolvedState()?._id?.toString()
);
}
)?.startsAt;
if (!acknowledgeTime && !resolveTime) {
return (
'Not yet ' +
(getAcknowledgeState()?.name?.toLowerCase() || 'acknowledged')
);
}
if (!acknowledgeTime && resolveTime) {
return OneUptimeDate.convertMinutesToDaysHoursAndMinutes(
OneUptimeDate.getDifferenceInMinutes(
resolveTime,
incidentStartTime
)
);
}
return OneUptimeDate.convertMinutesToDaysHoursAndMinutes(
OneUptimeDate.getDifferenceInMinutes(
acknowledgeTime,
acknowledgeTime!,
incidentStartTime
)
);