@optifye/dashboard-core 6.11.46 → 6.11.48

package/dist/index.d.mts

@@ -6667,7 +6667,9 @@ declare const filterDataByDateKeyRange: <T extends {
  */
 declare const getShiftWorkDurationSeconds: (shiftConfig: ShiftConfig | null | undefined, shiftId: number) => number | null;
 /**
- * Determines the current or most recent shift based on the current time and shift configuration.
+ * Determines the active shift when one exists. Otherwise stays on the current
+ * local calendar date and returns either the most recently completed shift from
+ * today or, if none has completed yet, the next upcoming shift from today.
  * Prefers DB-driven shift definitions (shiftConfig.shifts), falls back to legacy day/night config.
  *
  * @param timezone - IANA timezone string (e.g., 'Asia/Kolkata') from config.
@@ -6679,7 +6681,7 @@ declare const getCurrentShift: (timezone: string, shiftConfig?: ShiftConfig | nu
 /**
  * Determines the currently active shift for a line if one exists.
  * Unlike getCurrentShift(), this returns null during schedule gaps instead of
- * falling back to the first configured shift.
+ * choosing any same-day fallback shift.
  */
 declare const getActiveShift: (timezone: string, shiftConfig?: ShiftConfig | null, now?: Date) => CurrentShiftResult | null;
 /**

package/dist/index.d.ts

@@ -6667,7 +6667,9 @@ declare const filterDataByDateKeyRange: <T extends {
  */
 declare const getShiftWorkDurationSeconds: (shiftConfig: ShiftConfig | null | undefined, shiftId: number) => number | null;
 /**
- * Determines the current or most recent shift based on the current time and shift configuration.
+ * Determines the active shift when one exists. Otherwise stays on the current
+ * local calendar date and returns either the most recently completed shift from
+ * today or, if none has completed yet, the next upcoming shift from today.
  * Prefers DB-driven shift definitions (shiftConfig.shifts), falls back to legacy day/night config.
  *
  * @param timezone - IANA timezone string (e.g., 'Asia/Kolkata') from config.
@@ -6679,7 +6681,7 @@ declare const getCurrentShift: (timezone: string, shiftConfig?: ShiftConfig | nu
 /**
  * Determines the currently active shift for a line if one exists.
  * Unlike getCurrentShift(), this returns null during schedule gaps instead of
- * falling back to the first configured shift.
+ * choosing any same-day fallback shift.
  */
 declare const getActiveShift: (timezone: string, shiftConfig?: ShiftConfig | null, now?: Date) => CurrentShiftResult | null;
 /**

package/dist/index.js

@@ -3626,12 +3626,81 @@ var determineActiveShiftFromDefinitions = (timezone, shifts, now4 = /* @__PURE__
   }
   return null;
 };
-var getCurrentShift = (timezone, shiftConfig, now4 = /* @__PURE__ */ new Date()) => {
-  const { shifts, timezone: effectiveTz } = normalizeShiftDefinitions(timezone, shiftConfig);
-  const activeShift = determineActiveShiftFromDefinitions(effectiveTz, shifts, now4);
+var buildSameDayShiftOccurrence = (timezone, shift, now4 = /* @__PURE__ */ new Date()) => {
+  const zonedNow = dateFnsTz.toZonedTime(now4, timezone);
+  zonedNow.getHours() * 60 + zonedNow.getMinutes();
+  const startMinutes = parseTimeToMinutes(shift.startTime);
+  const durationMinutes = calculateDurationMinutes(shift.startTime, shift.endTime);
+  if (!Number.isFinite(startMinutes) || !Number.isFinite(durationMinutes) || durationMinutes <= 0) {
+    return null;
+  }
+  const occurrenceStart = new Date(zonedNow);
+  occurrenceStart.setHours(0, 0, 0, 0);
+  occurrenceStart.setHours(Math.floor(startMinutes / 60), startMinutes % 60, 0, 0);
+  const occurrenceEnd = new Date(occurrenceStart.getTime() + durationMinutes * 60 * 1e3);
+  return {
+    shift,
+    operationalDate: dateFns.format(occurrenceStart, "yyyy-MM-dd"),
+    occurrenceStart,
+    occurrenceEnd
+  };
+};
+var determineCurrentOrPreviousShiftFromDefinitions = (timezone, shifts, now4 = /* @__PURE__ */ new Date()) => {
+  const activeShift = determineActiveShiftFromDefinitions(timezone, shifts, now4);
   if (activeShift) {
     return activeShift;
   }
+  const sameDayOccurrences = shifts.map((shift) => buildSameDayShiftOccurrence(timezone, shift, now4)).filter((occurrence) => occurrence !== null);
+  if (!sameDayOccurrences.length) {
+    return null;
+  }
+  const zonedNow = dateFnsTz.toZonedTime(now4, timezone);
+  const completedOccurrences = sameDayOccurrences.filter(
+    (occurrence) => occurrence.occurrenceEnd.getTime() <= zonedNow.getTime()
+  );
+  let chosenOccurrence;
+  if (completedOccurrences.length > 0) {
+    chosenOccurrence = completedOccurrences.reduce((best, candidate) => {
+      if (candidate.occurrenceEnd.getTime() > best.occurrenceEnd.getTime()) {
+        return candidate;
+      }
+      if (candidate.occurrenceEnd.getTime() === best.occurrenceEnd.getTime() && candidate.shift.shiftId > best.shift.shiftId) {
+        return candidate;
+      }
+      return best;
+    });
+  } else {
+    const upcomingOccurrences = sameDayOccurrences.filter(
+      (occurrence) => occurrence.occurrenceStart.getTime() > zonedNow.getTime()
+    );
+    if (!upcomingOccurrences.length) {
+      return null;
+    }
+    chosenOccurrence = upcomingOccurrences.reduce((best, candidate) => {
+      if (candidate.occurrenceStart.getTime() < best.occurrenceStart.getTime()) {
+        return candidate;
+      }
+      if (candidate.occurrenceStart.getTime() === best.occurrenceStart.getTime() && candidate.shift.shiftId < best.shift.shiftId) {
+        return candidate;
+      }
+      return best;
+    });
+  }
+  return {
+    shiftId: chosenOccurrence.shift.shiftId,
+    shiftName: chosenOccurrence.shift.shiftName,
+    startTime: chosenOccurrence.shift.startTime,
+    endTime: chosenOccurrence.shift.endTime,
+    timezone,
+    date: chosenOccurrence.operationalDate
+  };
+};
+var getCurrentShift = (timezone, shiftConfig, now4 = /* @__PURE__ */ new Date()) => {
+  const { shifts, timezone: effectiveTz } = normalizeShiftDefinitions(timezone, shiftConfig);
+  const resolvedShift = determineCurrentOrPreviousShiftFromDefinitions(effectiveTz, shifts, now4);
+  if (resolvedShift) {
+    return resolvedShift;
+  }
   const fallbackShift = shifts[0];
   return {
     shiftId: fallbackShift.shiftId,
@@ -4006,7 +4075,7 @@ var dashboardService = {
     const factoryViewId = entityConfig.factoryViewId ?? "factory";
     const defaultTimezone = dateTimeConfig.defaultTimezone;
     const currentShiftResult = getCurrentShift(defaultTimezone, shiftConfig);
-    const queryDate = dateProp || getOperationalDate(defaultTimezone);
+    const queryDate = dateProp || currentShiftResult.date;
     const queryShiftId = shiftProp ?? currentShiftResult.shiftId;
     const lineId = lineIdInput;
     let query = supabase.from(metricsTable).select("company_id,line_id,shift_id,date,workspace_id,workspace_name,total_output,avg_pph,performance_score,avg_cycle_time,trend_score,ideal_output,efficiency,total_day_output").eq("shift_id", queryShiftId).eq("date", queryDate);
@@ -4055,7 +4124,7 @@ var dashboardService = {
     const metricsTable = `${metricsTablePrefixStr}_${companyId.replace(/-/g, "_")}`;
     const defaultTimezone = dateTimeConfig.defaultTimezone;
     const currentShiftResult = getCurrentShift(defaultTimezone, shiftConfig);
-    const queryDate = dateProp || getOperationalDate(defaultTimezone);
+    const queryDate = dateProp || currentShiftResult.date;
     const queryShiftId = shiftIdProp !== void 0 ? shiftIdProp : currentShiftResult.shiftId;
     try {
       const { data, error } = await supabase.from(metricsTable).select("*").eq("workspace_id", workspaceUuid).eq("date", queryDate).eq("shift_id", queryShiftId).maybeSingle();
@@ -4364,7 +4433,7 @@ var dashboardService = {
     const defaultTimezone = dateTimeConfig.defaultTimezone;
     const lineIdToQuery = lineIdInput || factoryViewId;
     const currentShiftResult = getCurrentShift(defaultTimezone, shiftConfig);
-    const queryDate = dateProp || getOperationalDate(defaultTimezone);
+    const queryDate = dateProp || currentShiftResult.date;
     const queryShiftId = shiftProp !== void 0 ? shiftProp : currentShiftResult.shiftId;
     try {
       if (lineIdToQuery === factoryViewId) {
@@ -12488,8 +12557,8 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId, options) => {
       return;
     }
     const channels = [];
-    const operationalDate = operationalDateFromKey || date || getOperationalDate(defaultTimezone);
     const currentShift = getCurrentShift(defaultTimezone, shiftConfig);
+    const operationalDate = operationalDateFromKey || date || currentShift.date;
     const queryShiftId = operationalShiftIdFromKey ?? shiftId ?? currentShift.shiftId;
     fetchMetrics();
     if (!realtimeEnabled) {
@@ -12845,14 +12914,16 @@ var useLineWorkspaceMetrics = (lineId, options) => {
   const [loading, setLoading] = React143.useState(true);
   const [error, setError] = React143.useState(null);
   const [initialized, setInitialized] = React143.useState(false);
-  const queryShiftId = React143.useMemo(() => {
+  const currentShift = React143.useMemo(() => {
     const effectiveTimezone = timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata";
-    const currentShift = getCurrentShift(effectiveTimezone, shiftConfig);
+    return getCurrentShift(effectiveTimezone, shiftConfig);
+  }, [timezone, dateTimeConfig.defaultTimezone, shiftConfig]);
+  const queryShiftId = React143.useMemo(() => {
     return options?.initialShiftId !== void 0 ? options.initialShiftId : currentShift.shiftId;
-  }, [options?.initialShiftId, timezone, dateTimeConfig.defaultTimezone, shiftConfig]);
+  }, [options?.initialShiftId, currentShift.shiftId]);
   const queryDate = React143.useMemo(() => {
-    return options?.initialDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
-  }, [options?.initialDate, timezone, dateTimeConfig.defaultTimezone]);
+    return options?.initialDate || currentShift.date;
+  }, [options?.initialDate, currentShift.date]);
   const metricsTable = React143.useMemo(() => {
     const companyId = entityConfig.companyId;
     if (!companyId) return "";
@@ -13076,10 +13147,9 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
     setError(null);
     try {
       const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
-      const operationalDate = getOperationalDate(defaultTimezone, new Date(currentShiftDetails.date));
       const data = await dashboardService.getDetailedLineInfo(
         lineIdToUse,
-        operationalDate,
+        currentShiftDetails.date,
         currentShiftDetails.shiftId
       );
       setLineData(data);
@@ -13103,7 +13173,7 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
     }
     fetchData();
     const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
-    const operationalDate = getOperationalDate(defaultTimezone, new Date(currentShiftDetails.date));
+    const operationalDate = currentShiftDetails.date;
     const currentShiftId = currentShiftDetails.shiftId;
     let filterString = "";
     let targetLineIdsForSubscription = [];
@@ -14868,7 +14938,7 @@ var useRealtimeLineMetrics = ({
     () => urlShiftId !== void 0 ? urlShiftId : currentShift.shiftId,
     [urlShiftId, currentShift.shiftId]
   );
-  const date = React143.useMemo(() => urlDate || getOperationalDate(effectiveTimezone), [urlDate, effectiveTimezone]);
+  const date = React143.useMemo(() => urlDate || currentShift.date, [urlDate, currentShift.date]);
   const fetchData = React143.useCallback(async () => {
     try {
       if (!lineIdRef.current || isFetchingRef.current || enabled === false) return;
@@ -14999,7 +15069,7 @@ var useRealtimeLineMetrics = ({
     const companyId = entityConfig.companyId;
     const metricsTablePrefix = getMetricsTablePrefix();
     const metricsTable = `${metricsTablePrefix}_${(companyId || "").replace(/-/g, "_")}`;
-    const currentDate = urlDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
+    const currentDate = urlDate || currentShift.date;
     const filter2 = `line_id=in.(${filteredLineIds.join(",")})`;
     const lineMetricsChannel = supabase.channel(`line-metrics-${timestamp}`).on(
       "postgres_changes",
@@ -17684,8 +17754,11 @@ var useAllWorkspaceMetrics = (options) => {
     if (shiftGroups.length > 0) {
       return shiftGroups[0].date;
     }
-    return getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
-  }, [options?.initialDate, shiftGroups, timezone, dateTimeConfig.defaultTimezone]);
+    return getCurrentShift(
+      timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata",
+      staticShiftConfig
+    ).date;
+  }, [options?.initialDate, shiftGroups, timezone, dateTimeConfig.defaultTimezone, staticShiftConfig]);
   const metricsTable = React143.useMemo(() => {
     const companyId = entityConfig.companyId;
     if (!companyId) return "";
@@ -51949,11 +52022,11 @@ var getWorkspaceStyles = (position, isPlaceholder = false) => {
           ${isPlaceholder ? "cursor-default" : ""}`;
 };
 var formatPercentRange = (min, max) => {
-  const format9 = (value) => Number.isInteger(value) ? `${value}` : value.toFixed(1);
+  const format10 = (value) => Number.isInteger(value) ? `${value}` : value.toFixed(1);
   if (min >= 100 || max >= 100) {
-    return `${format9(min)}+%`;
+    return `${format10(min)}+%`;
   }
-  return `${format9(min)}-${format9(max)}%`;
+  return `${format10(min)}-${format10(max)}%`;
 };
 var Legend5 = ({
   useBottleneckLabel = false,
@@ -60386,8 +60459,7 @@ var FactoryView = ({
           setLoading(false);
           return;
         }
-        const { shiftId } = getCurrentShift(timezone, shiftConfig);
-        const date = getOperationalDate(timezone);
+        const { shiftId, date } = getCurrentShift(timezone, shiftConfig);
         const hourlyDataPromises = effectiveLineIds.map(
           (lineId) => supabase.from("line_hourly_metrics").select("hour, efficiency").eq("line_id", lineId).eq("shift_id", shiftId).eq("date", date).order("hour", { ascending: false }).limit(5)
         );
@@ -60960,6 +61032,7 @@ var useLiveMonitorBootstrap = ({
     [normalizedLineIds]
   );
   const [state, setState] = React143.useState(() => createEmptyState());
+  const [rawState, setRawState] = React143.useState(null);
   const [isLoading, setIsLoading] = React143.useState(false);
   const [error, setError] = React143.useState(null);
   const activeRequestIdRef = React143.useRef(0);
@@ -60990,62 +61063,80 @@ var useLiveMonitorBootstrap = ({
       if (requestId !== activeRequestIdRef.current) {
         return;
       }
+      setRawState({
+        requestKey,
+        normalizedLineIds,
+        response
+      });
+    } catch (fetchError) {
+      if (requestId !== activeRequestIdRef.current) {
+        return;
+      }
+      setError(fetchError instanceof Error ? fetchError : new Error("Failed to load live monitor bootstrap"));
+    } finally {
+      if (requestId === activeRequestIdRef.current) {
+        setIsLoading(false);
+      }
+    }
+  }, [
+    enabled,
+    supabase,
+    resolvedCompanyId,
+    normalizedLineIds,
+    requestKey
+  ]);
+  React143.useEffect(() => {
+    if (!enabled || !rawState || !resolvedCompanyId) {
+      return;
+    }
+    try {
       const workspaceMetrics = transformMonitorWorkspaceMetrics({
-        rows: response.workspace_metrics || [],
+        rows: rawState.response.workspace_metrics || [],
         companyId: resolvedCompanyId,
         workspaceConfig: effectiveWorkspaceConfig,
         appTimezone: effectiveTimezone,
-        lineMetrics: response.line_metrics || [],
+        lineMetrics: rawState.response.line_metrics || [],
         resolveShiftConfig: (lineId) => lineShiftConfigs?.get(lineId) || fallbackShiftConfig,
         shouldOverrideShiftType: (lineId) => Boolean(lineShiftConfigs?.get(lineId)),
         fallbackShiftConfig
       });
-      const activeBreaks = transformActiveBreaks(response.active_breaks_by_line);
-      const metadata = normalizeMetadata(response.metadata);
+      const activeBreaks = transformActiveBreaks(rawState.response.active_breaks_by_line);
+      const metadata = normalizeMetadata(rawState.response.metadata);
       const workspaceIds = workspaceMetrics.map((metric) => metric.workspace_uuid).filter((workspaceId) => Boolean(workspaceId));
-      const videoStreamsByWorkspaceId = response.video_streams_by_workspace_id || {};
+      const videoStreamsByWorkspaceId = rawState.response.video_streams_by_workspace_id || {};
       if (metadata.idleTimeVlmByLine) {
         hydrateFromBackend(metadata.idleTimeVlmByLine);
       }
       workspaceService.primeWorkspaceVideoStreamsCache({
         streams: videoStreamsByWorkspaceId,
         workspaceIds,
-        lineIds: normalizedLineIds
+        lineIds: rawState.normalizedLineIds
       });
       setState({
-        requestKey,
-        resolvedScope: response.resolved_scope || [],
-        scopeKey: response.scope_key || null,
-        lines: response.lines || [],
+        requestKey: rawState.requestKey,
+        resolvedScope: rawState.response.resolved_scope || [],
+        scopeKey: rawState.response.scope_key || null,
+        lines: rawState.response.lines || [],
         workspaceMetrics,
-        lineMetrics: response.line_metrics || [],
-        kpiTrend: response.kpi_trend || null,
+        lineMetrics: rawState.response.line_metrics || [],
+        kpiTrend: rawState.response.kpi_trend || null,
         activeBreaks,
         videoStreamsByWorkspaceId,
-        efficiencyLegend: response.efficiency_legend || null,
+        efficiencyLegend: rawState.response.efficiency_legend || null,
         metadata
       });
-    } catch (fetchError) {
-      if (requestId !== activeRequestIdRef.current) {
-        return;
-      }
-      setError(fetchError instanceof Error ? fetchError : new Error("Failed to load live monitor bootstrap"));
-    } finally {
-      if (requestId === activeRequestIdRef.current) {
-        setIsLoading(false);
-      }
+    } catch (processingError) {
+      setError(processingError instanceof Error ? processingError : new Error("Failed to process live monitor bootstrap"));
     }
   }, [
     enabled,
-    supabase,
+    rawState,
     resolvedCompanyId,
-    normalizedLineIds,
-    requestKey,
-    hydrateFromBackend,
     effectiveWorkspaceConfig,
     effectiveTimezone,
     lineShiftConfigs,
-    fallbackShiftConfig
+    fallbackShiftConfig,
+    hydrateFromBackend
   ]);
   React143.useEffect(() => {
     if (!enabled) {
@@ -61054,6 +61145,7 @@ var useLiveMonitorBootstrap = ({
     }
     if (!resolvedCompanyId || normalizedLineIds.length === 0 || !supabase) {
       setState(createEmptyState());
+      setRawState(null);
       setIsLoading(false);
       setError(null);
       return;
@@ -62927,8 +63019,8 @@ var useLineDetailPageData = ({
     [urlShiftId, currentShift]
   );
   const queryDate = React143.useMemo(
-    () => urlDate || getOperationalDate(timezone),
-    [urlDate, timezone]
+    () => urlDate || currentShift?.date || getOperationalDate(timezone),
+    [urlDate, currentShift?.date, timezone]
   );
   const [detailResponse, setDetailResponse] = React143.useState(null);
   const [loading, setLoading] = React143.useState(true);
@@ -65664,7 +65756,7 @@ var formatDateKey2 = (dateKey, timezone, options) => {
     return dateKey;
   }
 };
-var LeaderboardCountdown = ({ targetDate, format: format9, finishedLabel = "Finished", placeholder = "--", onFinished }) => {
+var LeaderboardCountdown = ({ targetDate, format: format10, finishedLabel = "Finished", placeholder = "--", onFinished }) => {
   const [time2, setTime] = React143.useState("");
   const hasFinishedRef = React143.useRef(false);
   React143.useEffect(() => {
@@ -65686,7 +65778,7 @@ var LeaderboardCountdown = ({ targetDate, format: format9, finishedLabel = "Fini
         }
         return;
       }
-      if (format9 === "days") {
+      if (format10 === "days") {
         const days = Math.floor(diff / (1e3 * 60 * 60 * 24));
         const hours = Math.floor(diff % (1e3 * 60 * 60 * 24) / (1e3 * 60 * 60));
         setTime(`${days} days ${hours} hours`);
@@ -65701,7 +65793,7 @@ var LeaderboardCountdown = ({ targetDate, format: format9, finishedLabel = "Fini
     tick();
     const interval = setInterval(tick, 1e3);
     return () => clearInterval(interval);
-  }, [targetDate, format9, finishedLabel, placeholder, onFinished]);
+  }, [targetDate, format10, finishedLabel, placeholder, onFinished]);
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: time2 });
 };
 var LinesLeaderboard = ({

package/dist/index.mjs

@@ -3597,12 +3597,81 @@ var determineActiveShiftFromDefinitions = (timezone, shifts, now4 = /* @__PURE__
   }
   return null;
 };
-var getCurrentShift = (timezone, shiftConfig, now4 = /* @__PURE__ */ new Date()) => {
-  const { shifts, timezone: effectiveTz } = normalizeShiftDefinitions(timezone, shiftConfig);
-  const activeShift = determineActiveShiftFromDefinitions(effectiveTz, shifts, now4);
+var buildSameDayShiftOccurrence = (timezone, shift, now4 = /* @__PURE__ */ new Date()) => {
+  const zonedNow = toZonedTime(now4, timezone);
+  zonedNow.getHours() * 60 + zonedNow.getMinutes();
+  const startMinutes = parseTimeToMinutes(shift.startTime);
+  const durationMinutes = calculateDurationMinutes(shift.startTime, shift.endTime);
+  if (!Number.isFinite(startMinutes) || !Number.isFinite(durationMinutes) || durationMinutes <= 0) {
+    return null;
+  }
+  const occurrenceStart = new Date(zonedNow);
+  occurrenceStart.setHours(0, 0, 0, 0);
+  occurrenceStart.setHours(Math.floor(startMinutes / 60), startMinutes % 60, 0, 0);
+  const occurrenceEnd = new Date(occurrenceStart.getTime() + durationMinutes * 60 * 1e3);
+  return {
+    shift,
+    operationalDate: format(occurrenceStart, "yyyy-MM-dd"),
+    occurrenceStart,
+    occurrenceEnd
+  };
+};
+var determineCurrentOrPreviousShiftFromDefinitions = (timezone, shifts, now4 = /* @__PURE__ */ new Date()) => {
+  const activeShift = determineActiveShiftFromDefinitions(timezone, shifts, now4);
   if (activeShift) {
     return activeShift;
   }
+  const sameDayOccurrences = shifts.map((shift) => buildSameDayShiftOccurrence(timezone, shift, now4)).filter((occurrence) => occurrence !== null);
+  if (!sameDayOccurrences.length) {
+    return null;
+  }
+  const zonedNow = toZonedTime(now4, timezone);
+  const completedOccurrences = sameDayOccurrences.filter(
+    (occurrence) => occurrence.occurrenceEnd.getTime() <= zonedNow.getTime()
+  );
+  let chosenOccurrence;
+  if (completedOccurrences.length > 0) {
+    chosenOccurrence = completedOccurrences.reduce((best, candidate) => {
+      if (candidate.occurrenceEnd.getTime() > best.occurrenceEnd.getTime()) {
+        return candidate;
+      }
+      if (candidate.occurrenceEnd.getTime() === best.occurrenceEnd.getTime() && candidate.shift.shiftId > best.shift.shiftId) {
+        return candidate;
+      }
+      return best;
+    });
+  } else {
+    const upcomingOccurrences = sameDayOccurrences.filter(
+      (occurrence) => occurrence.occurrenceStart.getTime() > zonedNow.getTime()
+    );
+    if (!upcomingOccurrences.length) {
+      return null;
+    }
+    chosenOccurrence = upcomingOccurrences.reduce((best, candidate) => {
+      if (candidate.occurrenceStart.getTime() < best.occurrenceStart.getTime()) {
+        return candidate;
+      }
+      if (candidate.occurrenceStart.getTime() === best.occurrenceStart.getTime() && candidate.shift.shiftId < best.shift.shiftId) {
+        return candidate;
+      }
+      return best;
+    });
+  }
+  return {
+    shiftId: chosenOccurrence.shift.shiftId,
+    shiftName: chosenOccurrence.shift.shiftName,
+    startTime: chosenOccurrence.shift.startTime,
+    endTime: chosenOccurrence.shift.endTime,
+    timezone,
+    date: chosenOccurrence.operationalDate
+  };
+};
+var getCurrentShift = (timezone, shiftConfig, now4 = /* @__PURE__ */ new Date()) => {
+  const { shifts, timezone: effectiveTz } = normalizeShiftDefinitions(timezone, shiftConfig);
+  const resolvedShift = determineCurrentOrPreviousShiftFromDefinitions(effectiveTz, shifts, now4);
+  if (resolvedShift) {
+    return resolvedShift;
+  }
   const fallbackShift = shifts[0];
   return {
     shiftId: fallbackShift.shiftId,
@@ -3977,7 +4046,7 @@ var dashboardService = {
     const factoryViewId = entityConfig.factoryViewId ?? "factory";
     const defaultTimezone = dateTimeConfig.defaultTimezone;
     const currentShiftResult = getCurrentShift(defaultTimezone, shiftConfig);
-    const queryDate = dateProp || getOperationalDate(defaultTimezone);
+    const queryDate = dateProp || currentShiftResult.date;
     const queryShiftId = shiftProp ?? currentShiftResult.shiftId;
     const lineId = lineIdInput;
     let query = supabase.from(metricsTable).select("company_id,line_id,shift_id,date,workspace_id,workspace_name,total_output,avg_pph,performance_score,avg_cycle_time,trend_score,ideal_output,efficiency,total_day_output").eq("shift_id", queryShiftId).eq("date", queryDate);
@@ -4026,7 +4095,7 @@ var dashboardService = {
     const metricsTable = `${metricsTablePrefixStr}_${companyId.replace(/-/g, "_")}`;
     const defaultTimezone = dateTimeConfig.defaultTimezone;
     const currentShiftResult = getCurrentShift(defaultTimezone, shiftConfig);
-    const queryDate = dateProp || getOperationalDate(defaultTimezone);
+    const queryDate = dateProp || currentShiftResult.date;
     const queryShiftId = shiftIdProp !== void 0 ? shiftIdProp : currentShiftResult.shiftId;
     try {
       const { data, error } = await supabase.from(metricsTable).select("*").eq("workspace_id", workspaceUuid).eq("date", queryDate).eq("shift_id", queryShiftId).maybeSingle();
@@ -4335,7 +4404,7 @@ var dashboardService = {
     const defaultTimezone = dateTimeConfig.defaultTimezone;
     const lineIdToQuery = lineIdInput || factoryViewId;
     const currentShiftResult = getCurrentShift(defaultTimezone, shiftConfig);
-    const queryDate = dateProp || getOperationalDate(defaultTimezone);
+    const queryDate = dateProp || currentShiftResult.date;
     const queryShiftId = shiftProp !== void 0 ? shiftProp : currentShiftResult.shiftId;
     try {
       if (lineIdToQuery === factoryViewId) {
@@ -12459,8 +12528,8 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId, options) => {
       return;
     }
     const channels = [];
-    const operationalDate = operationalDateFromKey || date || getOperationalDate(defaultTimezone);
     const currentShift = getCurrentShift(defaultTimezone, shiftConfig);
+    const operationalDate = operationalDateFromKey || date || currentShift.date;
     const queryShiftId = operationalShiftIdFromKey ?? shiftId ?? currentShift.shiftId;
     fetchMetrics();
     if (!realtimeEnabled) {
@@ -12816,14 +12885,16 @@ var useLineWorkspaceMetrics = (lineId, options) => {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
   const [initialized, setInitialized] = useState(false);
-  const queryShiftId = useMemo(() => {
+  const currentShift = useMemo(() => {
     const effectiveTimezone = timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata";
-    const currentShift = getCurrentShift(effectiveTimezone, shiftConfig);
+    return getCurrentShift(effectiveTimezone, shiftConfig);
+  }, [timezone, dateTimeConfig.defaultTimezone, shiftConfig]);
+  const queryShiftId = useMemo(() => {
     return options?.initialShiftId !== void 0 ? options.initialShiftId : currentShift.shiftId;
-  }, [options?.initialShiftId, timezone, dateTimeConfig.defaultTimezone, shiftConfig]);
+  }, [options?.initialShiftId, currentShift.shiftId]);
   const queryDate = useMemo(() => {
-    return options?.initialDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
-  }, [options?.initialDate, timezone, dateTimeConfig.defaultTimezone]);
+    return options?.initialDate || currentShift.date;
+  }, [options?.initialDate, currentShift.date]);
   const metricsTable = useMemo(() => {
     const companyId = entityConfig.companyId;
     if (!companyId) return "";
@@ -13047,10 +13118,9 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
     setError(null);
     try {
       const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
-      const operationalDate = getOperationalDate(defaultTimezone, new Date(currentShiftDetails.date));
       const data = await dashboardService.getDetailedLineInfo(
         lineIdToUse,
-        operationalDate,
+        currentShiftDetails.date,
         currentShiftDetails.shiftId
       );
       setLineData(data);
@@ -13074,7 +13144,7 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
     }
     fetchData();
     const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
-    const operationalDate = getOperationalDate(defaultTimezone, new Date(currentShiftDetails.date));
+    const operationalDate = currentShiftDetails.date;
     const currentShiftId = currentShiftDetails.shiftId;
     let filterString = "";
     let targetLineIdsForSubscription = [];
@@ -14839,7 +14909,7 @@ var useRealtimeLineMetrics = ({
     () => urlShiftId !== void 0 ? urlShiftId : currentShift.shiftId,
     [urlShiftId, currentShift.shiftId]
   );
-  const date = useMemo(() => urlDate || getOperationalDate(effectiveTimezone), [urlDate, effectiveTimezone]);
+  const date = useMemo(() => urlDate || currentShift.date, [urlDate, currentShift.date]);
   const fetchData = useCallback(async () => {
     try {
       if (!lineIdRef.current || isFetchingRef.current || enabled === false) return;
@@ -14970,7 +15040,7 @@ var useRealtimeLineMetrics = ({
     const companyId = entityConfig.companyId;
     const metricsTablePrefix = getMetricsTablePrefix();
     const metricsTable = `${metricsTablePrefix}_${(companyId || "").replace(/-/g, "_")}`;
-    const currentDate = urlDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
+    const currentDate = urlDate || currentShift.date;
     const filter2 = `line_id=in.(${filteredLineIds.join(",")})`;
     const lineMetricsChannel = supabase.channel(`line-metrics-${timestamp}`).on(
       "postgres_changes",
@@ -17655,8 +17725,11 @@ var useAllWorkspaceMetrics = (options) => {
     if (shiftGroups.length > 0) {
       return shiftGroups[0].date;
     }
-    return getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
-  }, [options?.initialDate, shiftGroups, timezone, dateTimeConfig.defaultTimezone]);
+    return getCurrentShift(
+      timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata",
+      staticShiftConfig
+    ).date;
+  }, [options?.initialDate, shiftGroups, timezone, dateTimeConfig.defaultTimezone, staticShiftConfig]);
   const metricsTable = useMemo(() => {
     const companyId = entityConfig.companyId;
     if (!companyId) return "";
@@ -51920,11 +51993,11 @@ var getWorkspaceStyles = (position, isPlaceholder = false) => {
           ${isPlaceholder ? "cursor-default" : ""}`;
 };
 var formatPercentRange = (min, max) => {
-  const format9 = (value) => Number.isInteger(value) ? `${value}` : value.toFixed(1);
+  const format10 = (value) => Number.isInteger(value) ? `${value}` : value.toFixed(1);
   if (min >= 100 || max >= 100) {
-    return `${format9(min)}+%`;
+    return `${format10(min)}+%`;
   }
-  return `${format9(min)}-${format9(max)}%`;
+  return `${format10(min)}-${format10(max)}%`;
 };
 var Legend5 = ({
   useBottleneckLabel = false,
@@ -60357,8 +60430,7 @@ var FactoryView = ({
           setLoading(false);
           return;
         }
-        const { shiftId } = getCurrentShift(timezone, shiftConfig);
-        const date = getOperationalDate(timezone);
+        const { shiftId, date } = getCurrentShift(timezone, shiftConfig);
         const hourlyDataPromises = effectiveLineIds.map(
           (lineId) => supabase.from("line_hourly_metrics").select("hour, efficiency").eq("line_id", lineId).eq("shift_id", shiftId).eq("date", date).order("hour", { ascending: false }).limit(5)
         );
@@ -60931,6 +61003,7 @@ var useLiveMonitorBootstrap = ({
     [normalizedLineIds]
   );
   const [state, setState] = useState(() => createEmptyState());
+  const [rawState, setRawState] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState(null);
   const activeRequestIdRef = useRef(0);
@@ -60961,62 +61034,80 @@ var useLiveMonitorBootstrap = ({
       if (requestId !== activeRequestIdRef.current) {
         return;
       }
+      setRawState({
+        requestKey,
+        normalizedLineIds,
+        response
+      });
+    } catch (fetchError) {
+      if (requestId !== activeRequestIdRef.current) {
+        return;
+      }
+      setError(fetchError instanceof Error ? fetchError : new Error("Failed to load live monitor bootstrap"));
+    } finally {
+      if (requestId === activeRequestIdRef.current) {
+        setIsLoading(false);
+      }
+    }
+  }, [
+    enabled,
+    supabase,
+    resolvedCompanyId,
+    normalizedLineIds,
+    requestKey
+  ]);
+  useEffect(() => {
+    if (!enabled || !rawState || !resolvedCompanyId) {
+      return;
+    }
+    try {
       const workspaceMetrics = transformMonitorWorkspaceMetrics({
-        rows: response.workspace_metrics || [],
+        rows: rawState.response.workspace_metrics || [],
         companyId: resolvedCompanyId,
         workspaceConfig: effectiveWorkspaceConfig,
         appTimezone: effectiveTimezone,
-        lineMetrics: response.line_metrics || [],
+        lineMetrics: rawState.response.line_metrics || [],
         resolveShiftConfig: (lineId) => lineShiftConfigs?.get(lineId) || fallbackShiftConfig,
         shouldOverrideShiftType: (lineId) => Boolean(lineShiftConfigs?.get(lineId)),
         fallbackShiftConfig
       });
-      const activeBreaks = transformActiveBreaks(response.active_breaks_by_line);
-      const metadata = normalizeMetadata(response.metadata);
+      const activeBreaks = transformActiveBreaks(rawState.response.active_breaks_by_line);
+      const metadata = normalizeMetadata(rawState.response.metadata);
       const workspaceIds = workspaceMetrics.map((metric) => metric.workspace_uuid).filter((workspaceId) => Boolean(workspaceId));
-      const videoStreamsByWorkspaceId = response.video_streams_by_workspace_id || {};
+      const videoStreamsByWorkspaceId = rawState.response.video_streams_by_workspace_id || {};
       if (metadata.idleTimeVlmByLine) {
         hydrateFromBackend(metadata.idleTimeVlmByLine);
       }
       workspaceService.primeWorkspaceVideoStreamsCache({
         streams: videoStreamsByWorkspaceId,
         workspaceIds,
-        lineIds: normalizedLineIds
+        lineIds: rawState.normalizedLineIds
       });
       setState({
-        requestKey,
-        resolvedScope: response.resolved_scope || [],
-        scopeKey: response.scope_key || null,
-        lines: response.lines || [],
+        requestKey: rawState.requestKey,
+        resolvedScope: rawState.response.resolved_scope || [],
+        scopeKey: rawState.response.scope_key || null,
+        lines: rawState.response.lines || [],
         workspaceMetrics,
-        lineMetrics: response.line_metrics || [],
-        kpiTrend: response.kpi_trend || null,
+        lineMetrics: rawState.response.line_metrics || [],
+        kpiTrend: rawState.response.kpi_trend || null,
         activeBreaks,
         videoStreamsByWorkspaceId,
-        efficiencyLegend: response.efficiency_legend || null,
+        efficiencyLegend: rawState.response.efficiency_legend || null,
         metadata
       });
-    } catch (fetchError) {
-      if (requestId !== activeRequestIdRef.current) {
-        return;
-      }
-      setError(fetchError instanceof Error ? fetchError : new Error("Failed to load live monitor bootstrap"));
-    } finally {
-      if (requestId === activeRequestIdRef.current) {
-        setIsLoading(false);
-      }
+    } catch (processingError) {
+      setError(processingError instanceof Error ? processingError : new Error("Failed to process live monitor bootstrap"));
     }
   }, [
     enabled,
-    supabase,
+    rawState,
     resolvedCompanyId,
-    normalizedLineIds,
-    requestKey,
-    hydrateFromBackend,
     effectiveWorkspaceConfig,
     effectiveTimezone,
     lineShiftConfigs,
-    fallbackShiftConfig
+    fallbackShiftConfig,
+    hydrateFromBackend
   ]);
   useEffect(() => {
     if (!enabled) {
@@ -61025,6 +61116,7 @@ var useLiveMonitorBootstrap = ({
     }
     if (!resolvedCompanyId || normalizedLineIds.length === 0 || !supabase) {
       setState(createEmptyState());
+      setRawState(null);
       setIsLoading(false);
       setError(null);
       return;
@@ -62898,8 +62990,8 @@ var useLineDetailPageData = ({
     [urlShiftId, currentShift]
   );
   const queryDate = useMemo(
-    () => urlDate || getOperationalDate(timezone),
-    [urlDate, timezone]
+    () => urlDate || currentShift?.date || getOperationalDate(timezone),
+    [urlDate, currentShift?.date, timezone]
   );
   const [detailResponse, setDetailResponse] = useState(null);
   const [loading, setLoading] = useState(true);
@@ -65635,7 +65727,7 @@ var formatDateKey2 = (dateKey, timezone, options) => {
     return dateKey;
   }
 };
-var LeaderboardCountdown = ({ targetDate, format: format9, finishedLabel = "Finished", placeholder = "--", onFinished }) => {
+var LeaderboardCountdown = ({ targetDate, format: format10, finishedLabel = "Finished", placeholder = "--", onFinished }) => {
   const [time2, setTime] = useState("");
   const hasFinishedRef = useRef(false);
   useEffect(() => {
@@ -65657,7 +65749,7 @@ var LeaderboardCountdown = ({ targetDate, format: format9, finishedLabel = "Fini
         }
         return;
       }
-      if (format9 === "days") {
+      if (format10 === "days") {
         const days = Math.floor(diff / (1e3 * 60 * 60 * 24));
         const hours = Math.floor(diff % (1e3 * 60 * 60 * 24) / (1e3 * 60 * 60));
         setTime(`${days} days ${hours} hours`);
@@ -65672,7 +65764,7 @@ var LeaderboardCountdown = ({ targetDate, format: format9, finishedLabel = "Fini
     tick();
     const interval = setInterval(tick, 1e3);
     return () => clearInterval(interval);
-  }, [targetDate, format9, finishedLabel, placeholder, onFinished]);
+  }, [targetDate, format10, finishedLabel, placeholder, onFinished]);
   return /* @__PURE__ */ jsx(Fragment, { children: time2 });
 };
 var LinesLeaderboard = ({

package/package.json

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