@optifye/dashboard-core 6.12.38 → 6.12.39

package/dist/index.js

@@ -37286,7 +37286,9 @@ var HourlyOutputChartComponent = ({
       const idleSlot = idleSlots[i];
       const explicitTarget = hasHourlyTargetOutputProp ? effectiveHourlyTargetOutput?.[i] ?? null : void 0;
       const currentTarget = hasHourlyTargetOutputProp ? explicitTarget : targets[i] || pphThreshold;
+      const outputForComparison = Math.round(animatedData[i] || 0);
       const comparisonTarget = currentTarget === null || currentTarget === void 0 ? targets[i] || pphThreshold : currentTarget;
+      const targetForComparison = Math.round(comparisonTarget);
       return {
         hourIndex: idleSlot?.hourIndex ?? i,
         hour: idleSlot?.hour || "",
@@ -37295,7 +37297,7 @@ var HourlyOutputChartComponent = ({
         originalOutput: data[i] || 0,
         // Keep original data for labels
         target: currentTarget ?? null,
-        color: (animatedData[i] || 0) >= comparisonTarget ? "#00AB45" : "#E34329",
+        color: outputForComparison >= targetForComparison ? "#00AB45" : "#E34329",
         idleMinutes: idleSlot?.idleMinutes || 0,
         idleArray: idleSlot?.idleArray || [],
         skuIndex: i,
@@ -59665,6 +59667,42 @@ var buildSnapshotRows = (entries, lines) => {
     rowType: row.rowType
   }));
 };
+var isValidSnapshotRow = (row) => !!row && typeof row.efficiency === "number" && Number.isFinite(row.efficiency) && typeof row.rank === "number" && Number.isFinite(row.rank);
+var refreshPendingEventsFromSnapshot = (events, currentSnapshot) => {
+  if (events.length === 0 || currentSnapshot.length === 0) return [];
+  const snapshotByRowId = new Map(currentSnapshot.map((row) => [row.lineId, row]));
+  return events.flatMap((event) => {
+    const currentSubject = snapshotByRowId.get(event.crossingLineId);
+    if (!isValidSnapshotRow(currentSubject)) return [];
+    const movedFromOriginalRank = event.direction === "up" ? currentSubject.rank < event.previousRank : currentSubject.rank > event.previousRank;
+    if (!movedFromOriginalRank) return [];
+    const crossedLines = event.crossedLines.flatMap((crossedLine) => {
+      const currentCrossedLine = snapshotByRowId.get(crossedLine.lineId);
+      if (!isValidSnapshotRow(currentCrossedLine)) return [];
+      const stillCrossed = event.direction === "up" ? currentSubject.rank < currentCrossedLine.rank : currentSubject.rank > currentCrossedLine.rank;
+      if (!stillCrossed) return [];
+      return [{
+        ...crossedLine,
+        lineName: currentCrossedLine.lineName,
+        currentRank: currentCrossedLine.rank,
+        currentEfficiency: currentCrossedLine.efficiency
+      }];
+    });
+    if (crossedLines.length !== event.crossedLines.length) return [];
+    return [{
+      ...event,
+      crossingLineName: currentSubject.lineName,
+      currentRank: currentSubject.rank,
+      currentEfficiency: currentSubject.efficiency,
+      crossedLines,
+      eventKey: buildLineOvertakeEventKey(
+        event.crossingLineId,
+        event.direction,
+        crossedLines.map((line) => line.lineId)
+      )
+    }];
+  });
+};
 var formatCrossedLineNames = (event) => {
   const names = event.crossedLines.map((line) => line.lineName).filter(Boolean);
   if (names.length === 0) return "another line";
@@ -59722,6 +59760,7 @@ var storeEventKey = (scopeKey, eventKey) => {
   } catch {
   }
 };
+var buildAcknowledgementKey = (scopeKey, eventKey) => `${scopeKey}:${eventKey}`;
 var LineOvertakeNotificationPopup = ({
   events,
   onDismiss,
@@ -59871,6 +59910,7 @@ var LineOvertakeNotificationManager = ({
   const [visibleLines, setVisibleLines] = React146.useState([]);
   const [linesLoaded, setLinesLoaded] = React146.useState(false);
   const [notificationEvents, setNotificationEvents] = React146.useState([]);
+  const [returnValidationPending, setReturnValidationPending] = React146.useState(false);
   const isOnActiveToastSurface = isActiveToastSurface(router$1.asPath);
   const qaSimulationMode = isOnActiveToastSurface ? getLocalQaSimulationMode(router$1.asPath) : null;
   const qaSimulationEnabled = Boolean(qaSimulationMode);
@@ -59897,20 +59937,33 @@ var LineOvertakeNotificationManager = ({
   const scopeKeyRef = React146.useRef("");
   const pollInFlightRef = React146.useRef(false);
   const notificationEventsRef = React146.useRef([]);
+  const acknowledgedEventKeysRef = React146.useRef(/* @__PURE__ */ new Set());
+  const wasOnActiveToastSurfaceRef = React146.useRef(isOnActiveToastSurface);
   const dedupeScopeKey = React146.useMemo(
-    () => [
-      user?.id || "anonymous",
-      companyId || "no-company",
-      currentShift.date,
-      currentShift.shiftId,
-      roleMode || "disabled",
-      watchedLineIds.slice().sort().join(",")
-    ].join("|"),
+    () => {
+      if (qaSimulationEnabled) {
+        return [
+          user?.id || "anonymous",
+          "qa-simulation",
+          qaSimulationMode || "default"
+        ].join("|");
+      }
+      return [
+        user?.id || "anonymous",
+        companyId || "no-company",
+        currentShift.date,
+        currentShift.shiftId,
+        roleMode || "disabled",
+        watchedLineIds.slice().sort().join(",")
+      ].join("|");
+    },
     [
       user?.id,
       companyId,
       currentShift.date,
       currentShift.shiftId,
+      qaSimulationEnabled,
+      qaSimulationMode,
       roleMode,
       watchedLineIds
     ]
@@ -59947,13 +60000,45 @@ var LineOvertakeNotificationManager = ({
     previousSnapshotRef.current = null;
     notificationEventsRef.current = [];
     setNotificationEvents([]);
+    setReturnValidationPending(false);
     scopeKeyRef.current = scopeKey;
   }, [isOnActiveToastSurface, scopeKey]);
   React146.useEffect(() => {
-    if (isOnActiveToastSurface) return;
+    const wasOnActiveToastSurface = wasOnActiveToastSurfaceRef.current;
+    wasOnActiveToastSurfaceRef.current = isOnActiveToastSurface;
+    if (wasOnActiveToastSurface && !isOnActiveToastSurface && notificationEventsRef.current.length > 0) {
+      setReturnValidationPending(true);
+      return;
+    }
+    if (!wasOnActiveToastSurface && isOnActiveToastSurface && notificationEventsRef.current.length === 0) {
+      setReturnValidationPending(false);
+    }
+  }, [isOnActiveToastSurface]);
+  const acknowledgeCurrentEvents = React146.useCallback(() => {
+    notificationEventsRef.current.forEach((event) => {
+      acknowledgedEventKeysRef.current.add(buildAcknowledgementKey(dedupeScopeKey, event.eventKey));
+      storeEventKey(dedupeScopeKey, event.eventKey);
+    });
     notificationEventsRef.current = [];
     setNotificationEvents([]);
-  }, [isOnActiveToastSurface]);
+    setReturnValidationPending(false);
+  }, [dedupeScopeKey]);
+  const clearPendingEvents = React146.useCallback(() => {
+    notificationEventsRef.current = [];
+    setNotificationEvents([]);
+    setReturnValidationPending(false);
+  }, []);
+  const finishReturnValidation = React146.useCallback((events, currentSnapshot) => {
+    if (events.length === 0 && notificationEventsRef.current.length > 0) {
+      const validatedEvents = refreshPendingEventsFromSnapshot(
+        notificationEventsRef.current,
+        currentSnapshot
+      );
+      notificationEventsRef.current = validatedEvents;
+      setNotificationEvents(validatedEvents);
+    }
+    setReturnValidationPending(false);
+  }, []);
   React146.useEffect(() => {
     let cancelled = false;
     const loadLines = async () => {
@@ -59994,10 +60079,9 @@ var LineOvertakeNotificationManager = ({
     };
   }, [companyId, isOnActiveToastSurface, qaSimulationEnabled, roleMode, supabase]);
   const openLeaderboard = React146.useCallback(() => {
-    notificationEventsRef.current = [];
-    setNotificationEvents([]);
+    acknowledgeCurrentEvents();
     void router$1.push("/kpis?tab=leaderboard");
-  }, [router$1]);
+  }, [acknowledgeCurrentEvents, router$1]);
   const updateOvertakeEvents = React146.useCallback((events) => {
     if (events.length === 0) return;
     const currentEventByRowId = new Map(
@@ -60005,13 +60089,9 @@ var LineOvertakeNotificationManager = ({
     );
     const nextEvents = events.filter((event) => {
       if (currentEventByRowId.has(event.crossingLineId)) return true;
-      return !hasStoredEventKey(dedupeScopeKey, event.eventKey);
+      return !(acknowledgedEventKeysRef.current.has(buildAcknowledgementKey(dedupeScopeKey, event.eventKey)) || hasStoredEventKey(dedupeScopeKey, event.eventKey));
     });
     if (nextEvents.length === 0) return;
-    nextEvents.forEach((event) => {
-      if (currentEventByRowId.has(event.crossingLineId)) return;
-      storeEventKey(dedupeScopeKey, event.eventKey);
-    });
     setNotificationEvents((currentEvents) => {
       const eventByRowId = new Map(currentEvents.map((event) => [event.crossingLineId, event]));
       nextEvents.forEach((event) => {
@@ -60054,6 +60134,7 @@ var LineOvertakeNotificationManager = ({
         });
         previousSnapshotRef.current = QA_CROSSED_ROWS;
         updateOvertakeEvents(events);
+        finishReturnValidation(events, QA_CROSSED_ROWS);
       } finally {
         pollInFlightRef.current = false;
       }
@@ -60076,11 +60157,17 @@ var LineOvertakeNotificationManager = ({
       const currentSnapshot = buildSnapshotRows(entries, visibleLines);
       if (currentSnapshot.length === 0) {
         previousSnapshotRef.current = null;
+        if (returnValidationPending) {
+          clearPendingEvents();
+        }
         return;
       }
       const previousSnapshot = previousSnapshotRef.current;
       previousSnapshotRef.current = currentSnapshot;
-      if (!previousSnapshot) return;
+      if (!previousSnapshot) {
+        finishReturnValidation([], currentSnapshot);
+        return;
+      }
       const events = detectLineOvertakeEvents({
         roleMode,
         watchedLineIds,
@@ -60088,6 +60175,7 @@ var LineOvertakeNotificationManager = ({
         currentRows: currentSnapshot
       });
       updateOvertakeEvents(events);
+      finishReturnValidation(events, currentSnapshot);
     } catch (error) {
       console.warn("[LineOvertakeNotificationManager] Failed to poll daily leaderboard:", error);
     } finally {
@@ -60101,8 +60189,11 @@ var LineOvertakeNotificationManager = ({
     linesLoaded,
     qaSimulationEnabled,
     qaSimulationMode,
+    returnValidationPending,
     roleMode,
     supabase,
+    clearPendingEvents,
+    finishReturnValidation,
     updateOvertakeEvents,
     visibleLineIds,
     watchedLineIds
@@ -60120,14 +60211,12 @@ var LineOvertakeNotificationManager = ({
     };
   }, [pollIntervalMs, pollLeaderboard]);
   if (!isOnActiveToastSurface) return null;
+  if (returnValidationPending) return null;
   return /* @__PURE__ */ jsxRuntime.jsx(
     LineOvertakeNotificationPopup,
     {
       events: notificationEvents,
-      onDismiss: () => {
-        notificationEventsRef.current = [];
-        setNotificationEvents([]);
-      },
+      onDismiss: acknowledgeCurrentEvents,
       onOpenLeaderboard: openLeaderboard
     }
   );
@@ -65305,6 +65394,7 @@ var useLiveMonitorBootstrap = ({
   const activeRequestIdRef = React146.useRef(0);
   const isFetchingRef = React146.useRef(false);
   const pendingRealtimeRefreshRef = React146.useRef(false);
+  const pendingForcedRefreshRef = React146.useRef(false);
   const realtimeRefreshTimerRef = React146.useRef(null);
   const lastRealtimeRefreshStartedAtRef = React146.useRef(0);
   const fetchBootstrap = React146.useCallback(async (force = false) => {
@@ -65378,6 +65468,18 @@ var useLiveMonitorBootstrap = ({
   React146.useEffect(() => {
     fetchBootstrapRef.current = fetchBootstrap;
   }, [fetchBootstrap]);
+  const requestScheduledForcedRefresh = React146.useCallback(() => {
+    if (!enabled || !supabase || !resolvedCompanyId || normalizedLineIds.length === 0) {
+      pendingForcedRefreshRef.current = false;
+      return;
+    }
+    if (isFetchingRef.current) {
+      pendingForcedRefreshRef.current = true;
+      return;
+    }
+    pendingForcedRefreshRef.current = false;
+    void fetchBootstrapRef.current(true);
+  }, [enabled, normalizedLineIds.length, resolvedCompanyId, supabase]);
   const clearRealtimeRefreshTimer = React146.useCallback(() => {
     if (realtimeRefreshTimerRef.current !== null) {
       window.clearTimeout(realtimeRefreshTimerRef.current);
@@ -65402,9 +65504,9 @@ var useLiveMonitorBootstrap = ({
       }
       pendingRealtimeRefreshRef.current = false;
       lastRealtimeRefreshStartedAtRef.current = Date.now();
-      void fetchBootstrapRef.current(true);
+      requestScheduledForcedRefresh();
     }, nextDelay);
-  }, [enabled, supabase]);
+  }, [enabled, requestScheduledForcedRefresh, supabase]);
   const queueRealtimeRefresh = React146.useCallback(() => {
     if (!enabled || !supabase) {
       pendingRealtimeRefreshRef.current = false;
@@ -65417,9 +65519,15 @@ var useLiveMonitorBootstrap = ({
   React146.useEffect(() => {
     return () => {
       pendingRealtimeRefreshRef.current = false;
+      pendingForcedRefreshRef.current = false;
       clearRealtimeRefreshTimer();
     };
   }, [clearRealtimeRefreshTimer]);
+  React146.useEffect(() => {
+    if (!isLoading && pendingForcedRefreshRef.current) {
+      requestScheduledForcedRefresh();
+    }
+  }, [isLoading, requestScheduledForcedRefresh]);
   React146.useEffect(() => {
     if (!enabled || !rawState || !resolvedCompanyId) {
       return;
@@ -65558,9 +65666,7 @@ var useLiveMonitorBootstrap = ({
     if (!enabled || !resolvedCompanyId || normalizedLineIds.length === 0 || !supabase) {
       return void 0;
     }
-    const forceRefreshOnResume = () => {
-      void fetchBootstrapRef.current(true);
-    };
+    const forceRefreshOnResume = () => requestScheduledForcedRefresh();
     const handleVisibilityChange = () => {
       if (document.visibilityState === "visible") {
         forceRefreshOnResume();
@@ -65574,7 +65680,7 @@ var useLiveMonitorBootstrap = ({
       window.removeEventListener("focus", forceRefreshOnResume);
       window.removeEventListener("online", forceRefreshOnResume);
     };
-  }, [enabled, normalizedLineIds.length, resolvedCompanyId, supabase]);
+  }, [enabled, normalizedLineIds.length, requestScheduledForcedRefresh, resolvedCompanyId, supabase]);
   React146.useEffect(() => {
     if (!enabled || !resolvedCompanyId || normalizedLineIds.length === 0 || !supabase) {
       return void 0;
@@ -65582,7 +65688,7 @@ var useLiveMonitorBootstrap = ({
     let intervalId = null;
     let timeoutId = null;
     const runMinuteTick = () => {
-      void fetchBootstrap(true);
+      requestScheduledForcedRefresh();
     };
     const startInterval = () => {
       runMinuteTick();
@@ -65601,7 +65707,7 @@ var useLiveMonitorBootstrap = ({
         window.clearInterval(intervalId);
       }
     };
-  }, [enabled, resolvedCompanyId, normalizedLineIds, supabase, fetchBootstrap]);
+  }, [enabled, normalizedLineIds, requestScheduledForcedRefresh, resolvedCompanyId, supabase]);
   const isCurrentScopeResolved = state.requestKey === requestKey;
   return {
     resolvedScope: state.resolvedScope,
@@ -71578,6 +71684,7 @@ var KPIsOverviewView = ({
   const [viewType, setViewType] = React146.useState("operator");
   const [selectedLeaderboardDate, setSelectedLeaderboardDate] = React146.useState("");
   const [selectedLeaderboardShiftId, setSelectedLeaderboardShiftId] = React146.useState(0);
+  const [leaderboardDailyScopeMode, setLeaderboardDailyScopeMode] = React146.useState("live");
   const [hasHydratedLeaderboardRouteState, setHasHydratedLeaderboardRouteState] = React146.useState(false);
   const [loading, setLoading] = React146.useState(true);
   const [isFilterOpen, setIsFilterOpen] = React146.useState(false);
@@ -71697,14 +71804,16 @@ var KPIsOverviewView = ({
   const currentShiftId = currentShiftDetails.shiftId;
   const activeFiltersCount = React146__namespace.default.useMemo(() => {
     let count = 0;
-    if (selectedLeaderboardShiftId !== currentShiftId) {
+    if (leaderboardDailyScopeMode === "historical" && selectedLeaderboardShiftId !== currentShiftId) {
       count++;
     }
     return count;
-  }, [selectedLeaderboardShiftId, currentShiftId]);
+  }, [leaderboardDailyScopeMode, selectedLeaderboardShiftId, currentShiftId]);
   const clearFilters = React146__namespace.default.useCallback(() => {
     setSelectedLeaderboardShiftId(currentShiftId);
-  }, [currentShiftId]);
+    setSelectedLeaderboardDate(currentShiftDate);
+    setLeaderboardDailyScopeMode("live");
+  }, [currentShiftDate, currentShiftId]);
   React146.useEffect(() => {
     const handleClickOutside = (event) => {
       const target = event.target;
@@ -71736,7 +71845,24 @@ var KPIsOverviewView = ({
   }, [shiftConfig]);
   const effectiveLeaderboardDate = selectedLeaderboardDate || currentShiftDate;
   const effectiveLeaderboardShiftId = Number.isFinite(selectedLeaderboardShiftId) ? selectedLeaderboardShiftId : currentShiftId;
-  const isHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && (effectiveLeaderboardDate !== currentShiftDate || effectiveLeaderboardShiftId !== currentShiftId);
+  const isHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && leaderboardDailyScopeMode === "historical" && (effectiveLeaderboardDate !== currentShiftDate || effectiveLeaderboardShiftId !== currentShiftId);
+  const updateLeaderboardDate = React146__namespace.default.useCallback((dateKey) => {
+    setSelectedLeaderboardDate(dateKey);
+    setLeaderboardDailyScopeMode(
+      dateKey === currentShiftDate && effectiveLeaderboardShiftId === currentShiftId ? "live" : "historical"
+    );
+  }, [currentShiftDate, currentShiftId, effectiveLeaderboardShiftId]);
+  const updateLeaderboardShiftId = React146__namespace.default.useCallback((shiftId) => {
+    setSelectedLeaderboardShiftId(shiftId);
+    setLeaderboardDailyScopeMode(
+      effectiveLeaderboardDate === currentShiftDate && shiftId === currentShiftId ? "live" : "historical"
+    );
+  }, [currentShiftDate, currentShiftId, effectiveLeaderboardDate]);
+  const returnLeaderboardToLive = React146__namespace.default.useCallback(() => {
+    setSelectedLeaderboardDate(currentShiftDate);
+    setSelectedLeaderboardShiftId(currentShiftId);
+    setLeaderboardDailyScopeMode("live");
+  }, [currentShiftDate, currentShiftId]);
   const selectedFactoryIdFromUrl = getSingleQueryValue(router$1.query[KPI_FACTORY_QUERY_PARAM]);
   const selectedFactoryAreaIdFromUrl = getSingleQueryValue(router$1.query[KPI_FACTORY_AREA_QUERY_PARAM]);
   const kpiLineHierarchy = React146__namespace.default.useMemo(
@@ -71762,10 +71888,12 @@ var KPIsOverviewView = ({
     if (hasHistoricalQuery) {
       setSelectedLeaderboardDate(dateQuery);
       setSelectedLeaderboardShiftId(parsedShiftQuery);
+      setLeaderboardDailyScopeMode("historical");
       setTimeRange("today");
     } else {
       setSelectedLeaderboardDate(currentShiftDate);
       setSelectedLeaderboardShiftId(currentShiftId);
+      setLeaderboardDailyScopeMode("live");
     }
     setHasHydratedLeaderboardRouteState(true);
   }, [
@@ -71788,7 +71916,8 @@ var KPIsOverviewView = ({
       pendingTabRouteSyncRef.current = null;
     }
     const expectedTab = activeTab === "leaderboard" ? "leaderboard" : void 0;
-    const expectedDate = activeTab === "leaderboard" && timeRange === "today" && isHistoricalLeaderboardDaily ? effectiveLeaderboardDate : void 0;
+    const shouldPersistHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && leaderboardDailyScopeMode === "historical" && isHistoricalLeaderboardDaily;
+    const expectedDate = shouldPersistHistoricalLeaderboardDaily ? effectiveLeaderboardDate : void 0;
     const expectedShift = expectedDate !== void 0 ? effectiveLeaderboardShiftId.toString() : void 0;
     const expectedFactory = activeTab === "today" && selectedFactoryNode ? selectedFactoryNode.id : void 0;
     const expectedFactoryArea = activeTab === "today" && selectedFactoryNode && selectedFactoryAreaNode ? selectedFactoryAreaNode.id : void 0;
@@ -71814,6 +71943,7 @@ var KPIsOverviewView = ({
     router$1,
     activeTab,
     timeRange,
+    leaderboardDailyScopeMode,
     effectiveLeaderboardDate,
     effectiveLeaderboardShiftId,
     hasHydratedLeaderboardRouteState,
@@ -72235,7 +72365,7 @@ var KPIsOverviewView = ({
   const currentEfficiencyMap = timeRange === "today" ? todayEfficiencyByLineId : monthlyEfficiencyByLineId;
   const currentFallbackEfficiencyMap = timeRange === "today" ? dailyFallbackEfficiencyByLineId : void 0;
   const showLeaderboardLoader = activeTab === "leaderboard" && (leaderboardLinesLoading || isLeaderboardLoading && currentEfficiencyMap.size === 0 && (currentFallbackEfficiencyMap?.size ?? 0) === 0);
-  const showHistoricalLeaderboardHeader = activeTab === "leaderboard" && timeRange === "today" && isHistoricalLeaderboardDaily;
+  const showHistoricalLeaderboardHeader = activeTab === "leaderboard" && timeRange === "today" && leaderboardDailyScopeMode === "historical" && isHistoricalLeaderboardDaily;
   const headerDateKey = activeTab === "leaderboard" && timeRange === "today" ? effectiveLeaderboardDate : monthEndDateKey;
   const headerShiftId = showHistoricalLeaderboardHeader ? effectiveLeaderboardShiftId : currentShiftDetails.shiftId;
   const headerShiftName = getShiftNameById(headerShiftId, configuredTimezone, shiftConfig).replace(/ Shift$/i, "");
@@ -72430,10 +72560,7 @@ var KPIsOverviewView = ({
                 "button",
                 {
                   type: "button",
-                  onClick: () => {
-                    setSelectedLeaderboardDate(currentShiftDate);
-                    setSelectedLeaderboardShiftId(currentShiftId);
-                  },
+                  onClick: returnLeaderboardToLive,
                   className: "text-[10px] font-medium text-blue-600 hover:text-blue-700 hover:underline bg-blue-50 px-2 py-1 rounded-md",
                   children: "Return to Live"
                 }
@@ -72479,10 +72606,7 @@ var KPIsOverviewView = ({
             "button",
             {
               type: "button",
-              onClick: () => {
-                setSelectedLeaderboardDate(currentShiftDate);
-                setSelectedLeaderboardShiftId(currentShiftId);
-              },
+              onClick: returnLeaderboardToLive,
               className: "text-xs sm:text-sm font-medium text-blue-600 bg-blue-50 border border-blue-100 hover:bg-blue-100 hover:text-blue-700 px-3 py-1.5 rounded-lg transition-colors shadow-sm ml-4 whitespace-nowrap",
               children: "Return to Live"
             }
@@ -72550,7 +72674,7 @@ var KPIsOverviewView = ({
                     endKey: effectiveLeaderboardDate
                   },
                   onChange: (range) => {
-                    setSelectedLeaderboardDate(range.startKey);
+                    updateLeaderboardDate(range.startKey);
                   },
                   showLabel: false,
                   singleDateOnly: true
@@ -72590,7 +72714,7 @@ var KPIsOverviewView = ({
                       {
                         "aria-label": "Leaderboard shift",
                         value: effectiveLeaderboardShiftId,
-                        onChange: (e) => setSelectedLeaderboardShiftId(Number(e.target.value)),
+                        onChange: (e) => updateLeaderboardShiftId(Number(e.target.value)),
                         className: "w-full appearance-none pl-3 pr-8 py-2 text-sm bg-gray-50 border border-gray-200 hover:border-gray-300 rounded-lg text-gray-900 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:bg-white transition-all cursor-pointer",
                         style: { backgroundImage: `url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e")`, backgroundPosition: `right 0.75rem center`, backgroundRepeat: `no-repeat`, backgroundSize: `1.2em 1.2em` },
                         children: leaderboardShiftOptions.map((shiftOption) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: shiftOption.id, children: shiftOption.label }, shiftOption.id))

package/dist/index.mjs

@@ -37257,7 +37257,9 @@ var HourlyOutputChartComponent = ({
       const idleSlot = idleSlots[i];
       const explicitTarget = hasHourlyTargetOutputProp ? effectiveHourlyTargetOutput?.[i] ?? null : void 0;
       const currentTarget = hasHourlyTargetOutputProp ? explicitTarget : targets[i] || pphThreshold;
+      const outputForComparison = Math.round(animatedData[i] || 0);
       const comparisonTarget = currentTarget === null || currentTarget === void 0 ? targets[i] || pphThreshold : currentTarget;
+      const targetForComparison = Math.round(comparisonTarget);
       return {
         hourIndex: idleSlot?.hourIndex ?? i,
         hour: idleSlot?.hour || "",
@@ -37266,7 +37268,7 @@ var HourlyOutputChartComponent = ({
         originalOutput: data[i] || 0,
         // Keep original data for labels
         target: currentTarget ?? null,
-        color: (animatedData[i] || 0) >= comparisonTarget ? "#00AB45" : "#E34329",
+        color: outputForComparison >= targetForComparison ? "#00AB45" : "#E34329",
         idleMinutes: idleSlot?.idleMinutes || 0,
         idleArray: idleSlot?.idleArray || [],
         skuIndex: i,
@@ -59636,6 +59638,42 @@ var buildSnapshotRows = (entries, lines) => {
     rowType: row.rowType
   }));
 };
+var isValidSnapshotRow = (row) => !!row && typeof row.efficiency === "number" && Number.isFinite(row.efficiency) && typeof row.rank === "number" && Number.isFinite(row.rank);
+var refreshPendingEventsFromSnapshot = (events, currentSnapshot) => {
+  if (events.length === 0 || currentSnapshot.length === 0) return [];
+  const snapshotByRowId = new Map(currentSnapshot.map((row) => [row.lineId, row]));
+  return events.flatMap((event) => {
+    const currentSubject = snapshotByRowId.get(event.crossingLineId);
+    if (!isValidSnapshotRow(currentSubject)) return [];
+    const movedFromOriginalRank = event.direction === "up" ? currentSubject.rank < event.previousRank : currentSubject.rank > event.previousRank;
+    if (!movedFromOriginalRank) return [];
+    const crossedLines = event.crossedLines.flatMap((crossedLine) => {
+      const currentCrossedLine = snapshotByRowId.get(crossedLine.lineId);
+      if (!isValidSnapshotRow(currentCrossedLine)) return [];
+      const stillCrossed = event.direction === "up" ? currentSubject.rank < currentCrossedLine.rank : currentSubject.rank > currentCrossedLine.rank;
+      if (!stillCrossed) return [];
+      return [{
+        ...crossedLine,
+        lineName: currentCrossedLine.lineName,
+        currentRank: currentCrossedLine.rank,
+        currentEfficiency: currentCrossedLine.efficiency
+      }];
+    });
+    if (crossedLines.length !== event.crossedLines.length) return [];
+    return [{
+      ...event,
+      crossingLineName: currentSubject.lineName,
+      currentRank: currentSubject.rank,
+      currentEfficiency: currentSubject.efficiency,
+      crossedLines,
+      eventKey: buildLineOvertakeEventKey(
+        event.crossingLineId,
+        event.direction,
+        crossedLines.map((line) => line.lineId)
+      )
+    }];
+  });
+};
 var formatCrossedLineNames = (event) => {
   const names = event.crossedLines.map((line) => line.lineName).filter(Boolean);
   if (names.length === 0) return "another line";
@@ -59693,6 +59731,7 @@ var storeEventKey = (scopeKey, eventKey) => {
   } catch {
   }
 };
+var buildAcknowledgementKey = (scopeKey, eventKey) => `${scopeKey}:${eventKey}`;
 var LineOvertakeNotificationPopup = ({
   events,
   onDismiss,
@@ -59842,6 +59881,7 @@ var LineOvertakeNotificationManager = ({
   const [visibleLines, setVisibleLines] = useState([]);
   const [linesLoaded, setLinesLoaded] = useState(false);
   const [notificationEvents, setNotificationEvents] = useState([]);
+  const [returnValidationPending, setReturnValidationPending] = useState(false);
   const isOnActiveToastSurface = isActiveToastSurface(router.asPath);
   const qaSimulationMode = isOnActiveToastSurface ? getLocalQaSimulationMode(router.asPath) : null;
   const qaSimulationEnabled = Boolean(qaSimulationMode);
@@ -59868,20 +59908,33 @@ var LineOvertakeNotificationManager = ({
   const scopeKeyRef = useRef("");
   const pollInFlightRef = useRef(false);
   const notificationEventsRef = useRef([]);
+  const acknowledgedEventKeysRef = useRef(/* @__PURE__ */ new Set());
+  const wasOnActiveToastSurfaceRef = useRef(isOnActiveToastSurface);
   const dedupeScopeKey = useMemo(
-    () => [
-      user?.id || "anonymous",
-      companyId || "no-company",
-      currentShift.date,
-      currentShift.shiftId,
-      roleMode || "disabled",
-      watchedLineIds.slice().sort().join(",")
-    ].join("|"),
+    () => {
+      if (qaSimulationEnabled) {
+        return [
+          user?.id || "anonymous",
+          "qa-simulation",
+          qaSimulationMode || "default"
+        ].join("|");
+      }
+      return [
+        user?.id || "anonymous",
+        companyId || "no-company",
+        currentShift.date,
+        currentShift.shiftId,
+        roleMode || "disabled",
+        watchedLineIds.slice().sort().join(",")
+      ].join("|");
+    },
     [
       user?.id,
       companyId,
       currentShift.date,
       currentShift.shiftId,
+      qaSimulationEnabled,
+      qaSimulationMode,
       roleMode,
       watchedLineIds
     ]
@@ -59918,13 +59971,45 @@ var LineOvertakeNotificationManager = ({
     previousSnapshotRef.current = null;
     notificationEventsRef.current = [];
     setNotificationEvents([]);
+    setReturnValidationPending(false);
     scopeKeyRef.current = scopeKey;
   }, [isOnActiveToastSurface, scopeKey]);
   useEffect(() => {
-    if (isOnActiveToastSurface) return;
+    const wasOnActiveToastSurface = wasOnActiveToastSurfaceRef.current;
+    wasOnActiveToastSurfaceRef.current = isOnActiveToastSurface;
+    if (wasOnActiveToastSurface && !isOnActiveToastSurface && notificationEventsRef.current.length > 0) {
+      setReturnValidationPending(true);
+      return;
+    }
+    if (!wasOnActiveToastSurface && isOnActiveToastSurface && notificationEventsRef.current.length === 0) {
+      setReturnValidationPending(false);
+    }
+  }, [isOnActiveToastSurface]);
+  const acknowledgeCurrentEvents = useCallback(() => {
+    notificationEventsRef.current.forEach((event) => {
+      acknowledgedEventKeysRef.current.add(buildAcknowledgementKey(dedupeScopeKey, event.eventKey));
+      storeEventKey(dedupeScopeKey, event.eventKey);
+    });
     notificationEventsRef.current = [];
     setNotificationEvents([]);
-  }, [isOnActiveToastSurface]);
+    setReturnValidationPending(false);
+  }, [dedupeScopeKey]);
+  const clearPendingEvents = useCallback(() => {
+    notificationEventsRef.current = [];
+    setNotificationEvents([]);
+    setReturnValidationPending(false);
+  }, []);
+  const finishReturnValidation = useCallback((events, currentSnapshot) => {
+    if (events.length === 0 && notificationEventsRef.current.length > 0) {
+      const validatedEvents = refreshPendingEventsFromSnapshot(
+        notificationEventsRef.current,
+        currentSnapshot
+      );
+      notificationEventsRef.current = validatedEvents;
+      setNotificationEvents(validatedEvents);
+    }
+    setReturnValidationPending(false);
+  }, []);
   useEffect(() => {
     let cancelled = false;
     const loadLines = async () => {
@@ -59965,10 +60050,9 @@ var LineOvertakeNotificationManager = ({
     };
   }, [companyId, isOnActiveToastSurface, qaSimulationEnabled, roleMode, supabase]);
   const openLeaderboard = useCallback(() => {
-    notificationEventsRef.current = [];
-    setNotificationEvents([]);
+    acknowledgeCurrentEvents();
     void router.push("/kpis?tab=leaderboard");
-  }, [router]);
+  }, [acknowledgeCurrentEvents, router]);
   const updateOvertakeEvents = useCallback((events) => {
     if (events.length === 0) return;
     const currentEventByRowId = new Map(
@@ -59976,13 +60060,9 @@ var LineOvertakeNotificationManager = ({
     );
     const nextEvents = events.filter((event) => {
       if (currentEventByRowId.has(event.crossingLineId)) return true;
-      return !hasStoredEventKey(dedupeScopeKey, event.eventKey);
+      return !(acknowledgedEventKeysRef.current.has(buildAcknowledgementKey(dedupeScopeKey, event.eventKey)) || hasStoredEventKey(dedupeScopeKey, event.eventKey));
     });
     if (nextEvents.length === 0) return;
-    nextEvents.forEach((event) => {
-      if (currentEventByRowId.has(event.crossingLineId)) return;
-      storeEventKey(dedupeScopeKey, event.eventKey);
-    });
     setNotificationEvents((currentEvents) => {
       const eventByRowId = new Map(currentEvents.map((event) => [event.crossingLineId, event]));
       nextEvents.forEach((event) => {
@@ -60025,6 +60105,7 @@ var LineOvertakeNotificationManager = ({
         });
         previousSnapshotRef.current = QA_CROSSED_ROWS;
         updateOvertakeEvents(events);
+        finishReturnValidation(events, QA_CROSSED_ROWS);
       } finally {
         pollInFlightRef.current = false;
       }
@@ -60047,11 +60128,17 @@ var LineOvertakeNotificationManager = ({
       const currentSnapshot = buildSnapshotRows(entries, visibleLines);
       if (currentSnapshot.length === 0) {
         previousSnapshotRef.current = null;
+        if (returnValidationPending) {
+          clearPendingEvents();
+        }
         return;
       }
       const previousSnapshot = previousSnapshotRef.current;
       previousSnapshotRef.current = currentSnapshot;
-      if (!previousSnapshot) return;
+      if (!previousSnapshot) {
+        finishReturnValidation([], currentSnapshot);
+        return;
+      }
       const events = detectLineOvertakeEvents({
         roleMode,
         watchedLineIds,
@@ -60059,6 +60146,7 @@ var LineOvertakeNotificationManager = ({
         currentRows: currentSnapshot
       });
       updateOvertakeEvents(events);
+      finishReturnValidation(events, currentSnapshot);
     } catch (error) {
       console.warn("[LineOvertakeNotificationManager] Failed to poll daily leaderboard:", error);
     } finally {
@@ -60072,8 +60160,11 @@ var LineOvertakeNotificationManager = ({
     linesLoaded,
     qaSimulationEnabled,
     qaSimulationMode,
+    returnValidationPending,
     roleMode,
     supabase,
+    clearPendingEvents,
+    finishReturnValidation,
     updateOvertakeEvents,
     visibleLineIds,
     watchedLineIds
@@ -60091,14 +60182,12 @@ var LineOvertakeNotificationManager = ({
     };
   }, [pollIntervalMs, pollLeaderboard]);
   if (!isOnActiveToastSurface) return null;
+  if (returnValidationPending) return null;
   return /* @__PURE__ */ jsx(
     LineOvertakeNotificationPopup,
     {
       events: notificationEvents,
-      onDismiss: () => {
-        notificationEventsRef.current = [];
-        setNotificationEvents([]);
-      },
+      onDismiss: acknowledgeCurrentEvents,
       onOpenLeaderboard: openLeaderboard
     }
   );
@@ -65276,6 +65365,7 @@ var useLiveMonitorBootstrap = ({
   const activeRequestIdRef = useRef(0);
   const isFetchingRef = useRef(false);
   const pendingRealtimeRefreshRef = useRef(false);
+  const pendingForcedRefreshRef = useRef(false);
   const realtimeRefreshTimerRef = useRef(null);
   const lastRealtimeRefreshStartedAtRef = useRef(0);
   const fetchBootstrap = useCallback(async (force = false) => {
@@ -65349,6 +65439,18 @@ var useLiveMonitorBootstrap = ({
   useEffect(() => {
     fetchBootstrapRef.current = fetchBootstrap;
   }, [fetchBootstrap]);
+  const requestScheduledForcedRefresh = useCallback(() => {
+    if (!enabled || !supabase || !resolvedCompanyId || normalizedLineIds.length === 0) {
+      pendingForcedRefreshRef.current = false;
+      return;
+    }
+    if (isFetchingRef.current) {
+      pendingForcedRefreshRef.current = true;
+      return;
+    }
+    pendingForcedRefreshRef.current = false;
+    void fetchBootstrapRef.current(true);
+  }, [enabled, normalizedLineIds.length, resolvedCompanyId, supabase]);
   const clearRealtimeRefreshTimer = useCallback(() => {
     if (realtimeRefreshTimerRef.current !== null) {
       window.clearTimeout(realtimeRefreshTimerRef.current);
@@ -65373,9 +65475,9 @@ var useLiveMonitorBootstrap = ({
       }
       pendingRealtimeRefreshRef.current = false;
       lastRealtimeRefreshStartedAtRef.current = Date.now();
-      void fetchBootstrapRef.current(true);
+      requestScheduledForcedRefresh();
     }, nextDelay);
-  }, [enabled, supabase]);
+  }, [enabled, requestScheduledForcedRefresh, supabase]);
   const queueRealtimeRefresh = useCallback(() => {
     if (!enabled || !supabase) {
       pendingRealtimeRefreshRef.current = false;
@@ -65388,9 +65490,15 @@ var useLiveMonitorBootstrap = ({
   useEffect(() => {
     return () => {
       pendingRealtimeRefreshRef.current = false;
+      pendingForcedRefreshRef.current = false;
       clearRealtimeRefreshTimer();
     };
   }, [clearRealtimeRefreshTimer]);
+  useEffect(() => {
+    if (!isLoading && pendingForcedRefreshRef.current) {
+      requestScheduledForcedRefresh();
+    }
+  }, [isLoading, requestScheduledForcedRefresh]);
   useEffect(() => {
     if (!enabled || !rawState || !resolvedCompanyId) {
       return;
@@ -65529,9 +65637,7 @@ var useLiveMonitorBootstrap = ({
     if (!enabled || !resolvedCompanyId || normalizedLineIds.length === 0 || !supabase) {
       return void 0;
     }
-    const forceRefreshOnResume = () => {
-      void fetchBootstrapRef.current(true);
-    };
+    const forceRefreshOnResume = () => requestScheduledForcedRefresh();
     const handleVisibilityChange = () => {
       if (document.visibilityState === "visible") {
         forceRefreshOnResume();
@@ -65545,7 +65651,7 @@ var useLiveMonitorBootstrap = ({
       window.removeEventListener("focus", forceRefreshOnResume);
       window.removeEventListener("online", forceRefreshOnResume);
     };
-  }, [enabled, normalizedLineIds.length, resolvedCompanyId, supabase]);
+  }, [enabled, normalizedLineIds.length, requestScheduledForcedRefresh, resolvedCompanyId, supabase]);
   useEffect(() => {
     if (!enabled || !resolvedCompanyId || normalizedLineIds.length === 0 || !supabase) {
       return void 0;
@@ -65553,7 +65659,7 @@ var useLiveMonitorBootstrap = ({
     let intervalId = null;
     let timeoutId = null;
     const runMinuteTick = () => {
-      void fetchBootstrap(true);
+      requestScheduledForcedRefresh();
     };
     const startInterval = () => {
       runMinuteTick();
@@ -65572,7 +65678,7 @@ var useLiveMonitorBootstrap = ({
         window.clearInterval(intervalId);
       }
     };
-  }, [enabled, resolvedCompanyId, normalizedLineIds, supabase, fetchBootstrap]);
+  }, [enabled, normalizedLineIds, requestScheduledForcedRefresh, resolvedCompanyId, supabase]);
   const isCurrentScopeResolved = state.requestKey === requestKey;
   return {
     resolvedScope: state.resolvedScope,
@@ -71549,6 +71655,7 @@ var KPIsOverviewView = ({
   const [viewType, setViewType] = useState("operator");
   const [selectedLeaderboardDate, setSelectedLeaderboardDate] = useState("");
   const [selectedLeaderboardShiftId, setSelectedLeaderboardShiftId] = useState(0);
+  const [leaderboardDailyScopeMode, setLeaderboardDailyScopeMode] = useState("live");
   const [hasHydratedLeaderboardRouteState, setHasHydratedLeaderboardRouteState] = useState(false);
   const [loading, setLoading] = useState(true);
   const [isFilterOpen, setIsFilterOpen] = useState(false);
@@ -71668,14 +71775,16 @@ var KPIsOverviewView = ({
   const currentShiftId = currentShiftDetails.shiftId;
   const activeFiltersCount = React146__default.useMemo(() => {
     let count = 0;
-    if (selectedLeaderboardShiftId !== currentShiftId) {
+    if (leaderboardDailyScopeMode === "historical" && selectedLeaderboardShiftId !== currentShiftId) {
       count++;
     }
     return count;
-  }, [selectedLeaderboardShiftId, currentShiftId]);
+  }, [leaderboardDailyScopeMode, selectedLeaderboardShiftId, currentShiftId]);
   const clearFilters = React146__default.useCallback(() => {
     setSelectedLeaderboardShiftId(currentShiftId);
-  }, [currentShiftId]);
+    setSelectedLeaderboardDate(currentShiftDate);
+    setLeaderboardDailyScopeMode("live");
+  }, [currentShiftDate, currentShiftId]);
   useEffect(() => {
     const handleClickOutside = (event) => {
       const target = event.target;
@@ -71707,7 +71816,24 @@ var KPIsOverviewView = ({
   }, [shiftConfig]);
   const effectiveLeaderboardDate = selectedLeaderboardDate || currentShiftDate;
   const effectiveLeaderboardShiftId = Number.isFinite(selectedLeaderboardShiftId) ? selectedLeaderboardShiftId : currentShiftId;
-  const isHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && (effectiveLeaderboardDate !== currentShiftDate || effectiveLeaderboardShiftId !== currentShiftId);
+  const isHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && leaderboardDailyScopeMode === "historical" && (effectiveLeaderboardDate !== currentShiftDate || effectiveLeaderboardShiftId !== currentShiftId);
+  const updateLeaderboardDate = React146__default.useCallback((dateKey) => {
+    setSelectedLeaderboardDate(dateKey);
+    setLeaderboardDailyScopeMode(
+      dateKey === currentShiftDate && effectiveLeaderboardShiftId === currentShiftId ? "live" : "historical"
+    );
+  }, [currentShiftDate, currentShiftId, effectiveLeaderboardShiftId]);
+  const updateLeaderboardShiftId = React146__default.useCallback((shiftId) => {
+    setSelectedLeaderboardShiftId(shiftId);
+    setLeaderboardDailyScopeMode(
+      effectiveLeaderboardDate === currentShiftDate && shiftId === currentShiftId ? "live" : "historical"
+    );
+  }, [currentShiftDate, currentShiftId, effectiveLeaderboardDate]);
+  const returnLeaderboardToLive = React146__default.useCallback(() => {
+    setSelectedLeaderboardDate(currentShiftDate);
+    setSelectedLeaderboardShiftId(currentShiftId);
+    setLeaderboardDailyScopeMode("live");
+  }, [currentShiftDate, currentShiftId]);
   const selectedFactoryIdFromUrl = getSingleQueryValue(router.query[KPI_FACTORY_QUERY_PARAM]);
   const selectedFactoryAreaIdFromUrl = getSingleQueryValue(router.query[KPI_FACTORY_AREA_QUERY_PARAM]);
   const kpiLineHierarchy = React146__default.useMemo(
@@ -71733,10 +71859,12 @@ var KPIsOverviewView = ({
     if (hasHistoricalQuery) {
       setSelectedLeaderboardDate(dateQuery);
       setSelectedLeaderboardShiftId(parsedShiftQuery);
+      setLeaderboardDailyScopeMode("historical");
       setTimeRange("today");
     } else {
       setSelectedLeaderboardDate(currentShiftDate);
       setSelectedLeaderboardShiftId(currentShiftId);
+      setLeaderboardDailyScopeMode("live");
     }
     setHasHydratedLeaderboardRouteState(true);
   }, [
@@ -71759,7 +71887,8 @@ var KPIsOverviewView = ({
       pendingTabRouteSyncRef.current = null;
     }
     const expectedTab = activeTab === "leaderboard" ? "leaderboard" : void 0;
-    const expectedDate = activeTab === "leaderboard" && timeRange === "today" && isHistoricalLeaderboardDaily ? effectiveLeaderboardDate : void 0;
+    const shouldPersistHistoricalLeaderboardDaily = activeTab === "leaderboard" && timeRange === "today" && leaderboardDailyScopeMode === "historical" && isHistoricalLeaderboardDaily;
+    const expectedDate = shouldPersistHistoricalLeaderboardDaily ? effectiveLeaderboardDate : void 0;
     const expectedShift = expectedDate !== void 0 ? effectiveLeaderboardShiftId.toString() : void 0;
     const expectedFactory = activeTab === "today" && selectedFactoryNode ? selectedFactoryNode.id : void 0;
     const expectedFactoryArea = activeTab === "today" && selectedFactoryNode && selectedFactoryAreaNode ? selectedFactoryAreaNode.id : void 0;
@@ -71785,6 +71914,7 @@ var KPIsOverviewView = ({
     router,
     activeTab,
     timeRange,
+    leaderboardDailyScopeMode,
     effectiveLeaderboardDate,
     effectiveLeaderboardShiftId,
     hasHydratedLeaderboardRouteState,
@@ -72206,7 +72336,7 @@ var KPIsOverviewView = ({
   const currentEfficiencyMap = timeRange === "today" ? todayEfficiencyByLineId : monthlyEfficiencyByLineId;
   const currentFallbackEfficiencyMap = timeRange === "today" ? dailyFallbackEfficiencyByLineId : void 0;
   const showLeaderboardLoader = activeTab === "leaderboard" && (leaderboardLinesLoading || isLeaderboardLoading && currentEfficiencyMap.size === 0 && (currentFallbackEfficiencyMap?.size ?? 0) === 0);
-  const showHistoricalLeaderboardHeader = activeTab === "leaderboard" && timeRange === "today" && isHistoricalLeaderboardDaily;
+  const showHistoricalLeaderboardHeader = activeTab === "leaderboard" && timeRange === "today" && leaderboardDailyScopeMode === "historical" && isHistoricalLeaderboardDaily;
   const headerDateKey = activeTab === "leaderboard" && timeRange === "today" ? effectiveLeaderboardDate : monthEndDateKey;
   const headerShiftId = showHistoricalLeaderboardHeader ? effectiveLeaderboardShiftId : currentShiftDetails.shiftId;
   const headerShiftName = getShiftNameById(headerShiftId, configuredTimezone, shiftConfig).replace(/ Shift$/i, "");
@@ -72401,10 +72531,7 @@ var KPIsOverviewView = ({
                 "button",
                 {
                   type: "button",
-                  onClick: () => {
-                    setSelectedLeaderboardDate(currentShiftDate);
-                    setSelectedLeaderboardShiftId(currentShiftId);
-                  },
+                  onClick: returnLeaderboardToLive,
                   className: "text-[10px] font-medium text-blue-600 hover:text-blue-700 hover:underline bg-blue-50 px-2 py-1 rounded-md",
                   children: "Return to Live"
                 }
@@ -72450,10 +72577,7 @@ var KPIsOverviewView = ({
             "button",
             {
               type: "button",
-              onClick: () => {
-                setSelectedLeaderboardDate(currentShiftDate);
-                setSelectedLeaderboardShiftId(currentShiftId);
-              },
+              onClick: returnLeaderboardToLive,
               className: "text-xs sm:text-sm font-medium text-blue-600 bg-blue-50 border border-blue-100 hover:bg-blue-100 hover:text-blue-700 px-3 py-1.5 rounded-lg transition-colors shadow-sm ml-4 whitespace-nowrap",
               children: "Return to Live"
             }
@@ -72521,7 +72645,7 @@ var KPIsOverviewView = ({
                     endKey: effectiveLeaderboardDate
                   },
                   onChange: (range) => {
-                    setSelectedLeaderboardDate(range.startKey);
+                    updateLeaderboardDate(range.startKey);
                   },
                   showLabel: false,
                   singleDateOnly: true
@@ -72561,7 +72685,7 @@ var KPIsOverviewView = ({
                       {
                         "aria-label": "Leaderboard shift",
                         value: effectiveLeaderboardShiftId,
-                        onChange: (e) => setSelectedLeaderboardShiftId(Number(e.target.value)),
+                        onChange: (e) => updateLeaderboardShiftId(Number(e.target.value)),
                         className: "w-full appearance-none pl-3 pr-8 py-2 text-sm bg-gray-50 border border-gray-200 hover:border-gray-300 rounded-lg text-gray-900 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:bg-white transition-all cursor-pointer",
                         style: { backgroundImage: `url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e")`, backgroundPosition: `right 0.75rem center`, backgroundRepeat: `no-repeat`, backgroundSize: `1.2em 1.2em` },
                         children: leaderboardShiftOptions.map((shiftOption) => /* @__PURE__ */ jsx("option", { value: shiftOption.id, children: shiftOption.label }, shiftOption.id))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optifye/dashboard-core",
-  "version": "6.12.38",
+  "version": "6.12.39",
   "description": "Reusable UI & logic for Optifye dashboard",
   "main": "dist/index.js",
   "module": "dist/index.mjs",