- {showCountdown && (
-
-
-
- }
- tooltipText={
-
- {showTriageCountdown && (
- <>
-
Due date:
-
Triage: {countdown.triage}
-
- )}
- {showBugCountdown && (
- <>
-
Due date:
-
Bug: {countdown.bug}
-
- )}
- {showReady &&
Ready for acknowledge
}
-
- }
+
+
- )}
+ }
+ tooltipText={
+
+
Ready for acknowledge
+
+ }
+ />
+
-
+
);
}
+
+ const dueDateStr = triaged
+ ? alertSummary.bug_due_date
+ : alertSummary.triage_due_date;
+
+ const now = new Date(Date.now());
+ const label = getCountdownLabel(now, new Date(dueDateStr));
+ const heading = triaged ? 'Bug Due' : 'Triage Due';
+
+ return (
+
+
+
+
+ }
+ tooltipText={
+
+
+
+ {heading}: {formatDate(dueDateStr)}
+
+
Time left: {label}
+
+
+ }
+ />
+
+
+
+ );
}
AlertStatusCountdown.propTypes = {
diff --git a/ui/perfherder/perf-helpers/alertCountdownHelper.js b/ui/perfherder/perf-helpers/alertCountdownHelper.js
index 5b5bcb87490..ac7574cba50 100644
--- a/ui/perfherder/perf-helpers/alertCountdownHelper.js
+++ b/ui/perfherder/perf-helpers/alertCountdownHelper.js
@@ -1,66 +1,47 @@
-import { weekdays } from './constants';
+const MS_PER_HOUR = 1000 * 60 * 60;
+const MS_PER_DAY = MS_PER_HOUR * 24;
export const isWeekend = () => {
- const currentDate = new Date(Date.now());
- const currentDay = currentDate.getDay();
-
- return currentDay === weekdays.saturday || currentDay === weekdays.sunday;
+ const day = new Date(Date.now()).getDay();
+ return day === 0 || day === 6;
};
-export const getTimeDifference = (currentDate, dueDate) => {
- const timeDifference = Math.abs(dueDate - currentDate);
- let differenceInDays = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
- // saturday and sunday are considered weekend days
- const weekendDaysCount = 2;
- // convert days to weeks and keeps the count of full weeks
- const weeksCount = Math.trunc(differenceInDays / 7);
- // count the total weekend days
- const weekendDaysToSubstract = weekendDaysCount * weeksCount;
- const currentDay = currentDate.getUTCDay();
- const dueDay = dueDate.getUTCDay();
-
- // [1. Mon] [2. Tue] [3. Wed] [4. Thu] [5. Fri] [6. Sat] [7. Sun]
- // currentDate -------- -------- ----->>>
- // -------- -------> dueDate
- if (currentDay > dueDay) {
- // If weekday of startDate is bigger than endDate then it is a new week,
- // and we have to subtract the weekend days
- differenceInDays -= weekendDaysCount;
- } else {
- // substracts the total weekend days from the total days
- differenceInDays -= weekendDaysToSubstract;
+export const alertIsTriaged = (alertSummary) => !!alertSummary.first_triaged;
+export const alertIsLinkedToBug = (alertSummary) => !!alertSummary.bug_number;
+
+// Before: two exported functions, getTimeDifference() and getCountdownText(), that
+// callers had to invoke in sequence and pass the intermediate { hours, days } object
+// between them. getTimeDifference used a week-counting heuristic (full weeks × 2
+// weekend days) that gave wrong results when the date range crossed a partial week.
+// getCountdownText also checked "hours left" before "Overdue", so an alert that was
+// overdue by less than 24 h would display "0 hours left" instead of "Overdue".
+//
+// After: workingMsBetween() is a private helper that steps day-by-day to count
+// weekend days precisely, and getCountdownLabel() is the single public entry point
+// that returns the final display string in one call.
+const workingMsBetween = (now, dueDate) => {
+ const totalMs = dueDate.getTime() - now.getTime();
+ if (totalMs <= 0) return 0;
+
+ let weekendDayCount = 0;
+ let cursor = new Date(now.getTime());
+ while (cursor < dueDate) {
+ const day = cursor.getUTCDay();
+ if (day === 0 || day === 6) weekendDayCount++;
+ cursor.setTime(cursor.getTime() + MS_PER_DAY);
}
- let hoursDifference = Math.ceil(timeDifference / (1000 * 60 * 60));
- const shouldGetHoursLeft =
- currentDay === weekdays.friday && dueDay === weekdays.monday;
- // If due date is Monday and today is Friday and we have to show the hours left,
- // we have to subtract the weekend hours from the difference
- if (shouldGetHoursLeft) {
- hoursDifference -= 2 * 24;
- }
- return {
- hours: hoursDifference,
- days: differenceInDays,
- };
+ return Math.max(0, totalMs - weekendDayCount * MS_PER_DAY);
};
-export const getCountdownText = (now, dueDate, difference) => {
- if (difference.hours < 24 && difference.hours >= 0) {
- return `${difference.hours} hours left`;
- }
+export const getCountdownLabel = (now, dueDate) => {
+ // Overdue check must come first — the old code checked "hours left" before
+ // "Overdue", causing an alert past its due date by <24 h to show "0 hours left".
+ if (now >= dueDate) return 'Overdue';
- if (now.getTime() >= dueDate.getTime()) {
- return `Overdue`;
+ const workingMs = workingMsBetween(now, dueDate);
+ if (workingMs < MS_PER_DAY) {
+ return `${Math.ceil(workingMs / MS_PER_HOUR)} hours left`;
}
-
- return `${difference.days} days left`;
-};
-
-export const alertIsTriaged = (alertSummary) => {
- return !!alertSummary.first_triaged;
-};
-
-export const alertIsLinkedToBug = (alertSummary) => {
- return !!alertSummary.bug_number;
+ return `${Math.ceil(workingMs / MS_PER_DAY)} days left`;
};