@optifye/dashboard-core 6.9.13 → 6.9.14

package/dist/index.js

@@ -125,6 +125,32 @@ function isValidPrefetchStatus(status) {
   return typeof status === "string" && Object.values(PrefetchStatus).includes(status);
 }
 
+// src/lib/types/calendar.ts
+var DEFAULT_SHIFT_DATA = {
+  efficiency: 0,
+  output: 0,
+  cycleTime: 0,
+  pph: 0,
+  pphThreshold: 0,
+  idealOutput: 0,
+  rank: 0,
+  idleTime: 0,
+  hasData: false
+};
+var getShiftData = (day, shiftId) => {
+  const shift = day.shifts[shiftId];
+  if (shift) {
+    return { ...shift, hasData: true };
+  }
+  return { ...DEFAULT_SHIFT_DATA };
+};
+var hasAnyShiftData = (day) => {
+  return Object.keys(day.shifts).length > 0;
+};
+var getAvailableShiftIds = (day) => {
+  return Object.keys(day.shifts).map(Number).sort((a, b) => a - b);
+};
+
 // src/components/dashboard/grid/workspace_grid_constants.ts
 var DEFAULT_WORKSPACE_POSITIONS = [
   // Middle top row - 7 tapping workspaces (conveyor style)
@@ -171,15 +197,21 @@ var DEFAULT_ENTITY_CONFIG = {
   }
 };
 var DEFAULT_SHIFT_CONFIG = {
+  shifts: [
+    { shiftId: 0, shiftName: "Day Shift", startTime: "06:00", endTime: "18:00", breaks: [], timezone: "UTC" },
+    { shiftId: 1, shiftName: "Night Shift", startTime: "18:00", endTime: "06:00", breaks: [], timezone: "UTC" }
+  ],
   dayShift: {
     id: 0,
     startTime: "06:00",
-    endTime: "18:00"
+    endTime: "18:00",
+    name: "Day Shift"
   },
   nightShift: {
     id: 1,
     startTime: "18:00",
-    endTime: "06:00"
+    endTime: "06:00",
+    name: "Night Shift"
   },
   transitionPeriodMinutes: 15
 };
@@ -529,70 +561,128 @@ var parseTimeToMinutes = (timeString) => {
   const [hours, minutes] = timeString.split(":").map(Number);
   return hours * 60 + minutes;
 };
-var getCurrentShift = (timezone, shiftConfig, now2 = /* @__PURE__ */ new Date()) => {
-  const dayShiftStartStr = shiftConfig?.dayShift?.startTime || DEFAULT_DAY_SHIFT_START;
-  const nightShiftStartStr = shiftConfig?.nightShift?.startTime || DEFAULT_NIGHT_SHIFT_START;
-  const dayShiftId = shiftConfig?.dayShift?.id ?? 0;
-  const nightShiftId = shiftConfig?.nightShift?.id ?? 1;
-  const dayShiftStartMinutes = parseTimeToMinutes(dayShiftStartStr);
-  const nightShiftStartMinutes = parseTimeToMinutes(nightShiftStartStr);
-  const effectiveDayStart = !isNaN(dayShiftStartMinutes) ? dayShiftStartMinutes : parseTimeToMinutes(DEFAULT_DAY_SHIFT_START);
-  const effectiveNightStart = !isNaN(nightShiftStartMinutes) ? nightShiftStartMinutes : parseTimeToMinutes(DEFAULT_NIGHT_SHIFT_START);
+var normalizeShiftDefinitions = (timezone, shiftConfig) => {
+  if (shiftConfig?.shifts && shiftConfig.shifts.length > 0) {
+    return {
+      shifts: shiftConfig.shifts,
+      timezone: shiftConfig.shifts[0].timezone || shiftConfig.timezone || timezone
+    };
+  }
+  const fallbackTimezone = shiftConfig?.timezone || timezone;
+  const legacyShifts = [];
+  if (shiftConfig?.dayShift) {
+    legacyShifts.push({
+      shiftId: shiftConfig.dayShift.id ?? 0,
+      shiftName: shiftConfig.dayShift.name || "Day Shift",
+      startTime: shiftConfig.dayShift.startTime || DEFAULT_DAY_SHIFT_START,
+      endTime: shiftConfig.dayShift.endTime || "18:00",
+      breaks: [],
+      timezone: fallbackTimezone
+    });
+  }
+  if (shiftConfig?.nightShift) {
+    legacyShifts.push({
+      shiftId: shiftConfig.nightShift.id ?? 1,
+      shiftName: shiftConfig.nightShift.name || "Night Shift",
+      startTime: shiftConfig.nightShift.startTime || DEFAULT_NIGHT_SHIFT_START,
+      endTime: shiftConfig.nightShift.endTime || "06:00",
+      breaks: [],
+      timezone: fallbackTimezone
+    });
+  }
+  if (legacyShifts.length === 0) {
+    legacyShifts.push(
+      {
+        shiftId: 0,
+        shiftName: "Day Shift",
+        startTime: DEFAULT_DAY_SHIFT_START,
+        endTime: "18:00",
+        breaks: [],
+        timezone: fallbackTimezone
+      },
+      {
+        shiftId: 1,
+        shiftName: "Night Shift",
+        startTime: DEFAULT_NIGHT_SHIFT_START,
+        endTime: "06:00",
+        breaks: [],
+        timezone: fallbackTimezone
+      }
+    );
+  }
+  return { shifts: legacyShifts, timezone: fallbackTimezone };
+};
+var determineShiftFromDefinitions = (timezone, shifts, now2 = /* @__PURE__ */ new Date()) => {
   const zonedNow = dateFnsTz.toZonedTime(now2, timezone);
-  const currentHour = zonedNow.getHours();
-  const currentMinutes = zonedNow.getMinutes();
-  const currentTotalMinutes = currentHour * 60 + currentMinutes;
-  const operationalDate = getOperationalDate(timezone, zonedNow, dayShiftStartStr);
-  let determinedShiftId;
-  if (effectiveDayStart < effectiveNightStart) {
-    if (currentTotalMinutes >= effectiveDayStart && currentTotalMinutes < effectiveNightStart) {
-      determinedShiftId = dayShiftId;
-    } else {
-      determinedShiftId = nightShiftId;
+  const currentMinutes = zonedNow.getHours() * 60 + zonedNow.getMinutes();
+  let chosen;
+  let operationalDate = getOperationalDate(timezone, zonedNow, shifts[0].startTime);
+  for (const shift of shifts) {
+    const start = parseTimeToMinutes(shift.startTime);
+    const endRaw = parseTimeToMinutes(shift.endTime);
+    let end = endRaw;
+    const wraps = end <= start;
+    if (wraps) end += 1440;
+    if (start <= currentMinutes && currentMinutes < end) {
+      chosen = shift;
+      operationalDate = getOperationalDate(timezone, zonedNow, shift.startTime);
+      break;
     }
-  } else {
-    if (currentTotalMinutes >= effectiveDayStart || currentTotalMinutes < effectiveNightStart) {
-      determinedShiftId = dayShiftId;
-    } else {
-      determinedShiftId = nightShiftId;
+    if (start <= currentMinutes + 1440 && currentMinutes + 1440 < end) {
+      chosen = shift;
+      operationalDate = getOperationalDate(timezone, zonedNow, shift.startTime);
+      break;
     }
   }
-  return { shiftId: determinedShiftId, date: operationalDate };
+  if (!chosen) {
+    chosen = shifts[0];
+    operationalDate = getOperationalDate(timezone, zonedNow, chosen.startTime);
+  }
+  return {
+    shiftId: chosen.shiftId,
+    shiftName: chosen.shiftName,
+    startTime: chosen.startTime,
+    endTime: chosen.endTime,
+    timezone,
+    date: operationalDate
+  };
+};
+var getCurrentShift = (timezone, shiftConfig, now2 = /* @__PURE__ */ new Date()) => {
+  const { shifts, timezone: effectiveTz } = normalizeShiftDefinitions(timezone, shiftConfig);
+  return determineShiftFromDefinitions(effectiveTz, shifts, now2);
 };
 var isTransitionPeriod = (timezone, shiftConfig, now2 = /* @__PURE__ */ new Date()) => {
-  const dayShiftStartStr = shiftConfig?.dayShift?.startTime || DEFAULT_DAY_SHIFT_START;
-  const nightShiftStartStr = shiftConfig?.nightShift?.startTime || DEFAULT_NIGHT_SHIFT_START;
   const transitionMinutes = shiftConfig?.transitionPeriodMinutes ?? DEFAULT_TRANSITION_MINUTES;
-  const dayShiftStartMinutes = parseTimeToMinutes(dayShiftStartStr);
-  const nightShiftStartMinutes = parseTimeToMinutes(nightShiftStartStr);
-  if (isNaN(dayShiftStartMinutes) || isNaN(nightShiftStartMinutes)) {
-    return false;
-  }
-  const transitionTimes = [dayShiftStartMinutes, nightShiftStartMinutes];
-  const zonedNow = dateFnsTz.toZonedTime(now2, timezone);
-  const currentHour = zonedNow.getHours();
-  const currentMinutes = zonedNow.getMinutes();
-  const currentTotalMinutes = currentHour * 60 + currentMinutes;
-  return transitionTimes.some((transitionTime) => {
+  const { shifts, timezone: effectiveTz } = normalizeShiftDefinitions(timezone, shiftConfig);
+  if (!shifts.length) return false;
+  const zonedNow = dateFnsTz.toZonedTime(now2, effectiveTz);
+  const currentTotalMinutes = zonedNow.getHours() * 60 + zonedNow.getMinutes();
+  return shifts.some((shift) => {
+    const transitionTime = parseTimeToMinutes(shift.startTime);
+    if (isNaN(transitionTime)) return false;
     const lowerBoundBefore = (transitionTime - transitionMinutes + 1440) % 1440;
     const upperBoundBefore = transitionTime;
-    let isBefore = false;
-    if (lowerBoundBefore < upperBoundBefore) {
-      isBefore = currentTotalMinutes >= lowerBoundBefore && currentTotalMinutes < upperBoundBefore;
-    } else {
-      isBefore = currentTotalMinutes >= lowerBoundBefore || currentTotalMinutes < upperBoundBefore;
-    }
     const lowerBoundAfter = transitionTime;
     const upperBoundAfter = (transitionTime + transitionMinutes) % 1440;
-    let isAfter = false;
-    if (lowerBoundAfter < upperBoundAfter) {
-      isAfter = currentTotalMinutes >= lowerBoundAfter && currentTotalMinutes < upperBoundAfter;
-    } else {
-      isAfter = currentTotalMinutes >= lowerBoundAfter || currentTotalMinutes < upperBoundAfter;
-    }
-    return isBefore || isAfter;
+    const inBefore = lowerBoundBefore < upperBoundBefore ? currentTotalMinutes >= lowerBoundBefore && currentTotalMinutes < upperBoundBefore : currentTotalMinutes >= lowerBoundBefore || currentTotalMinutes < upperBoundBefore;
+    const inAfter = lowerBoundAfter < upperBoundAfter ? currentTotalMinutes >= lowerBoundAfter && currentTotalMinutes < upperBoundAfter : currentTotalMinutes >= lowerBoundAfter || currentTotalMinutes < upperBoundAfter;
+    return inBefore || inAfter;
   });
 };
+var getShiftNameById = (shiftId, timezone, shiftConfig) => {
+  const { shifts } = normalizeShiftDefinitions(timezone, shiftConfig);
+  const shift = shifts.find((s) => s.shiftId === shiftId);
+  if (shift) {
+    return shift.shiftName;
+  }
+  if (shiftId === 0) return "Day Shift";
+  if (shiftId === 1) return "Night Shift";
+  return `Shift ${shiftId}`;
+};
+var getShortShiftName = (shiftId, timezone, shiftConfig) => {
+  const fullName = getShiftNameById(shiftId, timezone, shiftConfig);
+  return fullName.replace(/ Shift$/i, "");
+};
 
 // src/lib/utils/database.ts
 var getCompanyMetricsTableName = (companyId, prefix = "workspace_performance") => {
@@ -1185,12 +1275,12 @@ var dashboardService = {
       throw err;
     }
   },
-  async getDetailedLineInfo(lineIdInput, dateProp, shiftProp) {
+  async getDetailedLineInfo(lineIdInput, dateProp, shiftProp, providedShiftConfig) {
     const supabase = _getSupabaseInstance();
     const config = _getDashboardConfigInstance();
     const dbConfig = config.databaseConfig ?? DEFAULT_DATABASE_CONFIG;
     const entityConfig = config.entityConfig ?? DEFAULT_ENTITY_CONFIG;
-    const shiftConfig = config.shiftConfig ?? DEFAULT_SHIFT_CONFIG;
+    const shiftConfig = providedShiftConfig || (config.shiftConfig ?? DEFAULT_SHIFT_CONFIG);
     const dateTimeConfig = config.dateTimeConfig ?? DEFAULT_DATE_TIME_CONFIG;
     const workspaceConfig = config.workspaceConfig ?? DEFAULT_WORKSPACE_CONFIG;
     const linesTable = getTable(dbConfig, "lines");
@@ -1277,8 +1367,8 @@ var dashboardService = {
             underperforming_workspaces: combinedMetricsData.underperforming_workspaces,
             line_threshold: combinedMetricsData.line_threshold,
             threshold_pph: combinedMetricsData.threshold_pph / numLines,
-            shift_start: metricsData?.[0]?.shift_start || shiftConfig.dayShift?.startTime || "06:00",
-            shift_end: metricsData?.[0]?.shift_end || shiftConfig.dayShift?.endTime || "18:00",
+            shift_start: metricsData?.[0]?.shift_start || (shiftConfig.shifts && shiftConfig.shifts.length > 0 ? shiftConfig.shifts.find((s) => s.shiftId === 0)?.startTime || shiftConfig.shifts[0].startTime : shiftConfig.dayShift?.startTime) || "06:00",
+            shift_end: metricsData?.[0]?.shift_end || (shiftConfig.shifts && shiftConfig.shifts.length > 0 ? shiftConfig.shifts.find((s) => s.shiftId === 0)?.endTime || shiftConfig.shifts[0].endTime : shiftConfig.dayShift?.endTime) || "18:00",
             last_updated: (/* @__PURE__ */ new Date()).toISOString(),
             output_array: combinedMetricsData.outputArrays.length > 0 ? memoizedOutputArrayAggregation(combinedMetricsData.outputArrays) : [],
             underperforming_workspace_names: combinedMetricsData.underperforming_workspace_names,
@@ -1319,8 +1409,8 @@ var dashboardService = {
           underperforming_workspaces: metrics2?.underperforming_workspaces ?? 0,
           line_threshold: metrics2?.line_threshold || 0,
           threshold_pph: metrics2?.threshold_pph || 0,
-          shift_start: metrics2?.shift_start || shiftConfig.dayShift?.startTime || "06:00",
-          shift_end: metrics2?.shift_end || shiftConfig.dayShift?.endTime || "18:00",
+          shift_start: metrics2?.shift_start || (shiftConfig.shifts && shiftConfig.shifts.length > 0 ? shiftConfig.shifts.find((s) => s.shiftId === 0)?.startTime || shiftConfig.shifts[0].startTime : shiftConfig.dayShift?.startTime) || "06:00",
+          shift_end: metrics2?.shift_end || (shiftConfig.shifts && shiftConfig.shifts.length > 0 ? shiftConfig.shifts.find((s) => s.shiftId === 0)?.endTime || shiftConfig.shifts[0].endTime : shiftConfig.dayShift?.endTime) || "18:00",
           last_updated: metrics2?.last_updated || (/* @__PURE__ */ new Date()).toISOString(),
           output_array: metrics2?.output_array || [],
           underperforming_workspace_names: metrics2?.underperforming_workspace_names || [],
@@ -1431,7 +1521,7 @@ var dashboardService = {
       throw err;
     }
   },
-  async getUnderperformingWorkspaces(lineIdInput, monthInput, yearInput) {
+  async getUnderperformingWorkspaces(lineIdInput, monthInput, yearInput, shiftIds) {
     _getSupabaseInstance();
     const config = _getDashboardConfigInstance();
     const entityConfig = config.entityConfig ?? DEFAULT_ENTITY_CONFIG;
@@ -1451,13 +1541,14 @@ var dashboardService = {
     const currentDate = /* @__PURE__ */ new Date();
     const currentMonth = monthInput !== void 0 ? monthInput : currentDate.getMonth();
     const currentYear = yearInput !== void 0 ? yearInput : currentDate.getFullYear();
+    const dynamicShiftIds = shiftIds || shiftConfig.shifts?.map((s) => s.shiftId) || [shiftConfig.dayShift?.id ?? 0, shiftConfig.nightShift?.id ?? 1];
     const bodyPayload = {
       lineId: lineIdInput === factoryViewId ? configuredLineIds : lineIdInput,
       month: currentMonth,
       year: currentYear,
       companyId,
       metricsTable,
-      shifts: [shiftConfig.dayShift?.id ?? 0, shiftConfig.nightShift?.id ?? 1]
+      shifts: dynamicShiftIds
     };
     const response = await fetch(fullFunctionUrl, {
       method: "POST",
@@ -2164,16 +2255,13 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     this.cache.set(key, { data, timestamp: Date.now() });
   }
   getShiftTiming(timezone, shiftConfig) {
-    const { shiftId, date } = getCurrentShift(timezone, shiftConfig);
-    const dayShiftId = shiftConfig?.dayShift?.id ?? 0;
-    const isDayShift = shiftId === dayShiftId;
+    const currentShift = getCurrentShift(timezone, shiftConfig);
+    const { shiftId, date, shiftName, startTime, endTime } = currentShift;
     const defaultDayStart = "06:00";
     const defaultDayEnd = "18:00";
-    const defaultNightStart = "18:00";
-    const defaultNightEnd = "06:00";
-    const shiftStartStr = isDayShift ? shiftConfig?.dayShift?.startTime || defaultDayStart : shiftConfig?.nightShift?.startTime || defaultNightStart;
-    const shiftEndStr = isDayShift ? shiftConfig?.dayShift?.endTime || defaultDayEnd : shiftConfig?.nightShift?.endTime || defaultNightEnd;
-    const shiftLabel = isDayShift ? "Day Shift" : "Night Shift";
+    const shiftStartStr = startTime || defaultDayStart;
+    const shiftEndStr = endTime || defaultDayEnd;
+    const shiftLabel = shiftName || (shiftId === 0 ? "Day Shift" : shiftId === 1 ? "Night Shift" : `Shift ${shiftId}`);
     const parseTime = (value) => {
       const [hourPart = "0", minutePart = "0"] = value.split(":");
       const hour = Number.parseInt(hourPart, 10);
@@ -2248,6 +2336,13 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
   async getWorkspaceHealthStatus(options = {}) {
     const supabase = _getSupabaseInstance();
     if (!supabase) throw new Error("Supabase client not initialized");
+    const dashboardConfig = _getDashboardConfigInstance();
+    if (!options.shiftConfig) {
+      console.warn("[workspaceHealthService.getWorkspaceHealthStatus] \u26A0\uFE0F No shiftConfig passed! Falling back to static config. This may cause incorrect shift_id queries.");
+    }
+    const shiftConfig = options.shiftConfig || dashboardConfig?.shiftConfig;
+    const defaultTimezone = dashboardConfig?.dateTimeConfig?.defaultTimezone || "UTC";
+    const timezone = options.timezone || shiftConfig?.timezone || defaultTimezone;
     let query = supabase.from("workspace_health_status").select("*").order("workspace_display_name", { ascending: true });
     if (options.lineId) {
       query = query.eq("line_id", options.lineId);
@@ -2265,7 +2360,7 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     let uptimeMap = /* @__PURE__ */ new Map();
     if (companyId) {
       try {
-        uptimeMap = await this.calculateWorkspaceUptime(companyId);
+        uptimeMap = await this.calculateWorkspaceUptime(companyId, shiftConfig, timezone);
       } catch (error2) {
         console.error("Error calculating uptime:", error2);
       }
@@ -2343,7 +2438,7 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     }
     return filteredData;
   }
-  async getWorkspaceUptimeTimeline(workspaceId, companyId) {
+  async getWorkspaceUptimeTimeline(workspaceId, companyId, passedShiftConfig, passedTimezone) {
     if (!workspaceId) {
       throw new Error("workspaceId is required to fetch uptime timeline");
     }
@@ -2353,8 +2448,12 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     const supabase = _getSupabaseInstance();
     if (!supabase) throw new Error("Supabase client not initialized");
     const dashboardConfig = _getDashboardConfigInstance();
-    const timezone = dashboardConfig?.dateTimeConfig?.defaultTimezone || "UTC";
-    const shiftConfig = dashboardConfig?.shiftConfig;
+    const defaultTimezone = dashboardConfig?.dateTimeConfig?.defaultTimezone || "UTC";
+    if (!passedShiftConfig) {
+      console.warn("[workspaceHealthService.getWorkspaceUptimeTimeline] \u26A0\uFE0F No shiftConfig passed! Falling back to static config. This may cause incorrect shift_id queries.");
+    }
+    const shiftConfig = passedShiftConfig || dashboardConfig?.shiftConfig;
+    const timezone = passedTimezone || shiftConfig?.timezone || defaultTimezone;
     const {
       shiftId,
       shiftLabel,
@@ -2595,18 +2694,22 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
   clearCache() {
     this.cache.clear();
   }
-  async calculateWorkspaceUptime(companyId) {
+  async calculateWorkspaceUptime(companyId, passedShiftConfig, timezone) {
     const supabase = _getSupabaseInstance();
     if (!supabase) throw new Error("Supabase client not initialized");
     const dashboardConfig = _getDashboardConfigInstance();
-    const timezone = dashboardConfig?.dateTimeConfig?.defaultTimezone || "UTC";
-    const shiftConfig = dashboardConfig?.shiftConfig;
+    const defaultTimezone = dashboardConfig?.dateTimeConfig?.defaultTimezone || "UTC";
+    if (!passedShiftConfig) {
+      console.warn("[workspaceHealthService.calculateWorkspaceUptime] \u26A0\uFE0F No shiftConfig passed! Falling back to static config. This may cause incorrect shift_id queries.");
+    }
+    const shiftConfig = passedShiftConfig || dashboardConfig?.shiftConfig;
+    const effectiveTimezone = timezone || shiftConfig?.timezone || defaultTimezone;
     const {
       shiftId,
       date,
       shiftStartDate,
       completedMinutes
-    } = this.getShiftTiming(timezone, shiftConfig);
+    } = this.getShiftTiming(effectiveTimezone, shiftConfig);
     const tableName = `performance_metrics_${companyId.replace(/-/g, "_")}`;
     try {
       const { data: queryData, error } = await supabase.from(tableName).select("workspace_id, workspace_display_name, output_hourly, output_array").eq("date", date).eq("shift_id", shiftId);
@@ -2629,7 +2732,7 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
             minuteDate,
             outputHourly,
             outputArray,
-            timezone
+            effectiveTimezone
           );
           if (status === "down") {
             currentDownRun += 1;
@@ -4300,7 +4403,7 @@ var useAudioService = () => {
 // src/lib/utils/dateShiftUtils.ts
 function isValidShiftId(shiftId) {
   const id3 = typeof shiftId === "string" ? parseInt(shiftId, 10) : shiftId;
-  return id3 === 0 || id3 === 1;
+  return Number.isFinite(id3) && id3 >= 0;
 }
 var getSupabaseClient = () => {
   const url = process.env.NEXT_PUBLIC_SUPABASE_URL;
@@ -6832,11 +6935,12 @@ var useMetrics = (tableName, options) => {
   };
   return { data, isLoading, error, refetch };
 };
-var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
+var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId, options) => {
   const entityConfig = useEntityConfig();
   const databaseConfig = useDatabaseConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const staticShiftConfig = useShiftConfig();
+  const shiftConfig = options?.shiftConfig || staticShiftConfig;
   const workspaceConfig = useWorkspaceConfig();
   const supabase = useSupabase();
   const [metrics2, setMetrics] = React23.useState(null);
@@ -6849,11 +6953,12 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
   const companyId = entityConfig.companyId || "";
   const metricsTablePrefix = getMetricsTablePrefix();
   const metricsTable = `${metricsTablePrefix}_${companyId.replace(/-/g, "_")}`;
-  const defaultTimezone = dateTimeConfig.defaultTimezone;
+  const appTimezone = useAppTimezone();
+  const defaultTimezone = appTimezone || dateTimeConfig.defaultTimezone || "UTC";
   const workspaceMetricsBaseTable = databaseConfig.tables?.workspaces ?? "workspace_metrics";
   const workspaceActionsTable = databaseConfig.tables?.actions ?? "workspace_actions";
   const fetchMetrics = React23.useCallback(async () => {
-    if (!workspaceId || isFetchingRef.current) return;
+    if (!workspaceId || isFetchingRef.current || options?.enabled === false) return;
     try {
       isFetchingRef.current = true;
       const currentShift = getCurrentShift(defaultTimezone, shiftConfig);
@@ -6890,6 +6995,16 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
         throw new Error(`Invalid JSON response from backend. Received: ${responseText.substring(0, 100)}...`);
       }
       const data = backendData.metrics;
+      if (data && options?.shiftConfig) {
+        const dynamicShiftName = getShiftNameById(
+          data.shift_id,
+          appTimezone || "Asia/Kolkata",
+          // Fallback timezone
+          options.shiftConfig
+        );
+        data.shift_type = dynamicShiftName;
+        console.log(`[useWorkspaceDetailedMetrics] Overriding shift name for ID ${data.shift_id}: ${dynamicShiftName}`);
+      }
       if (!data && !date && shiftId === void 0) {
         console.log("[useWorkspaceDetailedMetrics] No data found for current date/shift, attempting to find most recent data...");
         const fallbackResponse = await fetch(
@@ -7335,7 +7450,7 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
       updateQueueRef.current = false;
       setIsLoading(false);
     }
-  }, [supabase, workspaceId, date, shiftId, metricsTable, defaultTimezone, shiftConfig, workspaceConfig, companyId]);
+  }, [supabase, workspaceId, date, shiftId, metricsTable, defaultTimezone, shiftConfig, workspaceConfig, companyId, options?.enabled]);
   const queueUpdate = React23.useCallback(() => {
     if (!workspaceId || updateQueueRef.current) return;
     updateQueueRef.current = true;
@@ -7368,7 +7483,7 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
       return;
     }
     const channels = [];
-    const operationalDate = date || getOperationalDate(defaultTimezone || "UTC");
+    const operationalDate = date || getOperationalDate(defaultTimezone);
     const currentShift = getCurrentShift(defaultTimezone, shiftConfig);
     const queryShiftId = shiftId ?? currentShift.shiftId;
     const metricsChannel = supabase.channel(`workspace-metrics-${workspaceId}`).on(
@@ -7467,11 +7582,170 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
     // Force refresh without cache
   };
 };
+var useLineShiftConfig = (lineId, fallbackConfig) => {
+  const [shiftConfig, setShiftConfig] = React23.useState(fallbackConfig || null);
+  const [isLoading, setIsLoading] = React23.useState(true);
+  const [error, setError] = React23.useState(null);
+  const supabase = useSupabase();
+  React23.useEffect(() => {
+    if (!lineId || lineId === "factory" || lineId === "all") {
+      setShiftConfig(fallbackConfig || null);
+      setIsLoading(false);
+      return;
+    }
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (!uuidRegex.test(lineId)) {
+      console.warn(`[useShiftConfig] Invalid line ID format: ${lineId}, using fallback`);
+      setShiftConfig(fallbackConfig || null);
+      setIsLoading(false);
+      return;
+    }
+    let mounted = true;
+    const calculateBreakDuration2 = (startTime, endTime) => {
+      const [sh, sm] = startTime.split(":").map(Number);
+      const [eh, em] = endTime.split(":").map(Number);
+      let startMinutes = sh * 60 + sm;
+      let endMinutes = eh * 60 + em;
+      if (endMinutes < startMinutes) {
+        endMinutes += 24 * 60;
+      }
+      return endMinutes - startMinutes;
+    };
+    const fetchShiftConfig = async () => {
+      try {
+        setIsLoading(true);
+        setError(null);
+        console.log(`[useLineShiftConfig] \u{1F50D} Fetching shift config for line: ${lineId}`);
+        const { data: shiftsData, error: shiftsError } = await supabase.from("line_operating_hours").select("shift_id, shift_name, start_time, end_time, breaks, timezone").eq("line_id", lineId);
+        if (shiftsError) {
+          console.error(`[useLineShiftConfig] \u274C Error fetching shifts:`, shiftsError);
+          throw new Error(`Failed to fetch shift config: ${shiftsError.message}`);
+        }
+        if (!shiftsData || shiftsData.length === 0) {
+          console.warn(`[useLineShiftConfig] \u26A0\uFE0F No shift config found for line ${lineId}, using fallback`);
+          if (mounted) {
+            setShiftConfig(fallbackConfig || null);
+            setIsLoading(false);
+          }
+          return;
+        }
+        const stripSeconds = (timeStr) => {
+          if (!timeStr) return timeStr;
+          return timeStr.substring(0, 5);
+        };
+        const mapped = shiftsData.map((shift) => ({
+          shiftId: shift.shift_id,
+          shiftName: shift.shift_name || `Shift ${shift.shift_id}`,
+          startTime: stripSeconds(shift.start_time),
+          endTime: stripSeconds(shift.end_time),
+          breaks: Array.isArray(shift.breaks) ? shift.breaks.map((b) => ({
+            startTime: b.start || b.startTime || "00:00",
+            endTime: b.end || b.endTime || "00:00",
+            duration: calculateBreakDuration2(
+              b.start || b.startTime || "00:00",
+              b.end || b.endTime || "00:00"
+            ),
+            remarks: b.remarks || b.name || ""
+          })) : [],
+          timezone: shift.timezone
+        }));
+        const day = mapped.find((s) => s.shiftId === 0);
+        const night = mapped.find((s) => s.shiftId === 1);
+        const config = {
+          shifts: mapped,
+          timezone: mapped[0]?.timezone,
+          dayShift: day ? { id: day.shiftId, startTime: day.startTime, endTime: day.endTime, name: day.shiftName } : fallbackConfig?.dayShift,
+          nightShift: night ? { id: night.shiftId, startTime: night.startTime, endTime: night.endTime, name: night.shiftName } : fallbackConfig?.nightShift,
+          transitionPeriodMinutes: fallbackConfig?.transitionPeriodMinutes || 0
+        };
+        console.log(`[useLineShiftConfig] \u2705 Built config from DB:`, config);
+        if (mounted) {
+          setShiftConfig(config);
+          setIsLoading(false);
+        }
+      } catch (err) {
+        console.error("[useShiftConfig] Error fetching shift config:", err);
+        if (mounted) {
+          setError(err instanceof Error ? err.message : "Unknown error occurred");
+          setShiftConfig(fallbackConfig || null);
+          setIsLoading(false);
+        }
+      }
+    };
+    fetchShiftConfig();
+    const subscription = supabase.channel(`shift_config_${lineId}`).on(
+      "postgres_changes",
+      {
+        event: "*",
+        // Listen to all events (INSERT, UPDATE, DELETE)
+        schema: "public",
+        table: "line_operating_hours",
+        filter: `line_id=eq.${lineId}`
+      },
+      (payload) => {
+        console.log("[useShiftConfig] Real-time update received:", payload);
+        fetchShiftConfig();
+      }
+    ).subscribe();
+    return () => {
+      mounted = false;
+      subscription.unsubscribe();
+    };
+  }, [lineId, supabase]);
+  return {
+    shiftConfig,
+    isLoading,
+    error
+  };
+};
+
+// src/lib/hooks/useDynamicShiftConfig.ts
+var useDynamicShiftConfig = (lineId) => {
+  const staticShiftConfig = useShiftConfig();
+  const { shiftConfig: dbShiftConfig, isLoading, error } = useLineShiftConfig(lineId, staticShiftConfig);
+  const result = React23.useMemo(() => {
+    console.log(`[useDynamicShiftConfig] \u{1F504} Computing result for lineId: ${lineId}`, {
+      isLoading,
+      hasDbConfig: !!dbShiftConfig,
+      error
+    });
+    if (isLoading) {
+      console.log(`[useDynamicShiftConfig] \u23F3 Still loading, returning null (DO NOT USE until loaded)`);
+      return {
+        shiftConfig: null,
+        isLoading: true,
+        error: null,
+        isFromDatabase: false
+      };
+    }
+    if (dbShiftConfig) {
+      console.log(`[useDynamicShiftConfig] \u2705 Using DB config:`, dbShiftConfig);
+      return {
+        shiftConfig: dbShiftConfig,
+        isLoading: false,
+        error,
+        isFromDatabase: true
+      };
+    }
+    console.log(`[useDynamicShiftConfig] \u26A0\uFE0F No DB config found, falling back to static config`);
+    return {
+      shiftConfig: staticShiftConfig,
+      isLoading: false,
+      error,
+      isFromDatabase: false
+    };
+  }, [dbShiftConfig, staticShiftConfig, isLoading, error, lineId]);
+  return result;
+};
+
+// src/lib/hooks/useLineWorkspaceMetrics.ts
 var useLineWorkspaceMetrics = (lineId, options) => {
   const entityConfig = useEntityConfig();
   const databaseConfig = useDatabaseConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const staticShiftConfig = useShiftConfig();
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
+  const shiftConfig = dynamicShiftConfig || staticShiftConfig;
   const timezone = useAppTimezone();
   const supabase = useSupabase();
   const [workspaces, setWorkspaces] = React23.useState([]);
@@ -7479,12 +7753,10 @@ var useLineWorkspaceMetrics = (lineId, options) => {
   const [error, setError] = React23.useState(null);
   const [initialized, setInitialized] = React23.useState(false);
   const queryShiftId = React23.useMemo(() => {
-    const currentShift = getCurrentShift(
-      dateTimeConfig.defaultTimezone || "Asia/Kolkata",
-      shiftConfig
-    );
+    const effectiveTimezone = timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata";
+    const currentShift = getCurrentShift(effectiveTimezone, shiftConfig);
     return options?.initialShiftId !== void 0 ? options.initialShiftId : currentShift.shiftId;
-  }, [options?.initialShiftId, dateTimeConfig.defaultTimezone, shiftConfig]);
+  }, [options?.initialShiftId, timezone, dateTimeConfig.defaultTimezone, shiftConfig]);
   const queryDate = React23.useMemo(() => {
     return options?.initialDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
   }, [options?.initialDate, timezone, dateTimeConfig.defaultTimezone]);
@@ -7496,7 +7768,7 @@ var useLineWorkspaceMetrics = (lineId, options) => {
   }, [entityConfig.companyId]);
   const schema = databaseConfig.schema ?? "public";
   const fetchWorkspaceMetrics = React23.useCallback(async () => {
-    if (!lineId) return;
+    if (!lineId || options?.enabled === false || isShiftConfigLoading) return;
     if (!initialized) {
       setLoading(true);
     }
@@ -7553,7 +7825,7 @@ var useLineWorkspaceMetrics = (lineId, options) => {
     } finally {
       setLoading(false);
     }
-  }, [lineId, queryDate, queryShiftId, metricsTable, supabase, entityConfig.companyId]);
+  }, [lineId, queryDate, queryShiftId, metricsTable, supabase, entityConfig.companyId, options?.enabled, isShiftConfigLoading]);
   React23.useEffect(() => {
     if (!initialized) {
       fetchWorkspaceMetrics();
@@ -7583,25 +7855,26 @@ var useLineWorkspaceMetrics = (lineId, options) => {
         supabase.removeChannel(channel);
       }
     };
-  }, [lineId, queryDate, queryShiftId, metricsTable, fetchWorkspaceMetrics, initialized, supabase, schema]);
+  }, [lineId, queryDate, queryShiftId, metricsTable, fetchWorkspaceMetrics, initialized, supabase, schema, isShiftConfigLoading]);
   React23.useEffect(() => {
     setInitialized(false);
-  }, [lineId, queryDate, queryShiftId]);
+  }, [lineId, queryDate, queryShiftId, isShiftConfigLoading]);
   const refreshWorkspaces = fetchWorkspaceMetrics;
   return React23.useMemo(
     () => ({ workspaces, loading, error, refreshWorkspaces }),
     [workspaces, loading, error, refreshWorkspaces]
   );
 };
-var useHistoricWorkspaceMetrics = (workspaceId, date, shiftId) => {
+var useHistoricWorkspaceMetrics = (workspaceId, date, shiftId, options) => {
   const supabase = useSupabase();
   const entityConfig = useEntityConfig();
+  const timezone = useAppTimezone();
   const [metrics2, setMetrics] = React23.useState(null);
   const [isLoading, setIsLoading] = React23.useState(true);
   const [error, setError] = React23.useState(null);
   const isFetchingRef = React23.useRef(false);
   const fetchMetrics = React23.useCallback(async () => {
-    if (!supabase || !workspaceId || !date || isFetchingRef.current) return;
+    if (!supabase || !workspaceId || !date || isFetchingRef.current || options?.enabled === false) return;
     try {
       isFetchingRef.current = true;
       setIsLoading(true);
@@ -7635,7 +7908,18 @@ var useHistoricWorkspaceMetrics = (workspaceId, date, shiftId) => {
         throw new Error(`Backend API error (${response.status}): ${errorText}`);
       }
       const data = await response.json();
-      setMetrics(data.metrics || null);
+      const fetchedMetrics = data.metrics;
+      if (fetchedMetrics && options?.shiftConfig) {
+        const dynamicShiftName = getShiftNameById(
+          fetchedMetrics.shift_id,
+          timezone || "Asia/Kolkata",
+          // Fallback timezone
+          options.shiftConfig
+        );
+        fetchedMetrics.shift_type = dynamicShiftName;
+        console.log(`[useHistoricWorkspaceMetrics] Overriding shift name for ID ${fetchedMetrics.shift_id}: ${dynamicShiftName}`);
+      }
+      setMetrics(fetchedMetrics || null);
     } catch (err) {
       console.error("[useHistoricWorkspaceMetrics] Error fetching historic metrics:", err);
       setError({ message: err.message, code: err.code || "FETCH_ERROR" });
@@ -7644,7 +7928,7 @@ var useHistoricWorkspaceMetrics = (workspaceId, date, shiftId) => {
       setIsLoading(false);
       isFetchingRef.current = false;
     }
-  }, [supabase, workspaceId, date, shiftId, entityConfig.companyId]);
+  }, [supabase, workspaceId, date, shiftId, entityConfig.companyId, options?.shiftConfig, timezone, options?.enabled]);
   React23.useEffect(() => {
     fetchMetrics();
   }, [fetchMetrics]);
@@ -7659,8 +7943,11 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
   const entityConfig = useEntityConfig();
   const databaseConfig = useDatabaseConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const staticShiftConfig = useShiftConfig();
   const supabase = useSupabase();
+  const lineIdForShiftConfig = lineIdFromProp === "factory" ? getConfiguredLineIds(entityConfig)[0] : lineIdFromProp;
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineIdForShiftConfig);
+  const shiftConfig = dynamicShiftConfig || staticShiftConfig;
   const [lineData, setLineData] = React23.useState(null);
   const [loading, setLoading] = React23.useState(true);
   const [error, setError] = React23.useState(null);
@@ -7699,8 +7986,10 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
     }
   }, [dashboardService, lineIdToUse, defaultTimezone, shiftConfig, entityConfig]);
   React23.useEffect(() => {
-    if (!supabase || !lineIdToUse || !entityConfig.companyId) {
-      setLoading(false);
+    if (!supabase || !lineIdToUse || !entityConfig.companyId || isShiftConfigLoading) {
+      if (!isShiftConfigLoading) {
+        setLoading(false);
+      }
       if (!entityConfig.companyId && (!error || error.code !== "SERVICE_ERROR")) {
         setError({ message: "Company ID not configured for metrics subscription.", code: "CONFIG_ERROR" });
       }
@@ -7765,7 +8054,7 @@ var useLineDetailedMetrics = (lineIdFromProp) => {
         channelRef.current = null;
       }
     };
-  }, [supabase, lineIdToUse, fetchData, schema, lineMetricsTable, entityConfig, defaultTimezone, shiftConfig, error]);
+  }, [supabase, lineIdToUse, fetchData, schema, lineMetricsTable, entityConfig, defaultTimezone, shiftConfig, isShiftConfigLoading, error]);
   return {
     lineData,
     // This now contains both metrics and line details via LineInfo type
@@ -7778,14 +8067,20 @@ var useLeaderboardMetrics = (date, shiftId, limit = 10, filter2 = "all") => {
   const supabase = useSupabase();
   const entityConfig = useEntityConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const staticShiftConfig = useShiftConfig();
+  const firstLineId = React23.useMemo(() => {
+    const lineIds = getConfiguredLineIds(entityConfig);
+    return lineIds[0];
+  }, [entityConfig]);
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(firstLineId);
+  const shiftConfig = dynamicShiftConfig || staticShiftConfig;
   const [leaderboard, setLeaderboard] = React23.useState([]);
   const [isLoading, setIsLoading] = React23.useState(true);
   const [error, setError] = React23.useState(null);
   const isFetchingRef = React23.useRef(false);
   const defaultTimezone = dateTimeConfig.defaultTimezone || "UTC";
   const fetchLeaderboard = React23.useCallback(async () => {
-    if (!supabase || isFetchingRef.current) return;
+    if (!supabase || isFetchingRef.current || isShiftConfigLoading) return;
     try {
       isFetchingRef.current = true;
       setIsLoading(true);
@@ -7831,7 +8126,7 @@ var useLeaderboardMetrics = (date, shiftId, limit = 10, filter2 = "all") => {
       setIsLoading(false);
       isFetchingRef.current = false;
     }
-  }, [supabase, date, shiftId, limit, filter2, entityConfig.companyId, defaultTimezone, shiftConfig]);
+  }, [supabase, date, shiftId, limit, filter2, entityConfig.companyId, defaultTimezone, shiftConfig, isShiftConfigLoading]);
   React23.useEffect(() => {
     fetchLeaderboard();
   }, [fetchLeaderboard]);
@@ -7847,8 +8142,22 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
   const entityConfig = useEntityConfig();
   const databaseConfig = useDatabaseConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
-  const defaultTimezone = dateTimeConfig?.defaultTimezone || "UTC";
+  const isFactoryView = lineId === (entityConfig.factoryViewId || "factory");
+  const firstLineId = React23.useMemo(() => {
+    const configuredLineIds = getConfiguredLineIds(entityConfig);
+    return configuredLineIds.length > 0 ? configuredLineIds[0] : void 0;
+  }, [entityConfig]);
+  const lineIdForShiftConfig = isFactoryView ? firstLineId : lineId;
+  const { shiftConfig, isLoading: shiftLoading, isFromDatabase } = useDynamicShiftConfig(lineIdForShiftConfig);
+  console.log(`[useDashboardMetrics] \u{1F3AF} Shift config for line ${lineId}:`, {
+    isFactoryView,
+    lineIdForShiftConfig,
+    firstLineId,
+    isFromDatabase,
+    shiftConfig: shiftConfig ? { shifts: shiftConfig.shifts?.length, timezone: shiftConfig.timezone } : null
+  });
+  const appTimezone = useAppTimezone();
+  const defaultTimezone = appTimezone || dateTimeConfig?.defaultTimezone || "UTC";
   const configuredLineMetricsTable = databaseConfig?.tables?.lineMetrics ?? "line_metrics";
   const schema = databaseConfig?.schema ?? "public";
   const supabase = useSupabase();
@@ -7874,8 +8183,8 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
   const fetchAllMetrics = React23.useCallback(async () => {
     const currentLineIdToUse = lineIdRef.current;
     console.log("[useDashboardMetrics] Fetching from backend API. lineId:", currentLineIdToUse);
-    if (!currentLineIdToUse || !supabase || isFetchingRef.current || companySpecificMetricsTable.includes("unknown_company")) {
-      if (!metrics2?.workspaceMetrics?.length && !metrics2?.lineMetrics?.length) setIsLoading(false);
+    if (!currentLineIdToUse || !supabase || isFetchingRef.current || shiftLoading || companySpecificMetricsTable.includes("unknown_company")) {
+      if (!metrics2?.workspaceMetrics?.length && !metrics2?.lineMetrics?.length && !shiftLoading) setIsLoading(false);
       if (companySpecificMetricsTable.includes("unknown_company") && !error) {
         setError({ message: "Company ID not configured for metrics table.", code: "CONFIG_ERROR" });
       }
@@ -7894,7 +8203,7 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
       if (targetLineIds.length === 0) {
         throw new Error("No target line IDs available for fetching metrics.");
       }
-      const isFactoryView = currentLineIdToUse === (entityConfig.factoryViewId || "factory");
+      const isFactoryView2 = currentLineIdToUse === (entityConfig.factoryViewId || "factory");
       const { data: { session } } = await supabase.auth.getSession();
       console.log("[useDashboardMetrics] Session check:", {
         hasSession: !!session,
@@ -7908,7 +8217,7 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
       if (!apiUrl) {
         throw new Error("Backend URL is not configured. Please set NEXT_PUBLIC_BACKEND_URL in your environment.");
       }
-      const lineIdsParam = isFactoryView ? `line_ids=${targetLineIds.join(",")}` : `line_id=${targetLineIds[0]}`;
+      const lineIdsParam = isFactoryView2 ? `line_ids=${targetLineIds.join(",")}` : `line_id=${targetLineIds[0]}`;
       const url = `${apiUrl}/api/dashboard/metrics?${lineIdsParam}&date=${operationalDate}&shift_id=${currentShiftDetails.shiftId}&company_id=${entityConfig.companyId}`;
       console.log("[useDashboardMetrics] Calling backend API:", {
         url,
@@ -7987,8 +8296,10 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
     metrics2?.lineMetrics?.length || 0,
     companySpecificMetricsTable,
     entityConfig,
+    appTimezone,
     defaultTimezone,
-    shiftConfig
+    shiftConfig,
+    shiftLoading
   ]);
   const fetchAllMetricsRef = React23.useRef(fetchAllMetrics);
   React23.useEffect(() => {
@@ -8002,10 +8313,10 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
     fetchAllMetricsRef.current();
   }, [supabase]);
   React23.useEffect(() => {
-    if (lineId && supabase) {
+    if (lineId && supabase && !shiftLoading) {
       fetchAllMetrics();
     }
-  }, [lineId, supabase, fetchAllMetrics]);
+  }, [lineId, supabase, fetchAllMetrics, shiftLoading]);
   React23.useEffect(() => {
     const currentLineIdToUse = lineIdRef.current;
     if (!currentLineIdToUse || !supabase || companySpecificMetricsTable.includes("unknown_company") || !entityConfig.companyId) {
@@ -8050,7 +8361,9 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
     schema,
     entityConfig?.companyId,
     entityConfig?.factoryViewId,
+    appTimezone,
     defaultTimezone,
+    shiftConfig,
     lineId,
     userAccessibleLineIds
   ]);
@@ -8062,145 +8375,7 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
     refetch: fetchAllMetrics
   };
 };
-var useLineShiftConfig = (lineId, fallbackConfig) => {
-  const [shiftConfig, setShiftConfig] = React23.useState(fallbackConfig || null);
-  const [isLoading, setIsLoading] = React23.useState(true);
-  const [error, setError] = React23.useState(null);
-  const supabase = useSupabase();
-  React23.useEffect(() => {
-    if (!lineId || lineId === "factory" || lineId === "all") {
-      setShiftConfig(fallbackConfig || null);
-      setIsLoading(false);
-      return;
-    }
-    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    if (!uuidRegex.test(lineId)) {
-      console.warn(`[useShiftConfig] Invalid line ID format: ${lineId}, using fallback`);
-      setShiftConfig(fallbackConfig || null);
-      setIsLoading(false);
-      return;
-    }
-    let mounted = true;
-    const fetchShiftConfig = async () => {
-      try {
-        setIsLoading(true);
-        setError(null);
-        console.log(`[useLineShiftConfig] \u{1F50D} Fetching shift config for line: ${lineId}`);
-        const { data: dayShift, error: dayError } = await supabase.from("line_operating_hours").select("start_time, end_time, breaks").eq("line_id", lineId).eq("shift_id", 0).maybeSingle();
-        const { data: nightShift, error: nightError } = await supabase.from("line_operating_hours").select("start_time, end_time, breaks").eq("line_id", lineId).eq("shift_id", 1).maybeSingle();
-        console.log(`[useLineShiftConfig] \u{1F4CA} Day shift data:`, dayShift);
-        console.log(`[useLineShiftConfig] \u{1F319} Night shift data:`, nightShift);
-        if (dayError || nightError) {
-          console.error(`[useLineShiftConfig] \u274C Error fetching:`, { dayError, nightError });
-          throw new Error(`Failed to fetch shift config: ${dayError?.message || nightError?.message}`);
-        }
-        if (!dayShift && !nightShift) {
-          console.warn(`[useLineShiftConfig] \u26A0\uFE0F No shift config found for line ${lineId}, using fallback`);
-          if (mounted) {
-            setShiftConfig(fallbackConfig || null);
-            setIsLoading(false);
-          }
-          return;
-        }
-        const stripSeconds = (timeStr) => {
-          if (!timeStr) return timeStr;
-          return timeStr.substring(0, 5);
-        };
-        const config = {
-          dayShift: dayShift ? {
-            id: 0,
-            startTime: stripSeconds(dayShift.start_time),
-            endTime: stripSeconds(dayShift.end_time)
-          } : fallbackConfig?.dayShift || { id: 0, startTime: "06:00", endTime: "18:00" },
-          nightShift: nightShift ? {
-            id: 1,
-            startTime: stripSeconds(nightShift.start_time),
-            endTime: stripSeconds(nightShift.end_time)
-          } : fallbackConfig?.nightShift || { id: 1, startTime: "18:00", endTime: "06:00" },
-          transitionPeriodMinutes: fallbackConfig?.transitionPeriodMinutes || 0
-        };
-        console.log(`[useLineShiftConfig] \u2705 Built config from DB:`, config);
-        if (mounted) {
-          setShiftConfig(config);
-          setIsLoading(false);
-        }
-      } catch (err) {
-        console.error("[useShiftConfig] Error fetching shift config:", err);
-        if (mounted) {
-          setError(err instanceof Error ? err.message : "Unknown error occurred");
-          setShiftConfig(fallbackConfig || null);
-          setIsLoading(false);
-        }
-      }
-    };
-    fetchShiftConfig();
-    const subscription = supabase.channel(`shift_config_${lineId}`).on(
-      "postgres_changes",
-      {
-        event: "*",
-        // Listen to all events (INSERT, UPDATE, DELETE)
-        schema: "public",
-        table: "line_operating_hours",
-        filter: `line_id=eq.${lineId}`
-      },
-      (payload) => {
-        console.log("[useShiftConfig] Real-time update received:", payload);
-        fetchShiftConfig();
-      }
-    ).subscribe();
-    return () => {
-      mounted = false;
-      subscription.unsubscribe();
-    };
-  }, [lineId, supabase]);
-  return {
-    shiftConfig,
-    isLoading,
-    error
-  };
-};
-
-// src/lib/hooks/useDynamicShiftConfig.ts
-var useDynamicShiftConfig = (lineId) => {
-  const staticShiftConfig = useShiftConfig();
-  const { shiftConfig: dbShiftConfig, isLoading, error } = useLineShiftConfig(lineId, staticShiftConfig);
-  const result = React23.useMemo(() => {
-    console.log(`[useDynamicShiftConfig] \u{1F504} Computing result for lineId: ${lineId}`, {
-      isLoading,
-      hasDbConfig: !!dbShiftConfig,
-      error
-    });
-    if (isLoading) {
-      console.log(`[useDynamicShiftConfig] \u23F3 Still loading, using static config temporarily`);
-      return {
-        shiftConfig: staticShiftConfig,
-        isLoading: true,
-        error: null,
-        isFromDatabase: false
-      };
-    }
-    if (dbShiftConfig) {
-      console.log(`[useDynamicShiftConfig] \u2705 Using DB config:`, dbShiftConfig);
-      return {
-        shiftConfig: dbShiftConfig,
-        isLoading: false,
-        error,
-        isFromDatabase: true
-      };
-    }
-    console.log(`[useDynamicShiftConfig] \u26A0\uFE0F Falling back to static config`);
-    return {
-      shiftConfig: staticShiftConfig,
-      isLoading: false,
-      error,
-      isFromDatabase: false
-    };
-  }, [dbShiftConfig, staticShiftConfig, isLoading, error, lineId]);
-  return result;
-};
-
-// src/lib/hooks/useLineKPIs.ts
-var useLineKPIs = ({ lineId }) => {
+var useLineKPIs = ({ lineId, enabled }) => {
   useDashboardConfig();
   const entityConfig = useEntityConfig();
   const isFactoryView = lineId === (entityConfig.factoryViewId || "factory");
@@ -8212,7 +8387,7 @@ var useLineKPIs = ({ lineId }) => {
     return configuredLineIds.length > 0 ? configuredLineIds[0] : void 0;
   }, [entityConfig]);
   const lineIdForShiftConfig = isFactoryView ? firstLineId : lineId;
-  const { shiftConfig: dynamicShiftConfig, isFromDatabase } = useDynamicShiftConfig(lineIdForShiftConfig);
+  const { shiftConfig: dynamicShiftConfig, isFromDatabase, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineIdForShiftConfig);
   const shiftConfig = dynamicShiftConfig;
   console.log(`[useLineKPIs] \u{1F3AF} Shift config for line ${lineId}:`, {
     isFactoryView,
@@ -8233,7 +8408,8 @@ var useLineKPIs = ({ lineId }) => {
   const updateQueueRef = React23.useRef(false);
   const updateTimeoutRef = React23.useRef(null);
   const queueUpdateRef = React23.useRef(void 0);
-  const defaultTimezone = dateTimeConfig.defaultTimezone;
+  const appTimezone = useAppTimezone();
+  const timezone = appTimezone || dateTimeConfig.defaultTimezone || "UTC";
   const schema = databaseConfig.schema ?? "public";
   const lineMetricsTable = databaseConfig.tables?.lineMetrics ?? "line_metrics";
   const companySpecificMetricsTable = React23.useMemo(
@@ -8245,14 +8421,14 @@ var useLineKPIs = ({ lineId }) => {
   }, [lineId]);
   const fetchKPIs = React23.useCallback(async () => {
     const currentLineId = lineIdRef.current;
-    if (!currentLineId || isFetchingRef.current) {
+    if (!currentLineId || isFetchingRef.current || enabled === false || isShiftConfigLoading) {
       return;
     }
     isFetchingRef.current = true;
     setIsLoading(true);
     setError(null);
     try {
-      const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
+      const currentShiftDetails = getCurrentShift(timezone, shiftConfig ?? void 0);
       const operationalDate = currentShiftDetails.date;
       const { data: { session } } = await supabase.auth.getSession();
       if (!session?.access_token) {
@@ -8301,7 +8477,7 @@ var useLineKPIs = ({ lineId }) => {
       isFetchingRef.current = false;
       updateQueueRef.current = false;
     }
-  }, [defaultTimezone, shiftConfig, entityConfig, supabase]);
+  }, [timezone, shiftConfig, entityConfig, supabase, enabled, isShiftConfigLoading]);
   const queueUpdate = React23.useCallback(() => {
     if (updateTimeoutRef.current) {
       clearTimeout(updateTimeoutRef.current);
@@ -8321,7 +8497,7 @@ var useLineKPIs = ({ lineId }) => {
       return;
     }
     fetchKPIs();
-    const currentShiftDetails = getCurrentShift(defaultTimezone);
+    const currentShiftDetails = getCurrentShift(timezone, shiftConfig ?? void 0);
     const operationalDate = currentShiftDetails.date;
     const factoryViewIdentifier = entityConfig.factoryViewId || "factory";
     const targetLineIds = currentLineId === factoryViewIdentifier ? getConfiguredLineIds(entityConfig) : [currentLineId];
@@ -8374,7 +8550,7 @@ var useLineKPIs = ({ lineId }) => {
         clearTimeout(updateTimeoutRef.current);
       }
     };
-  }, [lineId, supabase, entityConfig, schema, lineMetricsTable, companySpecificMetricsTable, defaultTimezone, shiftConfig]);
+  }, [lineId, supabase, entityConfig, schema, lineMetricsTable, companySpecificMetricsTable, timezone, shiftConfig, isShiftConfigLoading]);
   return {
     kpis,
     isLoading,
@@ -8386,15 +8562,17 @@ var useRealtimeLineMetrics = ({
   lineId,
   date: urlDate,
   shiftId: urlShiftId,
-  onMetricsUpdate
+  onMetricsUpdate,
+  enabled
 }) => {
   const supabase = useSupabase();
   const entityConfig = useEntityConfig();
   useDatabaseConfig();
   const dateTimeConfig = useDateTimeConfig();
-  useShiftConfig();
-  const { shiftConfig: dynamicShiftConfig } = useDynamicShiftConfig(lineId);
-  const shiftConfig = dynamicShiftConfig;
+  const staticShiftConfig = useShiftConfig();
+  const timezone = useAppTimezone();
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
+  const shiftConfig = dynamicShiftConfig || staticShiftConfig;
   const [metrics2, setMetrics] = React23.useState(null);
   const [lineDetails, setLineDetails] = React23.useState(null);
   const [loading, setLoading] = React23.useState(true);
@@ -8405,16 +8583,16 @@ var useRealtimeLineMetrics = ({
   const isFetchingRef = React23.useRef(false);
   const channelsRef = React23.useRef([]);
   const fetchTimeoutRef = React23.useRef(null);
-  const currentShift = React23.useMemo(() => getCurrentShift(dateTimeConfig.defaultTimezone || "Asia/Kolkata", shiftConfig), [dateTimeConfig.defaultTimezone, shiftConfig]);
+  const effectiveTimezone = timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata";
+  const currentShift = React23.useMemo(() => getCurrentShift(effectiveTimezone, shiftConfig), [effectiveTimezone, shiftConfig]);
   const shiftId = React23.useMemo(
     () => urlShiftId !== void 0 ? urlShiftId : currentShift.shiftId,
     [urlShiftId, currentShift.shiftId]
   );
-  const timezone = useAppTimezone();
-  const date = React23.useMemo(() => urlDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC"), [urlDate, timezone, dateTimeConfig.defaultTimezone]);
+  const date = React23.useMemo(() => urlDate || getOperationalDate(effectiveTimezone), [urlDate, effectiveTimezone]);
   const fetchData = React23.useCallback(async () => {
     try {
-      if (!lineIdRef.current || isFetchingRef.current) return;
+      if (!lineIdRef.current || isFetchingRef.current || enabled === false) return;
       isFetchingRef.current = true;
       if (!initialized) {
         setLoading(true);
@@ -8612,7 +8790,7 @@ var useRealtimeLineMetrics = ({
       updateQueueRef.current = false;
       isFetchingRef.current = false;
     }
-  }, [supabase, date, shiftId, urlShiftId, onMetricsUpdate, entityConfig, dateTimeConfig.defaultTimezone]);
+  }, [supabase, date, shiftId, urlShiftId, onMetricsUpdate, entityConfig, dateTimeConfig.defaultTimezone, enabled, shiftConfig]);
   const queueUpdate = React23.useCallback(() => {
     console.log("[useRealtimeLineMetrics] Update queued, debouncing...");
     if (fetchTimeoutRef.current) {
@@ -8694,13 +8872,27 @@ var useRealtimeLineMetrics = ({
     });
     channelsRef.current = [lineMetricsChannel, metricsChannel];
   }, [supabase, queueUpdate, urlDate, shiftId, entityConfig, dateTimeConfig.defaultTimezone]);
+  const prevShiftIdRef = React23.useRef(void 0);
   React23.useEffect(() => {
     if (!lineId) return;
     lineIdRef.current = lineId;
-    if (!initialized) {
+    const shouldFetch = !initialized && (!isShiftConfigLoading || enabled === false);
+    const shiftIdChanged = prevShiftIdRef.current !== void 0 && prevShiftIdRef.current !== shiftId && !isShiftConfigLoading;
+    if (shouldFetch || shiftIdChanged) {
+      console.log("[useRealtimeLineMetrics] Fetching data:", {
+        initialized,
+        isShiftConfigLoading,
+        enabled,
+        shiftIdChanged,
+        prevShiftId: prevShiftIdRef.current,
+        currentShiftId: shiftId
+      });
       fetchData();
     }
     setupSubscriptions();
+    if (!isShiftConfigLoading) {
+      prevShiftIdRef.current = shiftId;
+    }
     return () => {
       if (fetchTimeoutRef.current) {
         clearTimeout(fetchTimeoutRef.current);
@@ -8715,7 +8907,7 @@ var useRealtimeLineMetrics = ({
         });
       }
     };
-  }, [lineId, fetchData, setupSubscriptions, initialized, supabase]);
+  }, [lineId, fetchData, setupSubscriptions, initialized, supabase, isShiftConfigLoading, enabled, shiftId]);
   React23.useEffect(() => {
     setInitialized(false);
   }, [lineId, date, shiftId]);
@@ -9433,14 +9625,20 @@ var useFactoryOverviewMetrics = (date, shiftId) => {
   const supabase = useSupabase();
   const entityConfig = useEntityConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const staticShiftConfig = useShiftConfig();
+  const firstLineId = React23.useMemo(() => {
+    const lineIds = getConfiguredLineIds(entityConfig);
+    return lineIds[0];
+  }, [entityConfig]);
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(firstLineId);
+  const shiftConfig = dynamicShiftConfig || staticShiftConfig;
   const [metrics2, setMetrics] = React23.useState(null);
   const [isLoading, setIsLoading] = React23.useState(true);
   const [error, setError] = React23.useState(null);
   const isFetchingRef = React23.useRef(false);
   const defaultTimezone = dateTimeConfig.defaultTimezone || "UTC";
   const fetchMetrics = React23.useCallback(async () => {
-    if (!supabase || isFetchingRef.current) return;
+    if (!supabase || isFetchingRef.current || isShiftConfigLoading) return;
     try {
       isFetchingRef.current = true;
       setIsLoading(true);
@@ -9489,7 +9687,7 @@ var useFactoryOverviewMetrics = (date, shiftId) => {
       setIsLoading(false);
       isFetchingRef.current = false;
     }
-  }, [supabase, date, shiftId, entityConfig, defaultTimezone, shiftConfig]);
+  }, [supabase, date, shiftId, entityConfig, defaultTimezone, shiftConfig, isShiftConfigLoading]);
   React23.useEffect(() => {
     fetchMetrics();
   }, [fetchMetrics]);
@@ -9895,14 +10093,24 @@ var useActiveBreaks = (lineIds) => {
     }
     return { elapsedMinutes, remainingMinutes };
   };
-  const getCurrentShift2 = (currentMinutes, dayStart, nightStart) => {
-    const dayStartMinutes = parseTimeToMinutes2(dayStart);
-    const nightStartMinutes = parseTimeToMinutes2(nightStart);
-    if (nightStartMinutes < dayStartMinutes) {
-      return currentMinutes >= nightStartMinutes && currentMinutes < dayStartMinutes ? "night" : "day";
+  const isTimeInShift = (startTime, endTime, currentMinutes) => {
+    const startMinutes = parseTimeToMinutes2(startTime);
+    const endMinutes = parseTimeToMinutes2(endTime);
+    if (endMinutes < startMinutes) {
+      return currentMinutes >= startMinutes || currentMinutes < endMinutes;
     } else {
-      return currentMinutes >= dayStartMinutes && currentMinutes < nightStartMinutes ? "day" : "night";
+      return currentMinutes >= startMinutes && currentMinutes < endMinutes;
+    }
+  };
+  const findActiveShift = (shifts, currentMinutes) => {
+    for (const shift of shifts) {
+      const startTime = shift.start_time || "00:00";
+      const endTime = shift.end_time || "00:00";
+      if (isTimeInShift(startTime, endTime, currentMinutes)) {
+        return shift;
+      }
     }
+    return null;
   };
   const checkActiveBreaks = React23.useCallback(async () => {
     try {
@@ -9917,23 +10125,28 @@ var useActiveBreaks = (lineIds) => {
         return;
       }
       const currentMinutes = getCurrentTimeInMinutes();
-      const { data: dayShifts, error: dayError } = await supabase.from("line_operating_hours").select("line_id, start_time, end_time, breaks").eq("shift_id", 0).in("line_id", validLineIds);
-      const { data: nightShifts, error: nightError } = await supabase.from("line_operating_hours").select("line_id, start_time, end_time, breaks").eq("shift_id", 1).in("line_id", validLineIds);
-      if (dayError || nightError) {
+      const { data: allShifts, error: shiftsError } = await supabase.from("line_operating_hours").select("line_id, shift_id, shift_name, start_time, end_time, breaks").in("line_id", validLineIds).order("shift_id");
+      if (shiftsError) {
         throw new Error("Failed to fetch shift configurations");
       }
       const foundActiveBreaks = [];
+      const shiftsByLine = /* @__PURE__ */ new Map();
+      for (const shift of allShifts || []) {
+        const lineShifts = shiftsByLine.get(shift.line_id) || [];
+        lineShifts.push(shift);
+        shiftsByLine.set(shift.line_id, lineShifts);
+      }
       for (const lineId of validLineIds) {
-        const dayShift = dayShifts?.find((s) => s.line_id === lineId);
-        const nightShift = nightShifts?.find((s) => s.line_id === lineId);
-        if (!dayShift || !nightShift) continue;
-        const currentShift = getCurrentShift2(
-          currentMinutes,
-          dayShift.start_time || "06:00",
-          nightShift.start_time || "18:00"
-        );
-        const activeShift = currentShift === "day" ? dayShift : nightShift;
-        const shiftName = currentShift === "day" ? "Day Shift" : "Night Shift";
+        const lineShifts = shiftsByLine.get(lineId);
+        if (!lineShifts || lineShifts.length === 0) continue;
+        const activeShift = findActiveShift(lineShifts, currentMinutes);
+        if (!activeShift) continue;
+        const getDefaultShiftName = (shiftId) => {
+          if (shiftId === 0) return "Day Shift";
+          if (shiftId === 1) return "Night Shift";
+          return `Shift ${shiftId}`;
+        };
+        const shiftName = activeShift.shift_name || getDefaultShiftName(activeShift.shift_id);
         let breaks = [];
         if (activeShift.breaks) {
           if (Array.isArray(activeShift.breaks)) {
@@ -10008,8 +10221,12 @@ var useAllWorkspaceMetrics = (options) => {
   const entityConfig = useEntityConfig();
   const databaseConfig = useDatabaseConfig();
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const staticShiftConfig = useShiftConfig();
   const timezone = useAppTimezone();
+  const configuredLineIds = React23.useMemo(() => getConfiguredLineIds(entityConfig), [entityConfig]);
+  const representativeLineId = options?.allowedLineIds?.[0] || configuredLineIds[0];
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(representativeLineId);
+  const shiftConfig = dynamicShiftConfig || staticShiftConfig;
   const supabase = useSupabase();
   const [workspaces, setWorkspaces] = React23.useState([]);
   const [loading, setLoading] = React23.useState(true);
@@ -10018,12 +10235,15 @@ var useAllWorkspaceMetrics = (options) => {
   const fetchTimeoutRef = React23.useRef(null);
   const isFetchingRef = React23.useRef(false);
   const queryShiftId = React23.useMemo(() => {
+    if (options?.initialShiftId !== void 0) {
+      return options.initialShiftId;
+    }
     const currentShift = getCurrentShift(
-      dateTimeConfig.defaultTimezone || "Asia/Kolkata",
+      timezone || dateTimeConfig.defaultTimezone || "Asia/Kolkata",
       shiftConfig
     );
-    return options?.initialShiftId !== void 0 ? options.initialShiftId : currentShift.shiftId;
-  }, [options?.initialShiftId, dateTimeConfig.defaultTimezone, shiftConfig]);
+    return currentShift.shiftId;
+  }, [options?.initialShiftId, timezone, dateTimeConfig.defaultTimezone, shiftConfig]);
   const queryDate = React23.useMemo(() => {
     return options?.initialDate || getOperationalDate(timezone || dateTimeConfig.defaultTimezone || "UTC");
   }, [options?.initialDate, timezone, dateTimeConfig.defaultTimezone]);
@@ -10035,7 +10255,7 @@ var useAllWorkspaceMetrics = (options) => {
   }, [entityConfig.companyId]);
   const schema = databaseConfig.schema ?? "public";
   const fetchWorkspaceMetrics = React23.useCallback(async () => {
-    if (isFetchingRef.current) {
+    if (isFetchingRef.current || options?.enabled === false || isShiftConfigLoading) {
       return;
     }
     isFetchingRef.current = true;
@@ -10045,9 +10265,9 @@ var useAllWorkspaceMetrics = (options) => {
     setError(null);
     try {
       const allConfiguredLineIds = getConfiguredLineIds(entityConfig);
-      const configuredLineIds = options?.allowedLineIds ? allConfiguredLineIds.filter((id3) => options.allowedLineIds.includes(id3)) : allConfiguredLineIds;
+      const configuredLineIds2 = options?.allowedLineIds ? allConfiguredLineIds.filter((id3) => options.allowedLineIds.includes(id3)) : allConfiguredLineIds;
       let enabledWorkspaceIds = [];
-      for (const lineId of configuredLineIds) {
+      for (const lineId of configuredLineIds2) {
         const workspaces2 = await workspaceService.getWorkspaces(lineId);
         const enabledIds = workspaces2.filter((ws) => ws.enable === true).map((ws) => ws.id);
         enabledWorkspaceIds.push(...enabledIds);
@@ -10108,7 +10328,7 @@ var useAllWorkspaceMetrics = (options) => {
       setLoading(false);
       isFetchingRef.current = false;
     }
-  }, [queryDate, queryShiftId, metricsTable, supabase, entityConfig.companyId, entityConfig, options?.allowedLineIds]);
+  }, [queryDate, queryShiftId, metricsTable, supabase, entityConfig.companyId, entityConfig, options?.allowedLineIds, options?.enabled, isShiftConfigLoading]);
   React23.useEffect(() => {
     if (!initialized) {
       fetchWorkspaceMetrics();
@@ -10587,7 +10807,7 @@ function useClipTypes() {
     refresh: fetchClipTypes
   };
 }
-function useClipTypesWithCounts(workspaceId, date, shiftId, totalOutput) {
+function useClipTypesWithCounts(workspaceId, date, shiftId, totalOutput, options) {
   const { clipTypes, isLoading: typesLoading, error: typesError, refresh } = useClipTypes();
   const [counts, setCounts] = React23.useState({});
   const [countsLoading, setCountsLoading] = React23.useState(false);
@@ -10599,8 +10819,13 @@ function useClipTypesWithCounts(workspaceId, date, shiftId, totalOutput) {
       workspaceId,
       date,
       shiftId,
-      shiftIdType: typeof shiftId
+      shiftIdType: typeof shiftId,
+      enabled: options?.enabled
     });
+    if (!options?.enabled) {
+      console.log("[useClipTypesWithCounts] Skipping counts fetch - disabled");
+      return;
+    }
     if (!s3Service || !workspaceId || !date || shiftId === void 0) {
       console.log("[useClipTypesWithCounts] Skipping counts fetch - missing dependencies");
       return;
@@ -10624,7 +10849,7 @@ function useClipTypesWithCounts(workspaceId, date, shiftId, totalOutput) {
       }
     };
     fetchCounts();
-  }, [s3Service, workspaceId, date, shiftId, totalOutput]);
+  }, [s3Service, workspaceId, date, shiftId, totalOutput, options?.enabled]);
   return {
     clipTypes: clipTypes.map((type) => ({
       ...type,
@@ -11034,15 +11259,48 @@ var useWorkspaceUptimeTimeline = (options) => {
     workspaceId,
     companyId,
     enabled = true,
-    refreshInterval
+    refreshInterval,
+    lineId,
+    shiftConfig: passedShiftConfig,
+    timezone: passedTimezone
   } = options;
+  const { shiftConfig: dynamicShiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
+  const appTimezone = useAppTimezone();
+  const shiftConfigPending = !passedShiftConfig && (!lineId || isShiftConfigLoading || !dynamicShiftConfig);
+  const effectiveShiftConfig = passedShiftConfig ?? (shiftConfigPending ? void 0 : dynamicShiftConfig);
+  const effectiveTimezone = passedTimezone || appTimezone || effectiveShiftConfig?.timezone || "UTC";
+  if (process.env.NODE_ENV === "development") {
+    console.log(`[useWorkspaceUptimeTimeline] Shift config state:`, {
+      lineId,
+      hasPassedConfig: !!passedShiftConfig,
+      isShiftConfigLoading,
+      hasDynamicConfig: !!dynamicShiftConfig,
+      shiftConfigPending,
+      hasEffectiveConfig: !!effectiveShiftConfig
+    });
+  }
   const [timeline, setTimeline] = React23.useState(null);
   const [loading, setLoading] = React23.useState(false);
   const [error, setError] = React23.useState(null);
   const isFetchingRef = React23.useRef(false);
   const intervalRef = React23.useRef(null);
+  React23.useEffect(() => {
+    setTimeline(null);
+    setError(null);
+    setLoading(enabled && Boolean(workspaceId && companyId));
+  }, [workspaceId, companyId, lineId, enabled]);
   const fetchTimeline = React23.useCallback(async () => {
     if (!enabled) return;
+    if (shiftConfigPending) {
+      console.log("[useWorkspaceUptimeTimeline] \u23F3 Waiting for shift config to load before fetching");
+      setLoading(true);
+      return;
+    }
+    if (!effectiveShiftConfig) {
+      console.warn("[useWorkspaceUptimeTimeline] \u26A0\uFE0F No effective shift config available, cannot fetch");
+      setLoading(false);
+      return;
+    }
     if (!workspaceId || !companyId) {
       setTimeline(null);
       return;
@@ -11052,9 +11310,16 @@ var useWorkspaceUptimeTimeline = (options) => {
       isFetchingRef.current = true;
       setLoading(true);
       setError(null);
+      console.log("[useWorkspaceUptimeTimeline] \u{1F680} Fetching timeline with shift config:", {
+        workspaceId,
+        shiftId: effectiveShiftConfig?.shifts?.[0]?.shiftId,
+        timezone: effectiveTimezone
+      });
       const data = await workspaceHealthService.getWorkspaceUptimeTimeline(
         workspaceId,
-        companyId
+        companyId,
+        effectiveShiftConfig,
+        effectiveTimezone
       );
       setTimeline(data);
     } catch (err) {
@@ -11064,7 +11329,7 @@ var useWorkspaceUptimeTimeline = (options) => {
       setLoading(false);
       isFetchingRef.current = false;
     }
-  }, [enabled, workspaceId, companyId]);
+  }, [enabled, workspaceId, companyId, effectiveShiftConfig, effectiveTimezone, shiftConfigPending]);
   React23.useEffect(() => {
     fetchTimeline();
   }, [fetchTimeline]);
@@ -11083,7 +11348,7 @@ var useWorkspaceUptimeTimeline = (options) => {
   }, [refreshInterval, enabled, fetchTimeline]);
   return {
     timeline,
-    loading,
+    loading: loading || shiftConfigPending,
     error,
     refetch: fetchTimeline
   };
@@ -26354,26 +26619,62 @@ var VideoControls = ({
   const [isHoveringProgressBar, setIsHoveringProgressBar] = React23.useState(false);
   const [showSpeedMenu, setShowSpeedMenu] = React23.useState(false);
   const speedMenuRef = React23.useRef(null);
+  const progressTrackRef = React23.useRef(null);
+  const activePointerIdRef = React23.useRef(null);
   const progressColor = "#4b5563";
   const controlsVisible = showControls || controlsPinned;
+  const isDraggingRef = React23.useRef(false);
   const getPercentage = (current, total) => {
     if (!total || total === 0) return 0;
     return Math.min(Math.max(current / total * 100, 0), 100);
   };
   const handleSeekChange = (e) => {
-    const newTime = parseFloat(e.target.value);
+    const newTime = parseFloat(e.currentTarget.value);
     setDragTime(newTime);
     onSeek(newTime);
   };
   const handleSeekStart = () => {
     setIsDragging(true);
+    isDraggingRef.current = true;
     setDragTime(currentTime);
     onSeekStart?.();
   };
   const handleSeekEnd = () => {
     setIsDragging(false);
+    isDraggingRef.current = false;
     onSeekEnd?.();
   };
+  const updateTimeFromClientX = React23.useCallback((clientX) => {
+    if (!progressTrackRef.current) return;
+    const rect = progressTrackRef.current.getBoundingClientRect();
+    if (rect.width === 0 || duration === 0) return;
+    const pct = Math.min(Math.max((clientX - rect.left) / rect.width, 0), 1);
+    const newTime = pct * duration;
+    setDragTime(newTime);
+    onSeek(newTime);
+  }, [duration, onSeek]);
+  const handlePointerDown = React23.useCallback((e) => {
+    if (duration === 0) return;
+    e.preventDefault();
+    activePointerIdRef.current = e.pointerId;
+    handleSeekStart();
+    updateTimeFromClientX(e.clientX);
+    const handleMove = (ev) => {
+      if (ev.pointerId !== activePointerIdRef.current) return;
+      updateTimeFromClientX(ev.clientX);
+    };
+    const handleUp = (ev) => {
+      if (ev.pointerId !== activePointerIdRef.current) return;
+      activePointerIdRef.current = null;
+      window.removeEventListener("pointermove", handleMove);
+      window.removeEventListener("pointerup", handleUp);
+      window.removeEventListener("pointercancel", handleUp);
+      handleSeekEnd();
+    };
+    window.addEventListener("pointermove", handleMove);
+    window.addEventListener("pointerup", handleUp);
+    window.addEventListener("pointercancel", handleUp);
+  }, [duration, handleSeekStart, handleSeekEnd, updateTimeFromClientX]);
   React23.useEffect(() => {
     const handleClickOutside = (event) => {
       if (speedMenuRef.current && !speedMenuRef.current.contains(event.target)) {
@@ -26385,6 +26686,21 @@ var VideoControls = ({
       document.removeEventListener("mousedown", handleClickOutside);
     };
   }, []);
+  React23.useEffect(() => {
+    const cancelDrag = () => {
+      if (isDraggingRef.current) {
+        handleSeekEnd();
+      }
+    };
+    window.addEventListener("mouseup", cancelDrag);
+    window.addEventListener("touchend", cancelDrag);
+    window.addEventListener("touchcancel", cancelDrag);
+    return () => {
+      window.removeEventListener("mouseup", cancelDrag);
+      window.removeEventListener("touchend", cancelDrag);
+      window.removeEventListener("touchcancel", cancelDrag);
+    };
+  }, []);
   const displayTime = isDragging ? dragTime : currentTime;
   const progressPercent = getPercentage(displayTime, duration);
   const bufferedPercent = getPercentage(buffered, duration);
@@ -26397,11 +26713,13 @@ var VideoControls = ({
         /* @__PURE__ */ jsxRuntime.jsxs(
           "div",
           {
+            ref: progressTrackRef,
             className: "relative h-1 mb-4 group cursor-pointer",
             onMouseEnter: () => setIsHoveringProgressBar(true),
             onMouseLeave: () => setIsHoveringProgressBar(false),
+            onPointerDown: handlePointerDown,
             children: [
-              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "absolute -top-2 -bottom-2 left-0 right-0 z-20" }),
+              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "absolute -top-4 -bottom-4 left-0 right-0 z-20" }),
               /* @__PURE__ */ jsxRuntime.jsx("div", { className: "absolute top-0 left-0 right-0 bottom-0 bg-white/20 rounded-full overflow-hidden z-0", children: /* @__PURE__ */ jsxRuntime.jsx(
                 "div",
                 {
@@ -26432,11 +26750,13 @@ var VideoControls = ({
                   step: "0.1",
                   value: displayTime,
                   onChange: handleSeekChange,
+                  onInput: handleSeekChange,
                   onMouseDown: handleSeekStart,
                   onMouseUp: handleSeekEnd,
                   onTouchStart: handleSeekStart,
                   onTouchEnd: handleSeekEnd,
-                  className: "absolute inset-0 w-full h-full opacity-0 cursor-pointer z-30 margin-0 padding-0"
+                  onPointerDown: handlePointerDown,
+                  className: "absolute left-0 right-0 top-[-12px] bottom-[-12px] w-full h-auto opacity-0 cursor-pointer z-30 margin-0 padding-0"
                 }
               )
             ]
@@ -26659,6 +26979,7 @@ var HlsVideoPlayer = React23.forwardRef(({
   const [buffered, setBuffered] = React23.useState(0);
   const [playbackRate, setPlaybackRate] = React23.useState(1);
   const userSeekingRef = React23.useRef(false);
+  const wasPlayingRef = React23.useRef(false);
   const controlsTimeoutRef = React23.useRef(null);
   const eventCallbacksRef = React23.useRef({
     onReady,
@@ -26901,10 +27222,6 @@ var HlsVideoPlayer = React23.forwardRef(({
       eventCallbacksRef.current.onPlay?.(player);
     };
     const handlePause = () => {
-      if (userSeekingRef.current && videoRef.current) {
-        videoRef.current.play().catch((err) => console.warn("Auto-resume after seek pause failed:", err));
-        return;
-      }
       setIsPlaying(false);
       eventCallbacksRef.current.onPause?.(player);
     };
@@ -27118,14 +27435,17 @@ var HlsVideoPlayer = React23.forwardRef(({
   const handleSeek = React23.useCallback((time2) => {
     if (videoRef.current) {
       videoRef.current.currentTime = time2;
-      videoRef.current.play().catch((err) => console.warn("Resume playback failed during seek:", err));
     }
   }, []);
   const handleSeekStart = React23.useCallback(() => {
+    wasPlayingRef.current = !videoRef.current?.paused;
+    if (videoRef.current && !videoRef.current.paused) {
+      videoRef.current.pause();
+    }
     userSeekingRef.current = true;
   }, []);
   const handleSeekEnd = React23.useCallback(() => {
-    if (videoRef.current) {
+    if (videoRef.current && wasPlayingRef.current) {
       videoRef.current.play().catch((err) => console.warn("Resume playback failed after seek:", err));
     }
   }, []);
@@ -27267,6 +27587,7 @@ var CroppedHlsVideoPlayer = React23.forwardRef(({
   const [playbackRate, setPlaybackRate] = React23.useState(1);
   const controlsTimeoutRef = React23.useRef(null);
   const userSeekingRef = React23.useRef(false);
+  const wasPlayingRef = React23.useRef(false);
   const [controlsPinned, setControlsPinned] = React23.useState(false);
   const stopCanvasRendering = React23.useCallback(() => {
     if (animationFrameRef.current) {
@@ -27406,7 +27727,7 @@ var CroppedHlsVideoPlayer = React23.forwardRef(({
   }, [crop, renderFrameToCanvas, onPlayProp]);
   const handleVideoPause = React23.useCallback((player) => {
     console.log("[CroppedHlsVideoPlayer] Video paused, stopping canvas rendering (keeping last frame)");
-    if (userSeekingRef.current && hiddenVideoRef.current) {
+    if (userSeekingRef.current && wasPlayingRef.current && hiddenVideoRef.current) {
       hiddenVideoRef.current.play()?.catch(() => {
       });
       return;
@@ -27423,6 +27744,7 @@ var CroppedHlsVideoPlayer = React23.forwardRef(({
     setIsProcessing(false);
     setIsPlaying(false);
     userSeekingRef.current = false;
+    wasPlayingRef.current = false;
     onEndedProp?.(player);
   }, [stopCanvasRendering, onEndedProp]);
   const handleSeeking = React23.useCallback((player) => {
@@ -27438,6 +27760,7 @@ var CroppedHlsVideoPlayer = React23.forwardRef(({
     hiddenVideoRef.current?.play()?.catch(() => {
     });
     userSeekingRef.current = false;
+    wasPlayingRef.current = false;
     if (crop) {
       renderFrameToCanvas();
     }
@@ -27534,20 +27857,34 @@ var CroppedHlsVideoPlayer = React23.forwardRef(({
   const handleSeek = React23.useCallback((time2) => {
     if (hiddenVideoRef.current) {
       hiddenVideoRef.current.currentTime(time2);
-      hiddenVideoRef.current.play()?.catch(() => {
-      });
       setTimeout(() => renderFrameToCanvas(), 50);
+      userSeekingRef.current = true;
     }
   }, [renderFrameToCanvas]);
   const handleSeekStart = React23.useCallback(() => {
+    const videoPaused = hiddenVideoRef.current?.video?.paused ?? hiddenVideoRef.current?.paused();
+    wasPlayingRef.current = videoPaused === false;
+    if (hiddenVideoRef.current && videoPaused === false) {
+      hiddenVideoRef.current.pause();
+    }
     userSeekingRef.current = true;
   }, []);
   const handleSeekEnd = React23.useCallback(() => {
-    if (hiddenVideoRef.current) {
-      hiddenVideoRef.current.play()?.catch(() => {
+    const shouldResume = wasPlayingRef.current;
+    userSeekingRef.current = shouldResume;
+    if (hiddenVideoRef.current && shouldResume) {
+      hiddenVideoRef.current.play()?.then(() => {
+        if (crop) {
+          setIsProcessing(true);
+          renderFrameToCanvas();
+        }
+      }).catch(() => {
       });
     }
-  }, []);
+    if (!shouldResume) {
+      userSeekingRef.current = false;
+    }
+  }, [crop, renderFrameToCanvas]);
   const handlePlaybackRateChange = React23.useCallback((rate) => {
     if (hiddenVideoRef.current) {
       hiddenVideoRef.current.playbackRate(rate);
@@ -29838,6 +30175,7 @@ var BottlenecksContent = ({
   workspaceId,
   workspaceName,
   date,
+  lineId,
   shift,
   className,
   totalOutput,
@@ -29848,27 +30186,36 @@ var BottlenecksContent = ({
   console.log("\u{1F3AB} [BottlenecksContent] Rendered with ticketId:", ticketId || "NONE", "workspaceId:", workspaceId, "date:", date, "shift:", shift);
   const dashboardConfig = useDashboardConfig();
   const timezone = useAppTimezone();
-  const { shiftConfig } = useDynamicShiftConfig(workspaceId);
-  const effectiveShift = React23.useMemo(() => {
-    if (shift !== void 0 && shift !== null) {
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
+  const { effectiveShift, effectiveDate } = React23.useMemo(() => {
+    if (shift !== void 0 && shift !== null && date) {
       const shiftStr = shift.toString();
-      console.log(`[BottlenecksContent] Using provided shift: ${shiftStr} for date: ${date}`);
-      return shiftStr;
+      console.log(`[BottlenecksContent] Using explicit date/shift: ${date}, shift ${shiftStr}`);
+      return { effectiveShift: shiftStr, effectiveDate: date };
     }
-    if (date) {
-      console.log(`[BottlenecksContent] No shift provided for historical date ${date}, defaulting to day shift (0)`);
-      return "0";
-    } else {
-      const currentShift = getCurrentShift(
-        timezone,
-        // Use dynamic timezone instead of hardcoded default
-        shiftConfig
-        // Use line-specific shift config from database
-      );
-      console.log(`[BottlenecksContent] Using current operational shift: ${currentShift.shiftId} with timezone: ${timezone} for workspace: ${workspaceId}`);
-      return currentShift.shiftId.toString();
+    if ((shift === void 0 || shift === null) && isShiftConfigLoading) {
+      console.log("[BottlenecksContent] Waiting for shift config before determining effective date/shift");
+      return { effectiveShift: null, effectiveDate: null };
+    }
+    const currentShift = getCurrentShift(
+      timezone,
+      shiftConfig
+    );
+    if (shift !== void 0 && shift !== null) {
+      const shiftStr = shift.toString();
+      return {
+        effectiveShift: shiftStr,
+        effectiveDate: date || currentShift.date
+      };
     }
-  }, [shift, date, timezone, shiftConfig, workspaceId]);
+    return {
+      effectiveShift: currentShift.shiftId.toString(),
+      effectiveDate: date || currentShift.date
+    };
+  }, [shift, date, timezone, shiftConfig, isShiftConfigLoading]);
+  const isEffectiveShiftReady = Boolean(effectiveShift && effectiveDate);
+  const effectiveDateString = effectiveDate || "";
+  const effectiveShiftId = effectiveShift ?? "";
   const { crop: workspaceCrop} = useWorkspaceCrop(workspaceId);
   const { metrics: workspaceMetrics } = useWorkspaceDetailedMetrics(
     workspaceId,
@@ -29954,9 +30301,9 @@ var BottlenecksContent = ({
     clearNotification
   } = useClipsRealtimeUpdates({
     workspaceId,
-    date: date || getOperationalDate(timezone),
-    shiftId: effectiveShift,
-    enabled: true,
+    date: effectiveDateString,
+    shiftId: effectiveShiftId,
+    enabled: isEffectiveShiftReady,
     // Supabase implementation
     onNewClips: (notification) => {
       console.log(`[BottlenecksContent] New clips detected:`, notification);
@@ -29997,10 +30344,11 @@ var BottlenecksContent = ({
     counts: dynamicCounts
   } = useClipTypesWithCounts(
     workspaceId,
-    date || getOperationalDate(timezone),
-    effectiveShift,
+    effectiveDateString,
+    effectiveShiftId,
     // Use same shift as video loading for consistency
-    totalOutput
+    totalOutput,
+    { enabled: isEffectiveShiftReady }
   );
   console.log("[BottlenecksContent] Clip types data:", {
     clipTypes,
@@ -30009,8 +30357,8 @@ var BottlenecksContent = ({
     clipTypesError,
     dynamicCounts,
     workspaceId,
-    date: date || getOperationalDate(timezone),
-    shift: shift || "0"
+    date: effectiveDateString,
+    shift: effectiveShiftId || "0"
   });
   React23.useEffect(() => {
     if (clipTypes.length > 0) {
@@ -30051,16 +30399,16 @@ var BottlenecksContent = ({
     return { ...clipCounts, ...dynamicCounts };
   }, [clipCounts, dynamicCounts]);
   const fetchClipCounts = React23.useCallback(async () => {
-    if (!workspaceId || !s3ClipsService || !dashboardConfig?.s3Config || !isMountedRef.current) return;
-    const operationKey = `fetchClipCounts:${workspaceId}:${date}:${shift}`;
+    if (!workspaceId || !s3ClipsService || !dashboardConfig?.s3Config || !isMountedRef.current || !isEffectiveShiftReady) return;
+    const operationKey = `fetchClipCounts:${workspaceId}:${effectiveDateString}:${effectiveShiftId}`;
     if (fetchInProgressRef.current.has(operationKey)) {
       console.log(`[BottlenecksContent] Fetch clip counts already in progress for ${operationKey}`);
       return;
     }
     fetchInProgressRef.current.add(operationKey);
     try {
-      const operationalDate = date || getOperationalDate(timezone);
-      const shiftStr = effectiveShift;
+      const operationalDate = effectiveDateString;
+      const shiftStr = effectiveShiftId;
       console.log(`[BottlenecksContent] Fetching clip counts directly with params:`, {
         workspaceId,
         operationalDate,
@@ -30095,12 +30443,12 @@ var BottlenecksContent = ({
     } finally {
       fetchInProgressRef.current.delete(operationKey);
     }
-  }, [workspaceId, date, s3ClipsService, effectiveShift, dashboardConfig, updateClipCounts, timezone, totalOutput]);
+  }, [workspaceId, effectiveDateString, s3ClipsService, effectiveShiftId, dashboardConfig, updateClipCounts, isEffectiveShiftReady, totalOutput]);
   const loadingCategoryRef = React23.useRef(null);
   const loadFirstVideoForCategory = React23.useCallback(async (category) => {
-    if (!workspaceId || !s3ClipsService || !isMountedRef.current) return;
+    if (!workspaceId || !s3ClipsService || !isMountedRef.current || !isEffectiveShiftReady) return;
     const targetCategory = category || activeFilterRef.current;
-    const operationKey = `loadFirstVideo:${targetCategory}`;
+    const operationKey = `loadFirstVideo:${targetCategory}:${effectiveDateString}:${effectiveShiftId}`;
     if (loadingCategoryRef.current === targetCategory || fetchInProgressRef.current.has(operationKey)) {
       console.log(`[BottlenecksContent] Load first video already in progress for ${targetCategory}`);
       return;
@@ -30111,8 +30459,8 @@ var BottlenecksContent = ({
       setError(null);
     }
     try {
-      const operationalDate = date || getOperationalDate(timezone);
-      const shiftStr = effectiveShift;
+      const operationalDate = effectiveDateString;
+      const shiftStr = effectiveShiftId;
       console.log(`[BottlenecksContent] Loading first video for category: ${targetCategory}`);
       try {
         const firstVideo = await s3ClipsService.getFirstClipForCategory(
@@ -30185,7 +30533,7 @@ var BottlenecksContent = ({
       loadingCategoryRef.current = null;
       fetchInProgressRef.current.delete(operationKey);
     }
-  }, [workspaceId, date, s3ClipsService, mergedCounts, effectiveShift, timezone]);
+  }, [workspaceId, effectiveDateString, s3ClipsService, mergedCounts, effectiveShiftId, isEffectiveShiftReady]);
   const handleRefreshClips = React23.useCallback(async () => {
     console.log("[BottlenecksContent] Refreshing clips after new additions");
     acknowledgeNewClips();
@@ -30196,10 +30544,10 @@ var BottlenecksContent = ({
     }
   }, [acknowledgeNewClips, fetchClipCounts, activeFilter, mergedCounts, loadFirstVideoForCategory, invalidateMetadataCache]);
   React23.useEffect(() => {
-    if (s3ClipsService) {
+    if (s3ClipsService && isEffectiveShiftReady) {
       fetchClipCounts();
     }
-  }, [workspaceId, date, effectiveShift, s3ClipsService, fetchClipCounts]);
+  }, [workspaceId, effectiveDateString, effectiveShiftId, s3ClipsService, fetchClipCounts, isEffectiveShiftReady]);
   const getAuthToken4 = React23.useCallback(async () => {
     try {
       const { createClient: createClient5 } = await import('@supabase/supabase-js');
@@ -30215,7 +30563,7 @@ var BottlenecksContent = ({
     }
   }, []);
   React23.useEffect(() => {
-    if (!triageMode || !workspaceId) return;
+    if (!triageMode || !workspaceId || !isEffectiveShiftReady) return;
     const fetchTriageClips = async () => {
       setIsLoadingTriageClips(true);
       try {
@@ -30234,8 +30582,8 @@ var BottlenecksContent = ({
             body: JSON.stringify({
               action: "metadata",
               workspaceId,
-              date: date || getOperationalDate(timezone),
-              shift: effectiveShift,
+              date: effectiveDateString,
+              shift: effectiveShiftId,
               category: categoryId,
               page: 1,
               limit: 100
@@ -30267,7 +30615,7 @@ var BottlenecksContent = ({
       }
     };
     fetchTriageClips();
-  }, [triageMode, workspaceId, date, effectiveShift, timezone, getAuthToken4]);
+  }, [triageMode, workspaceId, effectiveDateString, effectiveShiftId, getAuthToken4, isEffectiveShiftReady]);
   React23.useEffect(() => {
     if (s3ClipsService && (mergedCounts[activeFilter] || 0) > 0) {
       const hasVideosForCurrentFilter = allVideos.some((video) => {
@@ -30368,8 +30716,12 @@ var BottlenecksContent = ({
     if (!workspaceId) {
       return;
     }
-    const resolvedDate = date || getOperationalDate(timezone);
-    const cacheKey = `${categoryId}-${resolvedDate}-${effectiveShift}`;
+    if (!isEffectiveShiftReady) {
+      console.log("[BottlenecksContent] Skipping metadata load - shift/date not ready");
+      return;
+    }
+    const resolvedDate = effectiveDateString;
+    const cacheKey = `${categoryId}-${resolvedDate}-${effectiveShiftId}`;
     const cachedMetadata = !forceRefresh ? metadataCache[cacheKey] : void 0;
     try {
       if (cachedMetadata) {
@@ -30423,7 +30775,7 @@ var BottlenecksContent = ({
             startDate: `${resolvedDate}T00:00:00Z`,
             endDate: `${resolvedDate}T23:59:59Z`,
             percentile: 10,
-            shiftId: effectiveShift,
+            shiftId: effectiveShiftId,
             limit: 100
           })
         });
@@ -30438,7 +30790,7 @@ var BottlenecksContent = ({
             action: "clip-metadata",
             workspaceId,
             date: resolvedDate,
-            shift: effectiveShift,
+            shift: effectiveShiftId,
             category: categoryId,
             page: 1,
             limit: 1e3
@@ -30497,7 +30849,7 @@ var BottlenecksContent = ({
     } finally {
       setIsCategoryLoading(false);
     }
-  }, [workspaceId, date, effectiveShift, isPercentileCategory, metadataCache, s3ClipsService, timezone, clearLoadingState]);
+  }, [workspaceId, effectiveDateString, effectiveShiftId, isPercentileCategory, metadataCache, s3ClipsService, clearLoadingState, isEffectiveShiftReady]);
   const loadAndPlayClipById = React23.useCallback(async (clipId, categoryId, position) => {
     if (!workspaceId || !s3ClipsService || !isMountedRef.current) return;
     console.log(`[BottlenecksContent] Loading clip by ID: ${clipId}, category=${categoryId}, position=${position}`);
@@ -30562,10 +30914,10 @@ var BottlenecksContent = ({
   }, [workspaceId, s3ClipsService, updateActiveFilter, clearLoadingState, loadCategoryMetadata]);
   React23.useCallback(async (categoryId, clipIndex) => {
     console.warn("[BottlenecksContent] loadAndPlayClip is deprecated, use loadAndPlayClipById instead");
-    if (!workspaceId || !s3ClipsService || !isMountedRef.current) return;
+    if (!workspaceId || !s3ClipsService || !isMountedRef.current || !isEffectiveShiftReady) return;
     try {
-      const operationalDate = date || getOperationalDate(timezone);
-      const shiftStr = effectiveShift;
+      const operationalDate = effectiveDateString;
+      const shiftStr = effectiveShiftId;
       const video = await s3ClipsService.getClipByIndex(
         workspaceId,
         operationalDate,
@@ -30586,7 +30938,7 @@ var BottlenecksContent = ({
       });
       setIsNavigating(false);
     }
-  }, [workspaceId, s3ClipsService, date, effectiveShift, loadAndPlayClipById, timezone]);
+  }, [workspaceId, s3ClipsService, effectiveDateString, effectiveShiftId, loadAndPlayClipById, isEffectiveShiftReady]);
   const handleNext = React23.useCallback(async () => {
     if (!isMountedRef.current) return;
     const currentFilter = activeFilterRef.current;
@@ -31245,8 +31597,8 @@ var BottlenecksContent = ({
             currentVideoId: currentVideo?.id,
             counts: mergedCounts,
             workspaceId,
-            date: date || getOperationalDate(timezone),
-            shift: effectiveShift,
+            date: effectiveDateString,
+            shift: effectiveShiftId,
             targetCycleTime: workspaceTargetCycleTime,
             onFilterChange: (filterId) => {
               updateActiveFilter(filterId);
@@ -31444,6 +31796,7 @@ var BottleneckClipsModal = ({
   onClose,
   workspaceId,
   workspaceName,
+  lineId,
   date,
   shift,
   totalOutput,
@@ -31568,6 +31921,7 @@ var BottleneckClipsModal = ({
             {
               workspaceId,
               workspaceName,
+              lineId,
               date,
               shift,
               totalOutput,
@@ -32514,7 +32868,7 @@ var EncouragementOverlay = ({
 };
 var ShiftDisplay = React23.memo(({ className, variant = "default", lineId }) => {
   const { dateTimeConfig } = useDashboardConfig();
-  const { shiftConfig } = useDynamicShiftConfig(lineId);
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
   const getShiftInfo = () => {
     const tz = dateTimeConfig?.defaultTimezone;
     if (!tz || !shiftConfig || !shiftConfig.dayShift || !shiftConfig.nightShift || !shiftConfig.dayShift.startTime || !shiftConfig.nightShift.startTime) {
@@ -32528,7 +32882,7 @@ var ShiftDisplay = React23.memo(({ className, variant = "default", lineId }) =>
       return null;
     }
   };
-  const getShiftIcon = (shift) => {
+  const getShiftIcon2 = (shift) => {
     if (shift === "Day") {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "currentColor", viewBox: "0 0 20 20", children: /* @__PURE__ */ jsxRuntime.jsx("path", { fillRule: "evenodd", d: "M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z", clipRule: "evenodd" }) });
     } else {
@@ -32542,13 +32896,19 @@ var ShiftDisplay = React23.memo(({ className, variant = "default", lineId }) =>
       setCurrentShiftText(getShiftInfo());
     }, 1e3);
     return () => clearInterval(interval);
-  }, [dateTimeConfig?.defaultTimezone, shiftConfig]);
+  }, [dateTimeConfig?.defaultTimezone, shiftConfig, isShiftConfigLoading]);
+  if (isShiftConfigLoading) {
+    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `inline-flex items-center gap-2 bg-gray-100 rounded-lg px-3 py-1.5 ${className ?? ""}`, children: [
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-4 h-4 bg-gray-200 rounded animate-pulse" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-16 h-4 bg-gray-200 rounded animate-pulse" })
+    ] });
+  }
   if (!currentShiftText) {
     return null;
   }
   if (variant === "enhanced") {
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `inline-flex items-center gap-2 bg-blue-50 rounded-lg px-3 py-1.5 ${className ?? ""}`, children: [
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-800", children: getShiftIcon(currentShiftText) }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-800", children: getShiftIcon2(currentShiftText) }),
       /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-base font-medium text-blue-800", children: [
         currentShiftText,
         " Shift"
@@ -32556,7 +32916,7 @@ var ShiftDisplay = React23.memo(({ className, variant = "default", lineId }) =>
     ] });
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `inline-flex items-center gap-2 bg-blue-50 rounded-lg px-3 py-1.5 ${className ?? ""}`, children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-800", children: getShiftIcon(currentShiftText) }),
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-800", children: getShiftIcon2(currentShiftText) }),
     /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-base font-medium text-blue-800", children: [
       currentShiftText,
       " Shift"
@@ -33020,13 +33380,26 @@ var LinePdfExportButton = ({
     }
   );
 };
+var DEFAULT_LINE_SHIFT_DATA = {
+  avg_efficiency: 0,
+  underperforming_workspaces: 0,
+  total_workspaces: 0,
+  hasData: false
+};
+var getLineShiftData = (day, shiftId) => {
+  const shift = day.shifts[shiftId];
+  if (shift) {
+    return { ...shift, hasData: true };
+  }
+  return { ...DEFAULT_LINE_SHIFT_DATA };
+};
 var WEEKDAYS = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
 var LineHistoryCalendar = ({
   data,
   month,
   year,
   lineId,
-  selectedShift,
+  selectedShiftId,
   onDateSelect,
   className = ""
 }) => {
@@ -33062,8 +33435,7 @@ var LineHistoryCalendar = ({
       } else {
         calendar.push({
           date: currentDate,
-          dayShift: { avg_efficiency: 0, underperforming_workspaces: 0, total_workspaces: 0, hasData: false },
-          nightShift: { avg_efficiency: 0, underperforming_workspaces: 0, total_workspaces: 0, hasData: false }
+          shifts: {}
         });
       }
     }
@@ -33114,8 +33486,7 @@ var LineHistoryCalendar = ({
   };
   const renderDayCell = (day) => {
     if (!day) return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border border-gray-100 dark:border-gray-700 rounded-lg bg-gray-50 dark:bg-gray-800" });
-    const shiftData = selectedShift === "day" ? day.dayShift : day.nightShift;
-    if (!shiftData) return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border border-gray-100 dark:border-gray-700 rounded-lg bg-gray-50 dark:bg-gray-800" });
+    const shiftData = getLineShiftData(day, selectedShiftId);
     const isToday = isCurrentDate(day.date instanceof Date ? day.date : new Date(day.date));
     const isFuture = isFutureDate(day.date instanceof Date ? day.date : new Date(day.date));
     const hasData = hasRealData(shiftData);
@@ -33131,21 +33502,20 @@ var LineHistoryCalendar = ({
             const month2 = String(dateObj2.getMonth() + 1).padStart(2, "0");
             const dayOfMonth = String(dateObj2.getDate()).padStart(2, "0");
             const date = `${year2}-${month2}-${dayOfMonth}`;
-            const shiftId = selectedShift === "day" ? "0" : "1";
             trackCoreEvent("Line Monthly History Day Clicked", {
               source: "line_kpi",
               line_id: lineId,
               date,
-              shift: selectedShift,
+              shift_id: selectedShiftId,
               efficiency: shiftData.avg_efficiency || 0,
               underperforming_workspaces: shiftData.underperforming_workspaces || 0,
               total_workspaces: shiftData.total_workspaces || 0
             });
             const returnTo = `/kpis/${lineId}?tab=monthly_history&month=${month2}&year=${year2}`;
             if (onDateSelect) {
-              onDateSelect(date, shiftId);
+              onDateSelect(date, selectedShiftId);
             } else {
-              router.navigate(`/kpis/${lineId}?date=${date}&shift=${shiftId}&sourceType=lineMonthlyHistory&returnTo=${encodeURIComponent(returnTo)}`);
+              router.navigate(`/kpis/${lineId}?date=${date}&shift=${selectedShiftId}&sourceType=lineMonthlyHistory&returnTo=${encodeURIComponent(returnTo)}`);
             }
           }
         },
@@ -33169,14 +33539,28 @@ var LineHistoryCalendar = ({
   ] });
 };
 var LineHistoryCalendar_default = LineHistoryCalendar;
+var DEFAULT_PERFORMANCE_DATA = {
+  avg_efficiency: 0,
+  underperforming_workspaces: 0,
+  total_workspaces: 0,
+  hasData: false
+};
+var getShiftData2 = (day, shiftId) => {
+  const shift = day.shifts[shiftId];
+  if (shift) {
+    return { ...shift, hasData: true };
+  }
+  return { ...DEFAULT_PERFORMANCE_DATA };
+};
 var LineMonthlyHistory = ({
   month,
   year,
   monthlyData = [],
-  underperformingWorkspaces = { dayShift: [], nightShift: [] },
+  underperformingWorkspaces = {},
   lineId,
-  selectedShift = "day",
+  selectedShiftId = 0,
   onShiftChange,
+  availableShifts,
   onWorkspaceSelect,
   onCalendarDateSelect,
   onCalendarMonthChange,
@@ -33185,7 +33569,7 @@ var LineMonthlyHistory = ({
   const navigation = useNavigation();
   const averages = (monthlyData || []).reduce(
     (acc, day) => {
-      const shiftData = selectedShift === "day" ? day.dayShift : day.nightShift;
+      const shiftData = getShiftData2(day, selectedShiftId);
       if (!shiftData || shiftData?.avg_efficiency < 10) {
         return acc;
       }
@@ -33259,28 +33643,22 @@ var LineMonthlyHistory = ({
       line_id: lineId,
       workspace_id: workspace.workspace_uuid,
       workspace_name: workspace.workspace_name,
-      selected_shift: selectedShift
+      selected_shift_id: selectedShiftId
     });
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: clsx("flex flex-col gap-2 min-h-0 overflow-y-auto pb-6", className), children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center mb-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-1 border border-gray-200 rounded-lg p-1 bg-gray-50", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          onClick: () => onShiftChange?.("day"),
-          className: `px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 ${selectedShift === "day" ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : "text-gray-600 hover:text-gray-900 hover:bg-gray-100"}`,
-          children: "Day Shift"
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          onClick: () => onShiftChange?.("night"),
-          className: `px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 ${selectedShift === "night" ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : "text-gray-600 hover:text-gray-900 hover:bg-gray-100"}`,
-          children: "Night Shift"
-        }
-      )
-    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center mb-4", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-1 border border-gray-200 rounded-lg p-1 bg-gray-50", children: (availableShifts && availableShifts.length > 0 ? availableShifts : [
+      { id: 0, name: "Day Shift" },
+      { id: 1, name: "Night Shift" }
+    ]).sort((a, b) => a.id - b.id).map((shift) => /* @__PURE__ */ jsxRuntime.jsx(
+      "button",
+      {
+        onClick: () => onShiftChange?.(shift.id),
+        className: `px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 ${selectedShiftId === shift.id ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : "text-gray-600 hover:text-gray-900 hover:bg-gray-100"}`,
+        children: shift.name
+      },
+      shift.id
+    )) }) }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-1 lg:grid-cols-2 gap-6 mt-6", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-white rounded-xl shadow-sm border border-gray-100 p-6", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("h2", { className: "text-lg font-semibold text-gray-700 mb-4 text-center", children: [
@@ -33295,7 +33673,7 @@ var LineMonthlyHistory = ({
             month,
             year,
             lineId,
-            selectedShift,
+            selectedShiftId,
             onDateSelect: onCalendarDateSelect
           }
         )
@@ -33332,7 +33710,7 @@ var LineMonthlyHistory = ({
             new Date(year, month).toLocaleString("default", { month: "long", year: "numeric" })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
-            (selectedShift === "day" ? underperformingWorkspaces.dayShift : underperformingWorkspaces.nightShift)?.map((workspace) => /* @__PURE__ */ jsxRuntime.jsx(
+            (underperformingWorkspaces[selectedShiftId] || []).map((workspace) => /* @__PURE__ */ jsxRuntime.jsx(
               "button",
               {
                 onClick: () => handleWorkspaceClick(workspace),
@@ -33354,13 +33732,33 @@ var LineMonthlyHistory = ({
               },
               workspace.workspace_uuid
             )),
-            (!underperformingWorkspaces || (selectedShift === "day" ? !underperformingWorkspaces.dayShift?.length : !underperformingWorkspaces.nightShift?.length)) && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-center text-gray-500 py-4", children: "No consistently underperforming workspaces found" })
+            (!underperformingWorkspaces || !underperformingWorkspaces[selectedShiftId]?.length) && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-center text-gray-500 py-4", children: "No consistently underperforming workspaces found" })
           ] })
         ] })
       ] })
     ] })
   ] });
 };
+var DEFAULT_PERFORMANCE_DATA2 = {
+  avg_efficiency: 0,
+  underperforming_workspaces: 0,
+  total_workspaces: 0,
+  hasData: false
+};
+var getLineShiftData2 = (day, shiftId) => {
+  const shift = day.shifts[shiftId];
+  if (shift) {
+    return { ...shift, hasData: true };
+  }
+  return { ...DEFAULT_PERFORMANCE_DATA2 };
+};
+var getShiftDisplayName = (shiftId, availableShifts) => {
+  const shift = availableShifts?.find((s) => s.id === shiftId);
+  if (shift) return shift.name;
+  if (shiftId === 0) return "Day Shift";
+  if (shiftId === 1) return "Night Shift";
+  return `Shift ${shiftId}`;
+};
 var LineMonthlyPdfGenerator = ({
   lineId,
   lineName,
@@ -33368,7 +33766,8 @@ var LineMonthlyPdfGenerator = ({
   underperformingWorkspaces,
   selectedMonth,
   selectedYear,
-  selectedShift,
+  selectedShiftId,
+  availableShifts,
   className
 }) => {
   const [isGenerating, setIsGenerating] = React23.useState(false);
@@ -33380,7 +33779,7 @@ var LineMonthlyPdfGenerator = ({
         line_name: lineName,
         month: selectedMonth,
         year: selectedYear,
-        shift: selectedShift
+        shift_id: selectedShiftId
       });
       const doc = new jsPDF.jsPDF();
       doc.setFontSize(14);
@@ -33410,7 +33809,7 @@ var LineMonthlyPdfGenerator = ({
         year: "numeric",
         timeZone: "Asia/Kolkata"
       });
-      const shiftType = selectedShift === "day" ? "Day Shift" : "Night Shift";
+      const shiftType = getShiftDisplayName(selectedShiftId, availableShifts);
       doc.text(`${monthName}`, 20, 55);
       doc.text(`${shiftType}`, 20, 63);
       const startDate = new Date(selectedYear, selectedMonth, 1);
@@ -33439,7 +33838,7 @@ var LineMonthlyPdfGenerator = ({
         return date.getMonth() === selectedMonth && date.getFullYear() === selectedYear;
       });
       const validShifts = validDays.map(
-        (day) => selectedShift === "day" ? day.dayShift : day.nightShift
+        (day) => getLineShiftData2(day, selectedShiftId)
       ).filter((shift) => shift.avg_efficiency > 0);
       const monthlyMetrics = validShifts.length > 0 ? {
         avgEfficiency: validShifts.reduce((sum, shift) => sum + shift.avg_efficiency, 0) / validShifts.length,
@@ -33521,8 +33920,8 @@ var LineMonthlyPdfGenerator = ({
         const recentDays = validDays.slice(-10).reverse();
         recentDays.forEach((dayData, index) => {
           if (yPos > 245) return;
-          const shift = selectedShift === "day" ? dayData.dayShift : dayData.nightShift;
-          if (shift.avg_efficiency <= 0) return;
+          const shift = getLineShiftData2(dayData, selectedShiftId);
+          if (shift.avg_efficiency <= 0 || !shift.hasData) return;
           if (index % 2 === 0) {
             doc.setFillColor(252, 252, 252);
             doc.roundedRect(20, yPos - 4, 170, 7, 1, 1, "F");
@@ -33556,7 +33955,7 @@ var LineMonthlyPdfGenerator = ({
         doc.text("No daily data available for this month", 25, 200);
         doc.setTextColor(0, 0, 0);
       }
-      const poorestWorkspaces = selectedShift === "day" ? underperformingWorkspaces.dayShift : underperformingWorkspaces.nightShift;
+      const poorestWorkspaces = underperformingWorkspaces[selectedShiftId] || [];
       if (poorestWorkspaces && poorestWorkspaces.length > 0) {
         doc.addPage();
         doc.setFontSize(14);
@@ -33684,6 +34083,7 @@ Underperforming Workspaces: ${lineInfo.metrics.underperforming_workspaces} / ${l
 var LinePdfGenerator = ({
   lineInfo,
   workspaceData,
+  shiftName,
   className
 }) => {
   const [isGenerating, setIsGenerating] = React23.useState(false);
@@ -33735,7 +34135,8 @@ var LinePdfGenerator = ({
       doc.text(lineInfo.line_name, 20, 30);
       doc.setFontSize(14);
       doc.setFont("helvetica", "normal");
-      const shiftType = lineInfo.shift_id === 0 ? "Day Shift" : "Night Shift";
+      const rawShiftType = shiftName || (lineInfo.shift_id === 0 ? "Day" : lineInfo.shift_id === 1 ? "Night" : `Shift ${lineInfo.shift_id}`);
+      const shiftType = rawShiftType.toLowerCase().includes("shift") ? rawShiftType : `${rawShiftType} Shift`;
       const date = new Date(lineInfo.date).toLocaleDateString("en-IN", {
         weekday: "long",
         day: "numeric",
@@ -34410,9 +34811,10 @@ var WorkspaceHistoryCalendar = ({
   month,
   year,
   workspaceId,
-  selectedShift = "day",
+  selectedShiftId = 0,
   onMonthNavigate,
   onShiftChange,
+  availableShifts,
   className
 }) => {
   const { dateTimeConfig } = useDashboardConfig();
@@ -34477,7 +34879,7 @@ var WorkspaceHistoryCalendar = ({
       if (compareDate > istNow) {
         return [];
       }
-      const shiftData = selectedShift === "day" ? day.dayShift : day.nightShift;
+      const shiftData = getShiftData(day, selectedShiftId);
       if (hasRealData(shiftData)) {
         return [shiftData];
       }
@@ -34494,31 +34896,32 @@ var WorkspaceHistoryCalendar = ({
       badDaysCount: badShiftsCount,
       totalDays: validShifts.length
     };
-  }, [data, month, year, configuredTimezone, selectedShift]);
-  const handleDayClick = React23.useCallback((day, shift) => {
+  }, [data, month, year, configuredTimezone, selectedShiftId]);
+  const handleDayClick = React23.useCallback((day, shiftId) => {
     if (!day || isFutureDate(day.date)) return;
     const year2 = day.date.getFullYear();
     const month2 = String(day.date.getMonth() + 1).padStart(2, "0");
     const dayOfMonth = String(day.date.getDate()).padStart(2, "0");
     const formattedDate = `${year2}-${month2}-${dayOfMonth}`;
-    const shiftData = shift === "day" ? day.dayShift : day.nightShift;
+    const shiftData = getShiftData(day, shiftId);
     trackCoreEvent("Workspace Monthly History Day Clicked", {
       source: "workspace_detail",
       workspace_id: workspaceId,
       date: formattedDate,
+      shift_id: shiftId,
       efficiency: shiftData.efficiency,
       output: shiftData.output,
       cycle_time: shiftData.cycleTime
     });
-    onDateSelect(formattedDate);
+    onDateSelect(formattedDate, shiftId);
   }, [workspaceId, onDateSelect]);
-  const handleShiftChange = React23.useCallback((shift) => {
+  const handleShiftChange = React23.useCallback((shiftId) => {
     trackCoreEvent("Workspace Calendar Shift Changed", {
       workspace_id: workspaceId,
-      new_shift: shift
+      new_shift_id: shiftId
     });
     if (onShiftChange) {
-      onShiftChange(shift);
+      onShiftChange(shiftId);
     }
   }, [workspaceId, onShiftChange]);
   const isCurrentDate = React23.useCallback((date) => {
@@ -34599,13 +35002,13 @@ var WorkspaceHistoryCalendar = ({
       }
       return /* @__PURE__ */ jsxRuntime.jsx("div", { className: `h-full border border-gray-200 rounded-lg ${bgColor} ${animationComplete ? "transition-all duration-300 ease-in-out" : ""} cursor-not-allowed opacity-60`, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-1 sm:p-2", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: `text-xs sm:text-sm lg:text-base font-medium ${textColor} ${isToday ? "text-blue-500" : ""}`, children: dayNumber }) }) });
     }
-    const shiftData = selectedShift === "day" ? day.dayShift : day.nightShift;
+    const shiftData = getShiftData(day, selectedShiftId);
     const hasData = hasRealData(shiftData);
     return /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       {
         className: `group h-full ${animationComplete ? "transition-all duration-300 ease-in-out" : ""} ${!isFuture && hasData && animationComplete ? "cursor-pointer hover:opacity-90 hover:scale-105" : "cursor-not-allowed"}`,
-        onClick: () => !isFuture && hasData && handleDayClick(day, selectedShift),
+        onClick: () => !isFuture && hasData && handleDayClick(day, selectedShiftId),
         children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `
           ${getPerformanceColor(shiftData.efficiency, day.date, hasData)} 
           rounded-lg h-full p-1 sm:p-2 relative ${animationComplete ? "transition-all duration-300 ease-in-out" : ""} shadow-sm
@@ -34619,31 +35022,25 @@ var WorkspaceHistoryCalendar = ({
         ] })
       }
     );
-  }, [selectedShift, isCurrentDate, isFutureDate, getPerformanceColor, handleDayClick, year, month, configuredTimezone, animationComplete, hasRealData]);
+  }, [selectedShiftId, isCurrentDate, isFutureDate, getPerformanceColor, handleDayClick, year, month, configuredTimezone, animationComplete, hasRealData]);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `calendar-wrapper space-y-6 ${className || ""} ${animationComplete ? "animation-complete" : ""}`, children: [
     /* @__PURE__ */ jsxRuntime.jsx("style", { dangerouslySetInnerHTML: { __html: styles } }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-1 border border-gray-200 rounded-lg p-1 bg-gray-50", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          onClick: () => handleShiftChange("day"),
-          className: `px-4 py-2 text-sm font-medium rounded-md ${animationComplete ? "transition-all duration-200" : ""} ${selectedShift === "day" ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : `text-gray-600 ${animationComplete ? "hover:text-gray-900 hover:bg-gray-100" : ""}`}`,
-          children: "Day Shift"
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          onClick: () => handleShiftChange("night"),
-          className: `px-4 py-2 text-sm font-medium rounded-md ${animationComplete ? "transition-all duration-200" : ""} ${selectedShift === "night" ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : `text-gray-600 ${animationComplete ? "hover:text-gray-900 hover:bg-gray-100" : ""}`}`,
-          children: "Night Shift"
-        }
-      )
-    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-1 border border-gray-200 rounded-lg p-1 bg-gray-50", children: (availableShifts && availableShifts.length > 0 ? availableShifts : [
+      { id: 0, name: "Day Shift" },
+      { id: 1, name: "Night Shift" }
+    ]).sort((a, b) => a.id - b.id).map((shift) => /* @__PURE__ */ jsxRuntime.jsx(
+      "button",
+      {
+        onClick: () => handleShiftChange(shift.id),
+        className: `px-4 py-2 text-sm font-medium rounded-md ${animationComplete ? "transition-all duration-200" : ""} ${selectedShiftId === shift.id ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : `text-gray-600 ${animationComplete ? "hover:text-gray-900 hover:bg-gray-100" : ""}`}`,
+        children: shift.name
+      },
+      shift.id
+    )) }) }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-8", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "calendar-container bg-white rounded-xl shadow-sm border border-gray-100 p-3 sm:p-4 lg:p-6 transition-all duration-200 ease-in-out", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mb-3 sm:mb-4 lg:mb-6", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "font-semibold text-gray-900 text-base sm:text-lg", children: selectedShift === "day" ? "Day Shifts" : "Night Shifts" }),
+          /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "font-semibold text-gray-900 text-base sm:text-lg", children: (availableShifts?.find((s) => s.id === selectedShiftId)?.name || (selectedShiftId === 0 ? "Day" : selectedShiftId === 1 ? "Night" : `Shift ${selectedShiftId}`)) + "s" }),
           /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs sm:text-sm text-gray-500 mt-1", children: "Calendar view of daily performance" })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid gap-3 sm:gap-4 lg:gap-6", children: [
@@ -34659,7 +35056,7 @@ var WorkspaceHistoryCalendar = ({
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mb-3 sm:mb-4 lg:mb-6", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("h3", { className: "font-semibold text-gray-900 text-base sm:text-lg", children: [
             "Monthly Summary - ",
-            selectedShift === "day" ? "Day Shift" : "Night Shift"
+            availableShifts?.find((s) => s.id === selectedShiftId)?.name || (selectedShiftId === 0 ? "Day Shift" : selectedShiftId === 1 ? "Night Shift" : `Shift ${selectedShiftId}`)
           ] }),
           /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs sm:text-sm text-gray-500 mt-1", children: "Overview of monthly performance metrics" })
         ] }),
@@ -34733,10 +35130,11 @@ var WorkspaceMonthlyHistory = ({
   month,
   year,
   workspaceId,
-  selectedShift = "day",
+  selectedShiftId = 0,
   onDateSelect,
   onMonthNavigate,
   onShiftChange,
+  availableShifts,
   monthlyDataLoading = false,
   className = ""
 }) => {
@@ -34754,7 +35152,7 @@ var WorkspaceMonthlyHistory = ({
         const date = new Date(d.date);
         return date.getDate() === day;
       });
-      const shiftData = dayData ? selectedShift === "day" ? dayData.dayShift : dayData.nightShift : null;
+      const shiftData = dayData ? getShiftData(dayData, selectedShiftId) : null;
       const idealOutput = shiftData ? shiftData.idealOutput : 0;
       if (idealOutput > 0) {
         lastSetTarget = idealOutput;
@@ -34766,7 +35164,7 @@ var WorkspaceMonthlyHistory = ({
         const date = new Date(d.date);
         return date.getDate() === day;
       });
-      const shiftData = dayData ? selectedShift === "day" ? dayData.dayShift : dayData.nightShift : null;
+      const shiftData = dayData ? getShiftData(dayData, selectedShiftId) : null;
       const output = shiftData && hasRealData(shiftData) ? shiftData.output : 0;
       const idealOutput = shiftData ? shiftData.idealOutput : 0;
       if (output > maxOutput) maxOutput = output;
@@ -34788,7 +35186,7 @@ var WorkspaceMonthlyHistory = ({
     const calculatedMax = Math.max(maxOutput, lastSetTarget);
     const yAxisMax = calculatedMax > 0 ? calculatedMax * 1.1 : 100;
     return { data: dailyData, maxOutput, lastSetTarget, yAxisMax };
-  }, [data, month, year, selectedShift]);
+  }, [data, month, year, selectedShiftId]);
   const yAxisTicks = React23.useMemo(() => {
     const max = chartData.yAxisMax;
     const target = chartData.lastSetTarget;
@@ -34811,7 +35209,7 @@ var WorkspaceMonthlyHistory = ({
     return Array.from(new Set(ticks)).filter((v) => v >= 0 && v <= max).sort((a, b) => a - b);
   }, [chartData.yAxisMax, chartData.lastSetTarget]);
   const pieChartData = React23.useMemo(() => {
-    const validShifts = data.map((d) => selectedShift === "day" ? d.dayShift : d.nightShift).filter(hasRealData);
+    const validShifts = data.map((d) => getShiftData(d, selectedShiftId)).filter(hasRealData);
     if (validShifts.length === 0) return [];
     const totalIdleTime = validShifts.reduce((sum, shift) => sum + shift.idleTime, 0);
     const totalShiftTime = validShifts.length * 8 * 3600;
@@ -34820,9 +35218,9 @@ var WorkspaceMonthlyHistory = ({
       { name: "Productive", value: Math.round(activeTime / totalShiftTime * 100) },
       { name: "Idle", value: Math.round(totalIdleTime / totalShiftTime * 100) }
     ];
-  }, [data, selectedShift]);
+  }, [data, selectedShiftId]);
   const metrics2 = React23.useMemo(() => {
-    const validShifts = data.map((d) => selectedShift === "day" ? d.dayShift : d.nightShift).filter(hasRealData);
+    const validShifts = data.map((d) => getShiftData(d, selectedShiftId)).filter(hasRealData);
     if (validShifts.length === 0) return null;
     const totalEfficiency = validShifts.reduce((sum, shift) => sum + shift.efficiency, 0);
     const totalCycleTime = validShifts.reduce((sum, shift) => sum + shift.cycleTime, 0);
@@ -34842,7 +35240,7 @@ var WorkspaceMonthlyHistory = ({
       totalOutput,
       avgIdleTime: Math.round(totalIdleTime / validShifts.length)
     };
-  }, [data, selectedShift]);
+  }, [data, selectedShiftId]);
   const calendarData = React23.useMemo(() => {
     const startOfMonth = new Date(year, month, 1);
     const endOfMonth = new Date(year, month + 1, 0);
@@ -34869,17 +35267,17 @@ var WorkspaceMonthlyHistory = ({
       source: "monthly_history",
       workspace_id: workspaceId,
       date: formattedDate,
-      shift: selectedShift
+      shift_id: selectedShiftId
     });
-    onDateSelect(formattedDate, selectedShift);
-  }, [workspaceId, selectedShift, onDateSelect]);
-  const handleShiftChange = React23.useCallback((shift) => {
+    onDateSelect(formattedDate, selectedShiftId);
+  }, [workspaceId, selectedShiftId, onDateSelect]);
+  const handleShiftChange = React23.useCallback((shiftId) => {
     trackCoreEvent("Workspace Monthly History Shift Changed", {
       workspace_id: workspaceId,
-      new_shift: shift
+      new_shift_id: shiftId
     });
     if (onShiftChange) {
-      onShiftChange(shift);
+      onShiftChange(shiftId);
     }
   }, [workspaceId, onShiftChange]);
   if (monthlyDataLoading) {
@@ -34892,24 +35290,18 @@ var WorkspaceMonthlyHistory = ({
     ) });
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex flex-col gap-2 min-h-0 overflow-y-auto pb-6 ${className}`, children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center mb-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-1 border border-gray-200 rounded-lg p-1 bg-gray-50", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          onClick: () => handleShiftChange("day"),
-          className: `px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 ${selectedShift === "day" ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : "text-gray-600 hover:text-gray-900 hover:bg-gray-100"}`,
-          children: "Day Shift"
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          onClick: () => handleShiftChange("night"),
-          className: `px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 ${selectedShift === "night" ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : "text-gray-600 hover:text-gray-900 hover:bg-gray-100"}`,
-          children: "Night Shift"
-        }
-      )
-    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center mb-4", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-1 border border-gray-200 rounded-lg p-1 bg-gray-50", children: (availableShifts && availableShifts.length > 0 ? availableShifts : [
+      { id: 0, name: "Day Shift" },
+      { id: 1, name: "Night Shift" }
+    ]).sort((a, b) => a.id - b.id).map((shift) => /* @__PURE__ */ jsxRuntime.jsx(
+      "button",
+      {
+        onClick: () => handleShiftChange(shift.id),
+        className: `px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 ${selectedShiftId === shift.id ? "bg-white text-blue-600 shadow-sm ring-1 ring-gray-200" : "text-gray-600 hover:text-gray-900 hover:bg-gray-100"}`,
+        children: shift.name
+      },
+      shift.id
+    )) }) }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-1 lg:grid-cols-2 gap-6 mt-6", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-white rounded-xl shadow-sm border border-gray-100 p-6", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-center items-center mb-6 space-x-4", children: [
@@ -34973,7 +35365,7 @@ var WorkspaceMonthlyHistory = ({
           if (!dayNumber || dayNumber > new Date(year, month + 1, 0).getDate()) {
             return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "aspect-square relative", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border border-gray-100 dark:border-gray-700 rounded-lg bg-gray-50 dark:bg-gray-800" }) }, index);
           }
-          const shiftData = day ? selectedShift === "day" ? day.dayShift : day.nightShift : null;
+          const shiftData = day ? getShiftData(day, selectedShiftId) : null;
           const hasData = shiftData ? hasRealData(shiftData) : false;
           const isToday = (/* @__PURE__ */ new Date()).getDate() === dayNumber && (/* @__PURE__ */ new Date()).getMonth() === month && (/* @__PURE__ */ new Date()).getFullYear() === year;
           const isFuture = new Date(year, month, dayNumber) > /* @__PURE__ */ new Date();
@@ -35300,7 +35692,8 @@ var WorkspacePdfGenerator = ({ workspace, className }) => {
         month: "long",
         timeZone: "Asia/Kolkata"
       });
-      const shiftType = "Day Shift";
+      const rawShiftType = workspace.shift_type || (workspace.shift_id === 0 ? "Day" : workspace.shift_id === 1 ? "Night" : `Shift ${workspace.shift_id}`);
+      const shiftType = rawShiftType.toLowerCase().includes("shift") ? rawShiftType : `${rawShiftType} Shift`;
       doc.text(`${date}`, 20, 63);
       doc.text(`${shiftType}`, 20, 71);
       const currentTime = (/* @__PURE__ */ new Date()).toLocaleTimeString("en-IN", {
@@ -35450,13 +35843,21 @@ var WorkspacePdfGenerator = ({ workspace, className }) => {
     }
   );
 };
+var getShiftDisplayName2 = (shiftId, availableShifts) => {
+  const shift = availableShifts?.find((s) => s.id === shiftId);
+  if (shift) return shift.name;
+  if (shiftId === 0) return "Day Shift";
+  if (shiftId === 1) return "Night Shift";
+  return `Shift ${shiftId}`;
+};
 var WorkspaceMonthlyPdfGenerator = ({
   workspaceId,
   workspaceName,
   monthlyData,
   selectedMonth,
   selectedYear,
-  selectedShift,
+  selectedShiftId,
+  availableShifts,
   className
 }) => {
   const [isGenerating, setIsGenerating] = React23.useState(false);
@@ -35468,7 +35869,7 @@ var WorkspaceMonthlyPdfGenerator = ({
         workspace_name: workspaceName,
         month: selectedMonth,
         year: selectedYear,
-        shift: selectedShift
+        shift_id: selectedShiftId
       });
       const doc = new jsPDF.jsPDF();
       doc.setFontSize(14);
@@ -35502,7 +35903,7 @@ var WorkspaceMonthlyPdfGenerator = ({
         year: "numeric",
         timeZone: "Asia/Kolkata"
       });
-      const shiftType = selectedShift === "day" ? "Day Shift" : "Night Shift";
+      const shiftType = getShiftDisplayName2(selectedShiftId, availableShifts);
       doc.text(`${monthName}`, 20, 65);
       doc.text(`${shiftType}`, 20, 73);
       const startDate = new Date(selectedYear, selectedMonth, 1);
@@ -35531,7 +35932,7 @@ var WorkspaceMonthlyPdfGenerator = ({
         return date.getMonth() === selectedMonth && date.getFullYear() === selectedYear;
       });
       const validShifts = validDays.map(
-        (day) => selectedShift === "day" ? day.dayShift : day.nightShift
+        (day) => getShiftData(day, selectedShiftId)
       ).filter((shift) => shift.efficiency > 0);
       const monthlyMetrics = validShifts.length > 0 ? {
         avgEfficiency: validShifts.reduce((sum, shift) => sum + shift.efficiency, 0) / validShifts.length,
@@ -35619,7 +36020,7 @@ var WorkspaceMonthlyPdfGenerator = ({
         const recentDays = validDays.slice(-10).reverse();
         recentDays.forEach((dayData, index) => {
           if (yPos > 260) return;
-          const shift = selectedShift === "day" ? dayData.dayShift : dayData.nightShift;
+          const shift = getShiftData(dayData, selectedShiftId);
           if (shift.efficiency <= 0) return;
           if (index % 2 === 0) {
             doc.setFillColor(252, 252, 252);
@@ -37006,19 +37407,26 @@ var HealthStatusGrid = ({
 };
 var Timer2 = Timer_default;
 var DashboardHeader = React23.memo(({ lineTitle, className = "", headerControls, lineId }) => {
-  const { shiftConfig } = useDynamicShiftConfig(lineId);
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
   const timezone = useAppTimezone();
   const getShiftName = () => {
     const currentShift = getCurrentShift(timezone, shiftConfig);
-    return currentShift.shiftId === 0 ? "Day" : "Night";
+    const rawName = currentShift.shiftName || "Day";
+    return rawName.toLowerCase().includes("shift") ? rawName : `${rawName} Shift`;
   };
-  const getShiftIcon = () => {
-    const shift = getShiftName();
-    if (shift === "Day") {
+  const getShiftIcon2 = () => {
+    const currentShift = getCurrentShift(timezone, shiftConfig);
+    const shiftName = (currentShift.shiftName || "").toLowerCase();
+    if (shiftName.includes("day") || shiftName.includes("morning") || currentShift.shiftId === 0) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
-    } else {
+    }
+    if (shiftName.includes("afternoon") || shiftName.includes("noon") || shiftName.includes("midday")) {
+      return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
+    }
+    if (shiftName.includes("night") || shiftName.includes("evening") || currentShift.shiftId === 1) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
     }
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex flex-col sm:flex-row items-start sm:items-center justify-between w-full gap-2 sm:gap-4 ${className}`, children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
@@ -37028,13 +37436,10 @@ var DashboardHeader = React23.memo(({ lineTitle, className = "", headerControls,
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-0.5 sm:mt-2 inline-flex flex-wrap items-center gap-1.5 sm:gap-3", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-[10px] sm:text-xs md:text-sm font-medium text-gray-500 sm:text-gray-600 whitespace-nowrap", children: /* @__PURE__ */ jsxRuntime.jsx(Timer2, {}) }),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "inline-flex items-center gap-0.5 sm:gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-500 sm:text-gray-600 scale-90 sm:scale-100", children: getShiftIcon() }),
-          /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-[10px] sm:text-xs md:text-sm font-medium text-gray-500 sm:text-gray-600 whitespace-nowrap", children: [
-            getShiftName(),
-            " Shift"
-          ] })
-        ] })
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center gap-0.5 sm:gap-1", children: isShiftConfigLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-4 w-16 sm:w-20 bg-gray-200 rounded animate-pulse" }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-500 sm:text-gray-600 scale-90 sm:scale-100", children: getShiftIcon2() }),
+          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-[10px] sm:text-xs md:text-sm font-medium text-gray-500 sm:text-gray-600 whitespace-nowrap", children: getShiftName() })
+        ] }) })
       ] })
     ] }),
     headerControls && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-1.5 sm:gap-3 md:gap-4 w-full sm:w-auto justify-end", children: headerControls })
@@ -42051,18 +42456,23 @@ var FactoryView = ({
       fetchHourlyData();
     }
   }, [supabase, lineDataHooks, effectiveLineIds, lineNames, factoryName, timezone, shiftConfig, productIds]);
+  const getCurrentShiftInfo = () => {
+    return getCurrentShift(timezone, shiftConfig);
+  };
   const getShiftName = () => {
-    const now2 = /* @__PURE__ */ new Date();
-    const currentHour = now2.getHours();
-    return currentHour >= 6 && currentHour < 18 ? "Day" : "Night";
+    const currentShift = getCurrentShiftInfo();
+    return (currentShift.shiftName || "Day").replace(/ Shift$/i, "");
   };
-  const getShiftIcon = () => {
-    const shift = getShiftName();
-    if (shift === "Day") {
+  const getShiftIcon2 = () => {
+    const currentShift = getCurrentShiftInfo();
+    const shiftNameLower = (currentShift.shiftName || "").toLowerCase();
+    if (shiftNameLower.includes("day") || shiftNameLower.includes("morning") || currentShift.shiftId === 0) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
-    } else {
+    }
+    if (shiftNameLower.includes("night") || shiftNameLower.includes("evening") || currentShift.shiftId === 1) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
     }
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
   };
   if (loading || lineDataHooks.some((hookData) => hookData.hook.loading)) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "animate-pulse space-y-4", children: [
@@ -42091,7 +42501,7 @@ var FactoryView = ({
           " IST"
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "inline-flex items-center gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-600", children: getShiftIcon() }),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-600", children: getShiftIcon2() }),
           /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm font-medium text-gray-600", children: [
             getShiftName(),
             " Shift"
@@ -43591,8 +44001,8 @@ var KPIDetailView = ({
     return (/* @__PURE__ */ new Date()).getFullYear();
   });
   const [monthlyData, setMonthlyData] = React23.useState([]);
-  const [underperformingWorkspaces, setUnderperformingWorkspaces] = React23.useState({ dayShift: [], nightShift: [] });
-  const [selectedShift, setSelectedShift] = React23.useState("day");
+  const [underperformingWorkspaces, setUnderperformingWorkspaces] = React23.useState({});
+  const [selectedShiftId, setSelectedShiftId] = React23.useState(0);
   const [showLineDataNotFound, setShowLineDataNotFound] = React23.useState(false);
   const navigation = useNavigation(navigate);
   const handleNavigate = navigate || navigation.navigate;
@@ -43622,20 +44032,22 @@ var KPIDetailView = ({
       setActiveTab("overview");
     }
   }, [urlDate, urlShift, urlTab]);
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(lineId);
   const getShiftName = React23.useCallback((shiftId) => {
-    return shiftId === 0 ? "Day" : "Night";
-  }, []);
-  const getShiftIcon = React23.useCallback((shiftId) => {
-    const shift = getShiftName(shiftId);
-    if (shift === "Day") {
+    return getShiftNameById(shiftId, configuredTimezone, shiftConfig);
+  }, [configuredTimezone, shiftConfig]);
+  const getShiftIcon2 = React23.useCallback((shiftId) => {
+    if (shiftId === 0) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
-    } else {
+    }
+    if (shiftId === 1) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
     }
-  }, [getShiftName]);
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
+  }, []);
   const getDaysDifference2 = React23.useCallback((date) => {
     const compareDate = new Date(date);
-    const shiftStartTime = dashboardConfig.shiftConfig?.dayShift?.startTime || "06:00";
+    const shiftStartTime = shiftConfig?.dayShift?.startTime || shiftConfig?.shifts?.[0]?.startTime || "06:00";
     const operationalTodayString = getOperationalDate(configuredTimezone, /* @__PURE__ */ new Date(), shiftStartTime);
     const operationalTodayDate = new Date(operationalTodayString);
     const compareDateInZone = new Date(compareDate.toLocaleString("en-US", { timeZone: configuredTimezone }));
@@ -43649,7 +44061,7 @@ var KPIDetailView = ({
     if (diffDays < -1) return `${Math.abs(diffDays)} days ago`;
     if (diffDays > 1) return `${diffDays} days ahead`;
     return "Today";
-  }, [configuredTimezone, dashboardConfig.shiftConfig]);
+  }, [configuredTimezone, shiftConfig]);
   const {
     metrics: metrics2,
     lineDetails,
@@ -43659,7 +44071,9 @@ var KPIDetailView = ({
   } = useRealtimeLineMetrics({
     lineId,
     date: typeof urlDate === "string" ? urlDate : void 0,
-    shiftId: parsedShiftId
+    shiftId: parsedShiftId,
+    enabled: !isShiftConfigLoading
+    // Pass enabled flag to useRealtimeLineMetrics if supported, or we need to add it
   });
   const {
     workspaces,
@@ -43668,7 +44082,9 @@ var KPIDetailView = ({
     refreshWorkspaces
   } = useLineWorkspaceMetrics(lineId, {
     initialDate: typeof urlDate === "string" ? urlDate : void 0,
-    initialShiftId: parsedShiftId
+    initialShiftId: parsedShiftId,
+    enabled: !isShiftConfigLoading
+    // Pass enabled flag to useLineWorkspaceMetrics if supported, or we need to add it
   });
   React23.useEffect(() => {
     if (activeTab === "monthly_history" && lineId) {
@@ -43681,7 +44097,9 @@ var KPIDetailView = ({
         dashboardService.getUnderperformingWorkspaces(
           lineId,
           currentMonth,
-          currentYear
+          currentYear,
+          shiftConfig?.shifts?.map((s) => s.shiftId)
+          // Pass dynamic shift IDs
         )
       ]).then(([monthlyMetrics, underperformingData]) => {
         console.log("Fetched monthly metrics data:", monthlyMetrics);
@@ -43693,18 +44111,8 @@ var KPIDetailView = ({
           if (!dayData) {
             dayData = {
               date,
-              dayShift: {
-                avg_efficiency: 0,
-                underperforming_workspaces: 0,
-                total_workspaces: 0,
-                compliance_percentage: 0
-              },
-              nightShift: {
-                avg_efficiency: 0,
-                underperforming_workspaces: 0,
-                total_workspaces: 0,
-                compliance_percentage: 0
-              }
+              shifts: {}
+              // Multi-shift structure: Record<number, ShiftData>
             };
             dayDataMap.set(dateKey, dayData);
           }
@@ -43712,46 +44120,46 @@ var KPIDetailView = ({
             avg_efficiency: metric.avg_efficiency || 0,
             underperforming_workspaces: metric.underperforming_workspaces || 0,
             total_workspaces: metric.total_workspaces || 0,
-            compliance_percentage: 95 + Math.random() * 5
+            compliance_percentage: 95 + Math.random() * 5,
             // Mock data: random value between 95-100%
+            hasData: true
           };
-          if (metric.shift_id === 0) {
-            dayData.dayShift = shiftData;
-          } else {
-            dayData.nightShift = shiftData;
-          }
+          dayData.shifts[metric.shift_id] = shiftData;
         });
         const transformedMonthlyData = Array.from(dayDataMap.values());
         console.log("Transformed monthly data for calendar:", transformedMonthlyData);
         setMonthlyData(transformedMonthlyData);
-        const mappedData = {
-          dayShift: (underperformingData.dayShift || []).map((ws) => ({
-            workspace_name: ws.workspace_name || "Unknown Workspace",
-            workspace_uuid: ws.workspace_uuid || ws.workspace_name || `unknown-${Math.random()}`,
-            avg_efficiency: ws.avg_efficiency || 0,
-            last_5_days: (ws.last_5_days || []).map((day) => ({
-              date: day.date,
-              efficiency: day.efficiency ?? 0,
-              performance_score: day.performance_score
-            }))
-          })),
-          nightShift: (underperformingData.nightShift || []).map((ws) => ({
-            workspace_name: ws.workspace_name || "Unknown Workspace",
-            workspace_uuid: ws.workspace_uuid || ws.workspace_name || `unknown-${Math.random()}`,
-            avg_efficiency: ws.avg_efficiency || 0,
-            last_5_days: (ws.last_5_days || []).map((day) => ({
-              date: day.date,
-              efficiency: day.efficiency ?? 0,
-              performance_score: day.performance_score
-            }))
+        const mapWorkspaces = (workspaces2) => (workspaces2 || []).map((ws) => ({
+          workspace_name: ws.workspace_name || "Unknown Workspace",
+          workspace_uuid: ws.workspace_uuid || ws.workspace_name || `unknown-${Math.random()}`,
+          avg_efficiency: ws.avg_efficiency || 0,
+          last_5_days: (ws.last_5_days || []).map((day) => ({
+            date: day.date,
+            efficiency: day.efficiency ?? 0,
+            performance_score: day.performance_score
           }))
-        };
+        }));
+        const mappedData = {};
+        if (underperformingData.dayShift) {
+          mappedData[0] = mapWorkspaces(underperformingData.dayShift);
+        }
+        if (underperformingData.nightShift) {
+          mappedData[1] = mapWorkspaces(underperformingData.nightShift);
+        }
+        Object.entries(underperformingData).forEach(([key, value]) => {
+          if (key !== "dayShift" && key !== "nightShift" && Array.isArray(value)) {
+            const shiftId = parseInt(key);
+            if (!isNaN(shiftId)) {
+              mappedData[shiftId] = mapWorkspaces(value);
+            }
+          }
+        });
         setUnderperformingWorkspaces(mappedData);
       }).catch((error) => {
         console.error("Error fetching monthly data:", error);
       });
     }
-  }, [activeTab, lineId, currentMonth, currentYear, supabase, dashboardConfig]);
+  }, [activeTab, lineId, currentMonth, currentYear, supabase, dashboardConfig, shiftConfig]);
   const lineInfo = React23.useMemo(() => {
     if (!metrics2 || !lineDetails || !lineDetails.factory) {
       return null;
@@ -43996,7 +44404,7 @@ var KPIDetailView = ({
       handleNavigate(backUrl);
     }
   }, [urlDate, urlShift, lineInfo, onBackClick, backLinkUrl, handleNavigate, urlMonth, urlYear, lineId, currentMonth, currentYear]);
-  if ((lineMetricsLoading || workspacesLoading) && !lineInfo && !metrics2) {
+  if ((lineMetricsLoading || workspacesLoading || isShiftConfigLoading) && !lineInfo && !metrics2) {
     return /* @__PURE__ */ jsxRuntime.jsx(LoadingPage, { message: "Loading line metrics..." });
   }
   if (lineMetricsError || workspacesError) {
@@ -44102,8 +44510,11 @@ var KPIDetailView = ({
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "sm:hidden mt-3 flex items-center justify-center gap-2", children: [
           /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-gray-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-gray-700", children: metrics2 && formatLocalDate(new Date(metrics2.date)) }) }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "inline-flex items-center gap-1 px-2.5 py-1 bg-gray-100 rounded-full", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-700 scale-90", children: getShiftIcon(metrics2.shift_id ?? 0) }),
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-gray-700", children: getShiftName(metrics2.shift_id ?? 0) })
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-700 scale-90", children: getShiftIcon2(metrics2.shift_id ?? 0) }),
+            /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs font-medium text-gray-700", children: [
+              getShiftName(metrics2.shift_id ?? 0).replace(/ Shift$/i, ""),
+              " Shift"
+            ] })
           ] }),
           !urlDate && !urlShift ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-green-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-green-700", children: /* @__PURE__ */ jsxRuntime.jsx(ISTTimer_default, {}) }) }) : urlDate && metrics2.date ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-blue-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-blue-700", children: getDaysDifference2(metrics2.date) }) }) : null
         ] }),
@@ -44119,9 +44530,9 @@ var KPIDetailView = ({
             /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-px h-4 bg-blue-300" })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon(metrics2.shift_id ?? 0) }),
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon2(metrics2.shift_id ?? 0) }),
             /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm md:text-base font-medium text-blue-600", children: [
-              getShiftName(metrics2.shift_id ?? 0),
+              getShiftName(metrics2.shift_id ?? 0).replace(/ Shift$/i, ""),
               " Shift"
             ] })
           ] })
@@ -44166,7 +44577,7 @@ var KPIDetailView = ({
             )
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center space-x-3 ml-auto", children: [
-            lineInfo && activeTab === "overview" && /* @__PURE__ */ jsxRuntime.jsx(LinePdfGenerator, { lineInfo, workspaceData: workspaces || [] }),
+            lineInfo && activeTab === "overview" && /* @__PURE__ */ jsxRuntime.jsx(LinePdfGenerator, { lineInfo, workspaceData: workspaces || [], shiftName: getShiftName(lineInfo.shift_id) }),
             activeTab === "monthly_history" && /* @__PURE__ */ jsxRuntime.jsx(
               LineMonthlyPdfGenerator,
               {
@@ -44176,7 +44587,7 @@ var KPIDetailView = ({
                 underperformingWorkspaces,
                 selectedMonth: currentMonth,
                 selectedYear: currentYear,
-                selectedShift
+                selectedShiftId
               }
             )
           ] })
@@ -44279,8 +44690,9 @@ var KPIDetailView = ({
               monthlyData,
               month: currentMonth,
               year: currentYear,
-              selectedShift,
-              onShiftChange: setSelectedShift
+              selectedShiftId,
+              onShiftChange: setSelectedShiftId,
+              availableShifts: shiftConfig?.shifts?.map((s) => ({ id: s.shiftId, name: s.shiftName }))
             }
           )
         ]
@@ -44431,7 +44843,8 @@ var KPIsOverviewView = ({
   const dashboardConfig = useDashboardConfig();
   const navigation = useNavigation(navigate);
   const dateTimeConfig = useDateTimeConfig();
-  const shiftConfig = useShiftConfig();
+  const representativeLineId = lineIds?.[0] || lines[0]?.id;
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(representativeLineId);
   const supervisorEnabled = dashboardConfig?.supervisorConfig?.enabled || false;
   const dbTimezone = useAppTimezone();
   const configuredTimezone = dbTimezone || dateTimeConfig.defaultTimezone || "UTC";
@@ -44493,15 +44906,21 @@ var KPIsOverviewView = ({
     return date.toLocaleDateString("en-US", options);
   };
   const currentShiftDetails = getCurrentShift(configuredTimezone, shiftConfig);
-  const shiftName = currentShiftDetails.shiftId === 0 ? "Day" : "Night";
-  const getShiftIcon = (shiftId) => {
-    if (shiftId === 0) {
+  const shiftName = (currentShiftDetails.shiftName || "Day").replace(/ Shift$/i, "");
+  const getShiftIcon2 = (shiftId) => {
+    const shiftNameLower = shiftName.toLowerCase();
+    if (shiftNameLower.includes("day") || shiftNameLower.includes("morning") || shiftId === 0) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
-    } else {
+    }
+    if (shiftNameLower.includes("afternoon") || shiftNameLower.includes("noon") || shiftNameLower.includes("midday")) {
+      return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
+    }
+    if (shiftNameLower.includes("night") || shiftNameLower.includes("evening") || shiftId === 1) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
     }
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
   };
-  if (loading) {
+  if (loading || isShiftConfigLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx(LoadingPage, { message: "Loading production lines..." });
   }
   if (error) {
@@ -44609,7 +45028,7 @@ var KPIsOverviewView = ({
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "sm:hidden mt-3 flex items-center justify-center gap-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-gray-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-gray-700", children: formatLocalDate2(/* @__PURE__ */ new Date()) }) }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "inline-flex items-center gap-1 px-2.5 py-1 bg-gray-100 rounded-full", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-700 scale-90", children: getShiftIcon(currentShiftDetails.shiftId) }),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-700 scale-90", children: getShiftIcon2(currentShiftDetails.shiftId) }),
           /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-gray-700", children: shiftName })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-green-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-green-700", children: /* @__PURE__ */ jsxRuntime.jsx(ISTTimer_default, {}) }) })
@@ -44620,7 +45039,7 @@ var KPIsOverviewView = ({
         /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm md:text-base font-medium text-blue-600", children: formatLocalDate2(/* @__PURE__ */ new Date()) }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-px h-4 bg-blue-300" }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon(currentShiftDetails.shiftId) }),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon2(currentShiftDetails.shiftId) }),
           /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm md:text-base font-medium text-blue-600", children: [
             shiftName,
             " Shift"
@@ -44648,10 +45067,10 @@ var HeaderRibbon = React23.memo(({
   currentDate,
   currentMobileDate,
   shiftId,
-  getShiftIcon,
+  getShiftIcon: getShiftIcon2,
   getShiftName
 }) => {
-  const shiftIcon = React23.useMemo(() => getShiftIcon(shiftId), [getShiftIcon, shiftId]);
+  const shiftIcon = React23.useMemo(() => getShiftIcon2(shiftId), [getShiftIcon2, shiftId]);
   const shiftName = React23.useMemo(() => getShiftName(shiftId), [getShiftName, shiftId]);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "sm:hidden mt-3 flex items-center justify-center gap-2", children: [
@@ -44670,7 +45089,7 @@ var HeaderRibbon = React23.memo(({
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: shiftIcon }),
         /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm md:text-base font-medium text-blue-600", children: [
-          shiftName,
+          shiftName.replace(/ Shift$/i, ""),
           " Shift"
         ] })
       ] })
@@ -44797,6 +45216,7 @@ var LeaderboardDetailView = React23.memo(({
   const navigation = useNavigation();
   const entityConfig = useEntityConfig();
   const [sortAscending, setSortAscending] = React23.useState(false);
+  const timezone = useAppTimezone();
   const [isMobile, setIsMobile] = React23.useState(false);
   React23__namespace.default.useEffect(() => {
     const checkMobile = () => setIsMobile(window.innerWidth < 640);
@@ -44825,6 +45245,9 @@ var LeaderboardDetailView = React23.memo(({
     () => typeof shift === "number" ? shift : typeof shift === "string" ? parseInt(shift) : void 0,
     [shift]
   );
+  const availableLineId = Object.keys(configuredLineNames)[0];
+  const effectiveLineId = lineId || userAccessibleLineIds?.[0] || availableLineId;
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(effectiveLineId);
   const {
     workspaces,
     loading: workspacesLoading,
@@ -44833,20 +45256,31 @@ var LeaderboardDetailView = React23.memo(({
   } = useAllWorkspaceMetrics({
     initialDate: date,
     initialShiftId: typeof shift === "number" ? shift : typeof shift === "string" ? parseInt(shift) : void 0,
-    allowedLineIds: userAccessibleLineIds
+    allowedLineIds: userAccessibleLineIds,
     // Filter to user's accessible lines only
+    enabled: !isShiftConfigLoading
+    // Pass enabled flag
   });
   const getShiftName = React23.useCallback((shiftId2) => {
-    if (shiftId2 === void 0) return "Day";
-    return shiftId2 === 0 ? "Day" : "Night";
-  }, []);
-  const getShiftIcon = React23.useCallback((shiftId2) => {
-    const shift2 = getShiftName(shiftId2);
-    if (shift2 === "Day") {
+    if (shiftId2 !== void 0) {
+      return getShiftNameById(shiftId2, timezone || "Asia/Kolkata", shiftConfig);
+    }
+    const currentShift = getCurrentShift(timezone || "Asia/Kolkata", shiftConfig);
+    return currentShift.shiftName || getShiftNameById(currentShift.shiftId, timezone || "Asia/Kolkata", shiftConfig);
+  }, [timezone, shiftConfig]);
+  const getShiftIcon2 = React23.useCallback((shiftId2) => {
+    const effectiveShiftId = shiftId2 !== void 0 ? shiftId2 : getCurrentShift(timezone || "Asia/Kolkata", shiftConfig).shiftId;
+    const shiftNameLower = getShiftName(effectiveShiftId).toLowerCase();
+    if (shiftNameLower.includes("day") || shiftNameLower.includes("morning")) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
-    } else {
+    }
+    if (shiftNameLower.includes("afternoon") || shiftNameLower.includes("noon") || shiftNameLower.includes("midday")) {
+      return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
+    }
+    if (shiftNameLower.includes("night") || shiftNameLower.includes("evening")) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
     }
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
   }, [getShiftName]);
   const formatDate = React23.useCallback((date2) => {
     return new Intl.DateTimeFormat("en-US", {
@@ -44896,13 +45330,27 @@ var LeaderboardDetailView = React23.memo(({
     });
     const displayName = workspace.displayName || getWorkspaceDisplayName(workspace.workspace_name, workspace.line_id);
     const navParams = workspace.workspace_uuid ? getWorkspaceNavigationParams(workspace.workspace_uuid, displayName, workspace.line_id) : "";
-    const returnToParam = `&returnTo=${encodeURIComponent(`/leaderboard`)}`;
+    const contextParams = new URLSearchParams();
+    if (date) {
+      contextParams.set("date", date);
+    }
+    if (shiftId !== void 0) {
+      contextParams.set("shift", shiftId.toString());
+    }
+    contextParams.set("returnTo", encodeURIComponent("/leaderboard"));
+    const contextParamString = contextParams.toString();
     if (onWorkspaceClick) {
-      onWorkspaceClick(workspace, rank);
+      const combinedParams = navParams ? `${navParams}&${contextParamString}` : `?${contextParamString}`;
+      const enhancedWorkspace = {
+        ...workspace,
+        navParams: combinedParams
+      };
+      onWorkspaceClick(enhancedWorkspace, rank);
     } else {
-      navigation.navigate(`/workspace/${workspace.workspace_uuid}${navParams}${returnToParam}`);
+      const combinedParams = navParams ? `${navParams}&${contextParamString}` : `?${contextParamString}`;
+      navigation.navigate(`/workspace/${workspace.workspace_uuid}${combinedParams}`);
     }
-  }, [onWorkspaceClick, navigation, lineId, workspacesLength]);
+  }, [onWorkspaceClick, navigation, workspacesLength, date, shiftId]);
   const workspaceDisplayData = React23.useMemo(() => {
     if (!workspaces) return [];
     return workspaces.map((ws) => ({
@@ -44918,7 +45366,7 @@ var LeaderboardDetailView = React23.memo(({
       return sortAscending ? effA - effB : effB - effA;
     });
   }, [workspaceDisplayData, sortAscending]);
-  const loading = workspacesLoading;
+  const loading = workspacesLoading || isShiftConfigLoading;
   const error = workspacesError;
   const currentDateFormatted = React23.useMemo(() => {
     const dateStr = (/* @__PURE__ */ new Date()).toDateString();
@@ -45030,7 +45478,7 @@ var LeaderboardDetailView = React23.memo(({
           currentDate: currentDateFormatted,
           currentMobileDate: currentMobileDateFormatted,
           shiftId,
-          getShiftIcon,
+          getShiftIcon: getShiftIcon2,
           getShiftName
         }
       )
@@ -45389,6 +45837,23 @@ var ProfileView = () => {
   ] }) });
 };
 var ProfileView_default = ProfileView;
+var DEFAULT_TIMEZONE = "Asia/Kolkata";
+var DEFAULT_SHIFTS = [
+  {
+    shiftId: 0,
+    shiftName: "Day Shift",
+    startTime: "08:00",
+    endTime: "16:00",
+    breaks: []
+  },
+  {
+    shiftId: 1,
+    shiftName: "Night Shift",
+    startTime: "20:00",
+    endTime: "04:00",
+    breaks: []
+  }
+];
 var calculateShiftHours = (startTime, endTime, breaks = []) => {
   if (!startTime || !endTime) return 8;
   const [startHour, startMinute] = startTime.split(":").map(Number);
@@ -45455,6 +45920,19 @@ var formatBreaks = (breaks) => {
     }))
   };
 };
+var getShiftIcon = (shiftId, shiftName) => {
+  const nameLower = shiftName.toLowerCase();
+  if (nameLower.includes("day") || nameLower.includes("morning") || shiftId === 0) {
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-5 h-5 text-gray-600", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
+  }
+  if (nameLower.includes("afternoon") || nameLower.includes("noon") || nameLower.includes("midday")) {
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-5 h-5 text-gray-600", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
+  }
+  if (nameLower.includes("night") || nameLower.includes("evening") || shiftId === 1) {
+    return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-5 h-5 text-gray-600", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Clock, { className: "w-5 h-5 text-gray-600" });
+};
 var BreakRow = React23.memo(({
   break: breakItem,
   onUpdate,
@@ -45582,9 +46060,13 @@ var ShiftPanel = React23.memo(({
   onBreakUpdate,
   onBreakRemove,
   onBreakAdd,
-  shiftHours
+  shiftHours,
+  shiftId,
+  onShiftNameChange,
+  canDelete = false,
+  onDelete
 }) => {
-  const panelId = `panel-${title.toLowerCase().replace(/\s+/g, "-")}`;
+  const panelId = `panel-${title.toLowerCase().replace(/\s+/g, "-")}-${shiftId ?? 0}`;
   const storageKey = `shift_panel_${panelId}_minimized`;
   const [isMinimized, setIsMinimized] = React23.useState(true);
   React23.useEffect(() => {
@@ -45611,7 +46093,7 @@ var ShiftPanel = React23.memo(({
             "button",
             {
               onClick: toggleMinimize,
-              className: "flex items-center gap-2 sm:gap-3 text-base sm:text-lg font-medium transition-colors duration-200 \n              focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 rounded-lg \n              hover:bg-blue-50 px-2 sm:px-3 py-1.5 sm:py-2 group w-full sm:w-auto justify-start",
+              className: "flex items-center gap-2 sm:gap-3 text-base sm:text-lg font-medium transition-colors duration-200\n              focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 rounded-lg\n              hover:bg-blue-50 px-2 sm:px-3 py-1.5 sm:py-2 group w-full sm:w-auto justify-start",
               "aria-expanded": !isMinimized,
               "aria-controls": panelId,
               children: [
@@ -45628,15 +46110,42 @@ var ShiftPanel = React23.memo(({
               ]
             }
           ),
-          /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs sm:text-sm font-medium text-gray-600 text-center sm:text-right sm:mr-2", children: [
-            "Total Shift Hours: ",
-            shiftHours,
-            " hours"
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 sm:gap-4", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs sm:text-sm font-medium text-gray-600 text-center sm:text-right", children: [
+              "Total Shift Hours: ",
+              shiftHours,
+              " hours"
+            ] }),
+            canDelete && onDelete && /* @__PURE__ */ jsxRuntime.jsx(
+              "button",
+              {
+                onClick: (e) => {
+                  e.stopPropagation();
+                  onDelete();
+                },
+                className: "p-1.5 text-gray-400 hover:text-red-500 hover:bg-red-50 rounded transition-colors",
+                "aria-label": "Delete shift",
+                children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Trash2, { className: "w-4 h-4" })
+              }
+            )
           ] })
         ] })
       }
     ),
     !isMinimized && /* @__PURE__ */ jsxRuntime.jsxs("div", { id: panelId, className: "p-3 sm:p-4 md:p-6 border-t border-gray-200 w-full bg-white", children: [
+      onShiftNameChange && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mb-4 sm:mb-6", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("label", { className: "block text-xs sm:text-sm font-medium text-gray-700 mb-1", children: "Shift Name" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "input",
+          {
+            type: "text",
+            value: title,
+            onChange: (e) => onShiftNameChange(e.target.value),
+            placeholder: "Enter shift name",
+            className: "w-full sm:w-64 px-3 py-2 border border-gray-300 rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
+          }
+        )
+      ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-1 sm:grid-cols-2 gap-3 sm:gap-4 md:gap-6 mb-4 sm:mb-6 w-full", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "w-full", children: [
           /* @__PURE__ */ jsxRuntime.jsx("label", { className: "block text-xs sm:text-sm font-medium text-gray-700 mb-1", children: "Shift Start Time" }),
@@ -45730,16 +46239,9 @@ var ShiftsView = ({
     () => lineIds.map((id3) => ({
       id: id3,
       name: lineNames[id3] || `Line ${id3.substring(0, 4)}`,
-      dayShift: {
-        startTime: "08:00",
-        endTime: "16:00",
-        breaks: []
-      },
-      nightShift: {
-        startTime: "20:00",
-        endTime: "04:00",
-        breaks: []
-      },
+      timezone: DEFAULT_TIMEZONE,
+      shifts: DEFAULT_SHIFTS.map((s) => ({ ...s })),
+      // Clone default shifts
       isOpen: true,
       isSaving: false,
       saveSuccess: false
@@ -45763,60 +46265,47 @@ var ShiftsView = ({
       try {
         setLoading(true);
         setError(null);
-        const { data: dayShiftOperatingHours, error: dayShiftError } = await supabase.from("line_operating_hours").select("line_id, start_time, end_time, breaks").eq("shift_id", 0).in("line_id", lineIds);
-        if (dayShiftError) {
-          console.error("Error fetching day shift operating hours:", dayShiftError);
-          showToast("error", "Error loading day shift data");
-          setError("Failed to load day shift data");
-          return;
-        }
-        const { data: nightShiftOperatingHours, error: nightShiftError } = await supabase.from("line_operating_hours").select("line_id, start_time, end_time, breaks").eq("shift_id", 1).in("line_id", lineIds);
-        if (nightShiftError) {
-          console.error("Error fetching night shift operating hours:", nightShiftError);
-          showToast("error", "Error loading night shift data");
-          setError("Failed to load night shift data");
+        const { data: allShiftsData, error: shiftsError } = await supabase.from("line_operating_hours").select("line_id, shift_id, shift_name, start_time, end_time, breaks, timezone").in("line_id", lineIds).order("shift_id", { ascending: true });
+        if (shiftsError) {
+          console.error("[ShiftsView] Error fetching shift configurations:", shiftsError);
+          showToast("error", "Error loading shift data");
+          setError("Failed to load shift data");
           return;
         }
-        const dayShiftHoursMap = (dayShiftOperatingHours || []).reduce((map, item) => {
-          map[item.line_id] = {
-            startTime: item.start_time,
-            endTime: item.end_time,
-            breaks: parseBreaksFromDB(item.breaks)
-          };
-          return map;
-        }, {});
-        const nightShiftHoursMap = (nightShiftOperatingHours || []).reduce((map, item) => {
-          map[item.line_id] = {
-            startTime: item.start_time,
-            endTime: item.end_time,
-            breaks: parseBreaksFromDB(item.breaks)
-          };
-          return map;
-        }, {});
-        setLineConfigs((prev) => prev.map((config) => {
-          const typedConfig = config;
-          const lineId = typedConfig.id;
-          const newConfig = { ...typedConfig };
-          if (dayShiftHoursMap[lineId]) {
-            newConfig.dayShift = {
-              ...newConfig.dayShift,
-              ...dayShiftHoursMap[lineId]
-            };
-          }
-          if (nightShiftHoursMap[lineId]) {
-            newConfig.nightShift = {
-              ...newConfig.nightShift,
-              ...nightShiftHoursMap[lineId]
-            };
-          }
-          if (newConfig.isOpen === void 0) {
-            newConfig.isOpen = getStoredLineState(lineId);
+        console.log("[ShiftsView] Fetched shifts from DB:", allShiftsData);
+        const shiftsByLine = {};
+        const timezoneByLine = {};
+        (allShiftsData || []).forEach((row) => {
+          if (!shiftsByLine[row.line_id]) {
+            shiftsByLine[row.line_id] = [];
+          }
+          shiftsByLine[row.line_id].push({
+            shiftId: row.shift_id,
+            shiftName: row.shift_name || `Shift ${row.shift_id}`,
+            startTime: row.start_time || "08:00",
+            endTime: row.end_time || "16:00",
+            breaks: parseBreaksFromDB(row.breaks),
+            timezone: row.timezone
+          });
+          if (row.timezone && !timezoneByLine[row.line_id]) {
+            timezoneByLine[row.line_id] = row.timezone;
           }
-          return newConfig;
+        });
+        setLineConfigs((prev) => prev.map((config) => {
+          const lineId = config.id;
+          const lineShifts = shiftsByLine[lineId];
+          const lineTimezone = timezoneByLine[lineId] || DEFAULT_TIMEZONE;
+          const shifts = lineShifts && lineShifts.length > 0 ? lineShifts.sort((a, b) => a.shiftId - b.shiftId) : DEFAULT_SHIFTS.map((s) => ({ ...s }));
+          return {
+            ...config,
+            timezone: lineTimezone,
+            shifts,
+            isOpen: config.isOpen ?? getStoredLineState(lineId)
+          };
         }));
         setLoading(false);
       } catch (error2) {
-        console.error("Error fetching shift configurations:", error2);
+        console.error("[ShiftsView] Error fetching shift configurations:", error2);
         showToast("error", "Failed to load shift configurations");
         setError("Failed to load shift configurations");
         setLoading(false);
@@ -45826,195 +46315,125 @@ var ShiftsView = ({
   }, [lineIds, showToast]);
   React23.useCallback((lineId) => {
     setLineConfigs((prev) => {
-      const typedPrev = prev;
-      const newIsOpen = !typedPrev.find((config) => config.id === lineId)?.isOpen;
+      const newIsOpen = !prev.find((config) => config.id === lineId)?.isOpen;
       localStorage.setItem(`line_${lineId}_open`, JSON.stringify(newIsOpen));
-      return typedPrev.map(
+      return prev.map(
         (config) => config.id === lineId ? { ...config, isOpen: newIsOpen } : config
       );
     });
   }, []);
-  const updateDayShiftStartTime = React23.useCallback((lineId, value) => {
-    setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const updatedDayShift = { ...typedConfig.dayShift, startTime: value };
-        return {
-          ...typedConfig,
-          dayShift: updatedDayShift
-        };
-      }
-      return typedConfig;
-    }));
-  }, []);
-  const updateDayShiftEndTime = React23.useCallback((lineId, value) => {
+  const updateShiftTime = React23.useCallback((lineId, shiftId, field, value) => {
     setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const updatedDayShift = { ...typedConfig.dayShift, endTime: value };
-        return {
-          ...typedConfig,
-          dayShift: updatedDayShift
-        };
-      }
-      return typedConfig;
-    }));
-  }, []);
-  const updateNightShiftStartTime = React23.useCallback((lineId, value) => {
-    setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const updatedNightShift = { ...typedConfig.nightShift, startTime: value };
-        return {
-          ...typedConfig,
-          nightShift: updatedNightShift
-        };
+      if (config.id === lineId) {
+        const updatedShifts = config.shifts.map(
+          (shift) => shift.shiftId === shiftId ? { ...shift, [field]: value } : shift
+        );
+        return { ...config, shifts: updatedShifts };
       }
-      return typedConfig;
+      return config;
     }));
   }, []);
-  const updateNightShiftEndTime = React23.useCallback((lineId, value) => {
+  const updateShiftName = React23.useCallback((lineId, shiftId, value) => {
     setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const updatedNightShift = { ...typedConfig.nightShift, endTime: value };
-        return {
-          ...typedConfig,
-          nightShift: updatedNightShift
-        };
+      if (config.id === lineId) {
+        const updatedShifts = config.shifts.map(
+          (shift) => shift.shiftId === shiftId ? { ...shift, shiftName: value } : shift
+        );
+        return { ...config, shifts: updatedShifts };
       }
-      return typedConfig;
+      return config;
     }));
   }, []);
-  const addDayShiftBreak = React23.useCallback((lineId) => {
-    setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const dayShift = { ...typedConfig.dayShift };
-        const newBreak = {
-          startTime: dayShift.startTime,
-          endTime: dayShift.startTime,
-          duration: 0,
-          remarks: ""
-        };
-        return {
-          ...typedConfig,
-          dayShift: {
-            ...dayShift,
-            breaks: [...dayShift.breaks, newBreak]
-          }
-        };
-      }
-      return typedConfig;
-    }));
+  React23.useCallback((lineId, value) => {
+    setLineConfigs((prev) => prev.map(
+      (config) => config.id === lineId ? { ...config, timezone: value } : config
+    ));
   }, []);
-  const addNightShiftBreak = React23.useCallback((lineId) => {
+  const addBreak = React23.useCallback((lineId, shiftId) => {
     setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const nightShift = { ...typedConfig.nightShift };
-        const newBreak = {
-          startTime: nightShift.startTime,
-          endTime: nightShift.startTime,
-          duration: 0
-        };
-        return {
-          ...typedConfig,
-          nightShift: {
-            ...nightShift,
-            breaks: [...nightShift.breaks, newBreak]
+      if (config.id === lineId) {
+        const updatedShifts = config.shifts.map((shift) => {
+          if (shift.shiftId === shiftId) {
+            const newBreak = {
+              startTime: shift.startTime,
+              endTime: shift.startTime,
+              duration: 0,
+              remarks: ""
+            };
+            return { ...shift, breaks: [...shift.breaks, newBreak] };
           }
-        };
+          return shift;
+        });
+        return { ...config, shifts: updatedShifts };
       }
-      return typedConfig;
+      return config;
     }));
   }, []);
-  const updateDayShiftBreak = React23.useCallback((lineId, index, field, value) => {
+  const updateBreak = React23.useCallback((lineId, shiftId, breakIndex, field, value) => {
     setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const dayShift = { ...typedConfig.dayShift };
-        const newBreaks = [...dayShift.breaks];
-        newBreaks[index] = { ...newBreaks[index], [field]: value };
-        if (field === "startTime" || field === "endTime") {
-          const startParts = newBreaks[index].startTime.split(":").map(Number);
-          const endParts = newBreaks[index].endTime.split(":").map(Number);
-          let startMinutes = startParts[0] * 60 + startParts[1];
-          let endMinutes = endParts[0] * 60 + endParts[1];
-          if (endMinutes < startMinutes) {
-            endMinutes += 24 * 60;
-          }
-          newBreaks[index].duration = endMinutes - startMinutes;
-        }
-        return {
-          ...typedConfig,
-          dayShift: {
-            ...dayShift,
-            breaks: newBreaks
+      if (config.id === lineId) {
+        const updatedShifts = config.shifts.map((shift) => {
+          if (shift.shiftId === shiftId) {
+            const newBreaks = [...shift.breaks];
+            newBreaks[breakIndex] = { ...newBreaks[breakIndex], [field]: value };
+            if (field === "startTime" || field === "endTime") {
+              newBreaks[breakIndex].duration = calculateBreakDuration(
+                newBreaks[breakIndex].startTime,
+                newBreaks[breakIndex].endTime
+              );
+            }
+            return { ...shift, breaks: newBreaks };
           }
-        };
+          return shift;
+        });
+        return { ...config, shifts: updatedShifts };
       }
-      return typedConfig;
+      return config;
     }));
   }, []);
-  const updateNightShiftBreak = React23.useCallback((lineId, index, field, value) => {
+  const removeBreak = React23.useCallback((lineId, shiftId, breakIndex) => {
     setLineConfigs((prev) => prev.map((config) => {
-      const typedConfig = config;
-      if (typedConfig.id === lineId) {
-        const nightShift = { ...typedConfig.nightShift };
-        const newBreaks = [...nightShift.breaks];
-        newBreaks[index] = { ...newBreaks[index], [field]: value };
-        if (field === "startTime" || field === "endTime") {
-          const startParts = newBreaks[index].startTime.split(":").map(Number);
-          const endParts = newBreaks[index].endTime.split(":").map(Number);
-          let startMinutes = startParts[0] * 60 + startParts[1];
-          let endMinutes = endParts[0] * 60 + endParts[1];
-          if (endMinutes < startMinutes) {
-            endMinutes += 24 * 60;
-          }
-          newBreaks[index].duration = endMinutes - startMinutes;
-        }
-        return {
-          ...typedConfig,
-          nightShift: {
-            ...nightShift,
-            breaks: newBreaks
+      if (config.id === lineId) {
+        const updatedShifts = config.shifts.map((shift) => {
+          if (shift.shiftId === shiftId) {
+            return { ...shift, breaks: shift.breaks.filter((_, i) => i !== breakIndex) };
           }
-        };
+          return shift;
+        });
+        return { ...config, shifts: updatedShifts };
       }
-      return typedConfig;
+      return config;
     }));
   }, []);
-  const removeDayShiftBreak = React23.useCallback((lineId, index) => {
+  React23.useCallback((lineId) => {
     setLineConfigs((prev) => prev.map((config) => {
       if (config.id === lineId) {
-        const dayShift = { ...config.dayShift };
-        return {
-          ...config,
-          dayShift: {
-            ...dayShift,
-            breaks: dayShift.breaks.filter((_, i) => i !== index)
-          }
+        const maxShiftId = Math.max(...config.shifts.map((s) => s.shiftId), -1);
+        const newShiftId = maxShiftId + 1;
+        const newShift = {
+          shiftId: newShiftId,
+          shiftName: `Shift ${newShiftId}`,
+          startTime: "08:00",
+          endTime: "16:00",
+          breaks: []
         };
+        return { ...config, shifts: [...config.shifts, newShift] };
       }
       return config;
     }));
   }, []);
-  const removeNightShiftBreak = React23.useCallback((lineId, index) => {
+  const removeShift = React23.useCallback((lineId, shiftId) => {
     setLineConfigs((prev) => prev.map((config) => {
       if (config.id === lineId) {
-        const nightShift = { ...config.nightShift };
-        return {
-          ...config,
-          nightShift: {
-            ...nightShift,
-            breaks: nightShift.breaks.filter((_, i) => i !== index)
-          }
-        };
+        if (config.shifts.length <= 1) {
+          showToast("error", "Cannot remove the last shift");
+          return config;
+        }
+        return { ...config, shifts: config.shifts.filter((s) => s.shiftId !== shiftId) };
       }
       return config;
     }));
-  }, []);
+  }, [showToast]);
   const handleSaveShifts = React23.useCallback(async (lineId) => {
     setLineConfigs((prev) => prev.map(
       (config) => config.id === lineId ? { ...config, isSaving: true, saveSuccess: false } : config
@@ -46024,27 +46443,31 @@ var ShiftsView = ({
       if (!lineConfig) {
         throw new Error("Line configuration not found");
       }
-      const dayShiftData = {
-        line_id: lineId,
-        shift_id: 0,
-        start_time: lineConfig.dayShift.startTime,
-        end_time: lineConfig.dayShift.endTime,
-        breaks: formatBreaks(lineConfig.dayShift.breaks)
-      };
-      const nightShiftData = {
-        line_id: lineId,
-        shift_id: 1,
-        start_time: lineConfig.nightShift.startTime,
-        end_time: lineConfig.nightShift.endTime,
-        breaks: formatBreaks(lineConfig.nightShift.breaks)
-      };
-      const dayResult = await supabase.from("line_operating_hours").upsert(dayShiftData).select();
-      if (dayResult.error) {
-        throw new Error(`Failed to save day shift: ${dayResult.error.message}`);
+      console.log("[ShiftsView] Saving shifts for line:", lineId, lineConfig.shifts);
+      for (const shift of lineConfig.shifts) {
+        const shiftData = {
+          line_id: lineId,
+          shift_id: shift.shiftId,
+          shift_name: shift.shiftName,
+          start_time: shift.startTime,
+          end_time: shift.endTime,
+          breaks: formatBreaks(shift.breaks),
+          timezone: lineConfig.timezone
+        };
+        const { error: upsertError } = await supabase.from("line_operating_hours").upsert(shiftData).select();
+        if (upsertError) {
+          throw new Error(`Failed to save shift ${shift.shiftId}: ${upsertError.message}`);
+        }
       }
-      const nightResult = await supabase.from("line_operating_hours").upsert(nightShiftData).select();
-      if (nightResult.error) {
-        throw new Error(`Failed to save night shift: ${nightResult.error.message}`);
+      const { data: existingShifts } = await supabase.from("line_operating_hours").select("shift_id").eq("line_id", lineId);
+      const currentShiftIds = lineConfig.shifts.map((s) => s.shiftId);
+      const shiftsToDelete = (existingShifts || []).filter((s) => !currentShiftIds.includes(s.shift_id)).map((s) => s.shift_id);
+      if (shiftsToDelete.length > 0) {
+        console.log("[ShiftsView] Deleting removed shifts:", shiftsToDelete);
+        const { error: deleteError } = await supabase.from("line_operating_hours").delete().eq("line_id", lineId).in("shift_id", shiftsToDelete);
+        if (deleteError) {
+          console.error("[ShiftsView] Error deleting shifts:", deleteError);
+        }
       }
       setLineConfigs((prev) => prev.map(
         (config) => config.id === lineId ? { ...config, isSaving: false, saveSuccess: true } : config
@@ -46056,7 +46479,7 @@ var ShiftsView = ({
         ));
       }, 3e3);
     } catch (error2) {
-      console.error("Error saving shift configurations:", error2);
+      console.error("[ShiftsView] Error saving shift configurations:", error2);
       showToast("error", "Failed to save shift configurations");
       setLineConfigs((prev) => prev.map(
         (config) => config.id === lineId ? { ...config, isSaving: false, saveSuccess: false } : config
@@ -46076,7 +46499,7 @@ var ShiftsView = ({
       ) }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1 flex flex-col items-center mt-2 sm:mt-0", children: [
         /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-lg sm:text-xl md:text-2xl lg:text-3xl font-semibold text-gray-900 text-center", children: "Shift Management" }),
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs sm:text-sm text-gray-500 mt-0.5 sm:mt-1 text-center px-2 sm:px-0", children: "Configure day and night shift timings and breaks for each production line" })
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs sm:text-sm text-gray-500 mt-0.5 sm:mt-1 text-center px-2 sm:px-0", children: "Configure shift timings and breaks for each production line" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "hidden sm:block absolute right-0 w-24" })
     ] }) }) }),
@@ -46096,6 +46519,11 @@ var ShiftsView = ({
             /* @__PURE__ */ jsxRuntime.jsxs("h2", { className: "text-base sm:text-lg font-semibold text-gray-800", children: [
               config.name,
               " Shifts"
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs text-gray-400", children: [
+              "(",
+              config.shifts.length,
+              " shifts)"
             ] })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col sm:flex-row items-start sm:items-center gap-2 sm:gap-4 w-full sm:w-auto", children: [
@@ -46123,48 +46551,27 @@ var ShiftsView = ({
             )
           ] })
         ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { id: `shift-panel-${config.id}`, className: "p-3 sm:p-4 md:p-6 border-t border-gray-200 w-full", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ShiftPanel,
-            {
-              title: "Day Shift",
-              icon: /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-5 h-5 text-gray-600", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) }),
-              startTime: config.dayShift.startTime,
-              endTime: config.dayShift.endTime,
-              breaks: config.dayShift.breaks,
-              onStartTimeChange: (value) => updateDayShiftStartTime(config.id, value),
-              onEndTimeChange: (value) => updateDayShiftEndTime(config.id, value),
-              onBreakUpdate: (index, field, value) => updateDayShiftBreak(config.id, index, field, value),
-              onBreakRemove: (index) => removeDayShiftBreak(config.id, index),
-              onBreakAdd: () => addDayShiftBreak(config.id),
-              shiftHours: calculateShiftHours(
-                config.dayShift.startTime,
-                config.dayShift.endTime,
-                config.dayShift.breaks
-              )
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ShiftPanel,
-            {
-              title: "Night Shift",
-              icon: /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-5 h-5 text-gray-600", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) }),
-              startTime: config.nightShift.startTime,
-              endTime: config.nightShift.endTime,
-              breaks: config.nightShift.breaks,
-              onStartTimeChange: (value) => updateNightShiftStartTime(config.id, value),
-              onEndTimeChange: (value) => updateNightShiftEndTime(config.id, value),
-              onBreakUpdate: (index, field, value) => updateNightShiftBreak(config.id, index, field, value),
-              onBreakRemove: (index) => removeNightShiftBreak(config.id, index),
-              onBreakAdd: () => addNightShiftBreak(config.id),
-              shiftHours: calculateShiftHours(
-                config.nightShift.startTime,
-                config.nightShift.endTime,
-                config.nightShift.breaks
-              )
-            }
-          )
-        ] })
+        /* @__PURE__ */ jsxRuntime.jsx("div", { id: `shift-panel-${config.id}`, className: "p-3 sm:p-4 md:p-6 border-t border-gray-200 w-full", children: config.shifts.map((shift) => /* @__PURE__ */ jsxRuntime.jsx(
+          ShiftPanel,
+          {
+            title: shift.shiftName,
+            icon: getShiftIcon(shift.shiftId, shift.shiftName),
+            startTime: shift.startTime,
+            endTime: shift.endTime,
+            breaks: shift.breaks,
+            onStartTimeChange: (value) => updateShiftTime(config.id, shift.shiftId, "startTime", value),
+            onEndTimeChange: (value) => updateShiftTime(config.id, shift.shiftId, "endTime", value),
+            onBreakUpdate: (index, field, value) => updateBreak(config.id, shift.shiftId, index, field, value),
+            onBreakRemove: (index) => removeBreak(config.id, shift.shiftId, index),
+            onBreakAdd: () => addBreak(config.id, shift.shiftId),
+            shiftHours: calculateShiftHours(shift.startTime, shift.endTime, shift.breaks),
+            shiftId: shift.shiftId,
+            onShiftNameChange: (value) => updateShiftName(config.id, shift.shiftId, value),
+            canDelete: config.shifts.length > 1,
+            onDelete: () => removeShift(config.id, shift.shiftId)
+          },
+          `${config.id}-shift-${shift.shiftId}`
+        )) })
       ] }, config.id)) })
     ] })
   ] });
@@ -46991,6 +47398,10 @@ var TargetsViewUI = ({
   savingLines,
   saveSuccess,
   selectedShift,
+  shiftOptions = [
+    { id: 0, name: "Day Shift" },
+    { id: 1, name: "Night Shift" }
+  ],
   isBulkConfigureOpen,
   navItems = [],
   currentPathname = "/targets",
@@ -47043,24 +47454,15 @@ var TargetsViewUI = ({
     ] }) }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 overflow-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "px-4 sm:px-6 md:px-8 py-4 sm:py-5 md:py-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mb-4 sm:mb-6 bg-gradient-to-r from-blue-50 to-blue-50/50 p-3 sm:p-4 rounded-xl border border-blue-100", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs sm:text-sm text-blue-700 font-medium text-center sm:text-left", children: "Click on a line to expand and configure individual workspace targets." }) }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mb-4 sm:mb-6 flex justify-center relative", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "inline-flex bg-gray-100 p-1 rounded-lg w-full max-w-xs sm:w-auto", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "button",
-          {
-            onClick: () => onShiftChange(0),
-            className: `flex-1 sm:flex-none px-3 sm:px-4 py-2 text-xs sm:text-sm font-medium rounded-md transition-all ${selectedShift === 0 ? "bg-white text-blue-600 shadow-sm" : "text-gray-600 hover:text-gray-900"}`,
-            children: "Day Shift"
-          }
-        ),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "button",
-          {
-            onClick: () => onShiftChange(1),
-            className: `flex-1 sm:flex-none px-3 sm:px-4 py-2 text-xs sm:text-sm font-medium rounded-md transition-all ${selectedShift === 1 ? "bg-white text-blue-600 shadow-sm" : "text-gray-600 hover:text-gray-900"}`,
-            children: "Night Shift"
-          }
-        )
-      ] }) }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mb-4 sm:mb-6 flex justify-center relative", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex bg-gray-100 p-1 rounded-lg w-full max-w-xl sm:w-auto overflow-x-auto", children: shiftOptions.map((option) => /* @__PURE__ */ jsxRuntime.jsx(
+        "button",
+        {
+          onClick: () => onShiftChange(option.id),
+          className: `flex-1 sm:flex-none px-3 sm:px-4 py-2 text-xs sm:text-sm font-medium rounded-md transition-all whitespace-nowrap ${selectedShift === option.id ? "bg-white text-blue-600 shadow-sm" : "text-gray-600 hover:text-gray-900"}`,
+          children: option.name
+        },
+        option.id
+      )) }) }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-6", children: Object.entries(lineWorkspaces).map(([lineId, line]) => /* @__PURE__ */ jsxRuntime.jsxs(
         "div",
         {
@@ -47387,12 +47789,7 @@ var TargetsView = ({
       [lineId]: getStoredLineState2(lineId)
     }), {});
   });
-  const [allShiftsData, setAllShiftsData] = React23.useState({
-    0: initialLineWorkspaces,
-    // Day shift
-    1: initialLineWorkspaces
-    // Night shift (will be populated on first load)
-  });
+  const [allShiftsData, setAllShiftsData] = React23.useState({});
   const [actionIds, setActionIds] = React23.useState(null);
   const [savingLines, setSavingLines] = React23.useState(
     () => lineIds.reduce((acc, id3) => ({ ...acc, [id3]: false }), {})
@@ -47404,6 +47801,7 @@ var TargetsView = ({
   const [isBulkConfigureOpen, setIsBulkConfigureOpen] = React23.useState(false);
   const [selectedWorkspaces, setSelectedWorkspaces] = React23.useState([]);
   const [selectedShift, setSelectedShift] = React23.useState(0);
+  const [shiftOptions, setShiftOptions] = React23.useState([]);
   const canSaveTargets = useCanSaveTargets();
   const [dbValues, setDbValues] = React23.useState({ 0: {}, 1: {} });
   const [userEditedFields, setUserEditedFields] = React23.useState(/* @__PURE__ */ new Set());
@@ -47436,12 +47834,28 @@ var TargetsView = ({
       setIsLoading(true);
       try {
         const currentDate = getOperationalDate(timezone);
+        const { data: shiftsData, error: shiftsError } = await supabase.from("line_operating_hours").select("line_id, shift_id, shift_name").in("line_id", lineIds);
+        if (shiftsError) {
+          console.warn("[TargetsView] Error fetching shift definitions, falling back to defaults", shiftsError);
+        }
+        const derivedShiftOptions = (shiftsData || []).reduce((acc, row) => {
+          if (acc.some((s) => s.id === row.shift_id)) return acc;
+          acc.push({ id: row.shift_id, name: row.shift_name || `Shift ${row.shift_id}` });
+          return acc;
+        }, []);
+        const effectiveShiftOptions = derivedShiftOptions.length > 0 ? derivedShiftOptions.sort((a, b) => a.id - b.id) : [
+          { id: 0, name: "Day Shift" },
+          { id: 1, name: "Night Shift" }
+        ];
+        setShiftOptions(effectiveShiftOptions);
+        const defaultShiftId = effectiveShiftOptions[0].id;
+        setSelectedShift(defaultShiftId);
         const bulkResponse = await workspaceService.fetchBulkTargets({
           companyId,
           lineIds,
           date: currentDate,
-          shifts: [0, 1],
-          // Fetch both shifts at once
+          shifts: effectiveShiftOptions.map((s) => s.id),
+          // Fetch all configured shifts
           includeSkus: skuEnabled,
           includeActions: true
         });
@@ -47459,10 +47873,14 @@ var TargetsView = ({
           packaging: packagingAction.id
         };
         setActionIds(actionIdsData);
-        const newAllShiftsData = { 0: {}, 1: {} };
-        const newDbValues = { 0: {}, 1: {} };
+        const newAllShiftsData = {};
+        const newDbValues = {};
+        effectiveShiftOptions.forEach((opt) => {
+          newAllShiftsData[opt.id] = {};
+          newDbValues[opt.id] = {};
+        });
         Object.entries(data.lines).forEach(([lineId, lineData]) => {
-          [0, 1].forEach((shiftId) => {
+          effectiveShiftOptions.forEach(({ id: shiftId }) => {
             const shiftData = lineData.shifts[shiftId.toString()];
             if (!shiftData) {
               console.warn(`No shift ${shiftId} data for line ${lineId}`);
@@ -47633,7 +48051,7 @@ var TargetsView = ({
     setUserEditedFields(/* @__PURE__ */ new Set());
     if (dbValues[shiftId] && Object.keys(dbValues[shiftId]).length > 0) {
       setAllShiftsData((prev) => {
-        const updatedShiftData = { ...prev[shiftId] };
+        const updatedShiftData = { ...prev[shiftId] || {} };
         for (const lineId of Object.keys(updatedShiftData)) {
           if (dbValues[shiftId][lineId]) {
             updatedShiftData[lineId] = {
@@ -47855,6 +48273,7 @@ var TargetsView = ({
       savingLines,
       saveSuccess,
       selectedShift,
+      shiftOptions,
       isBulkConfigureOpen,
       navItems: [],
       currentPathname: "/targets",
@@ -47986,12 +48405,10 @@ var WorkspaceDetailView = ({
   const today = new Date((/* @__PURE__ */ new Date()).toLocaleString("en-US", { timeZone: timezone }));
   const [selectedMonth, setSelectedMonth] = React23.useState(today.getMonth());
   const [selectedYear, setSelectedYear] = React23.useState(today.getFullYear());
-  const [selectedShift, setSelectedShift] = React23.useState("day");
+  const [selectedShift, setSelectedShift] = React23.useState(0);
   React23.useEffect(() => {
-    if (parsedShiftId === 1) {
-      setSelectedShift("night");
-    } else if (parsedShiftId === 0) {
-      setSelectedShift("day");
+    if (parsedShiftId !== void 0) {
+      setSelectedShift(parsedShiftId);
     }
   }, [parsedShiftId]);
   const isHistoricView = Boolean(date && parsedShiftId !== void 0);
@@ -48003,6 +48420,13 @@ var WorkspaceDetailView = ({
   const dashboardConfig = useDashboardConfig();
   const isClipsEnabled = dashboardConfig?.clipsConfig?.enabled ?? true;
   dashboardConfig?.supervisorConfig?.enabled || false;
+  const effectiveLineId = lineId || selectedLineId;
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(effectiveLineId);
+  const calculatedOperationalDate = React23.useMemo(() => {
+    if (isShiftConfigLoading || !shiftConfig) return null;
+    const currentShift = getCurrentShift(timezone, shiftConfig);
+    return currentShift.date;
+  }, [isShiftConfigLoading, shiftConfig, timezone]);
   const {
     workspace: workspaceHealth,
     loading: healthLoading,
@@ -48063,7 +48487,9 @@ var WorkspaceDetailView = ({
   } = useHistoricWorkspaceMetrics(
     workspaceId || "",
     date || "",
-    parsedShiftId
+    parsedShiftId,
+    { shiftConfig, enabled: !isShiftConfigLoading }
+    // Pass dynamic shift config and enabled flag
   );
   const {
     metrics: liveMetrics,
@@ -48071,11 +48497,13 @@ var WorkspaceDetailView = ({
     error: liveError
   } = useWorkspaceDetailedMetrics(
     workspaceId || "",
-    getOperationalDate(timezone),
-    void 0
+    calculatedOperationalDate || getOperationalDate(timezone),
+    void 0,
+    { shiftConfig, enabled: !isShiftConfigLoading }
+    // Pass the dynamic shift config here and enabled flag
   );
   const workspace = isHistoricView ? historicMetrics : liveMetrics;
-  const loading = isHistoricView ? historicLoading : liveLoading;
+  const loading = (isHistoricView ? historicLoading : liveLoading) || isShiftConfigLoading;
   const error = isHistoricView ? historicError : liveError;
   const { supervisorName } = useLineSupervisor(workspace?.line_id || lineId);
   React23.useEffect(() => {
@@ -48095,7 +48523,7 @@ var WorkspaceDetailView = ({
   }, [isClipsEnabled, activeTab]);
   React23.useEffect(() => {
     if (liveMetrics && !date && !shift) {
-      const currentDate = getOperationalDate(timezone);
+      const currentDate = calculatedOperationalDate || getOperationalDate(timezone);
       if (liveMetrics.date !== currentDate) {
         setUsingFallbackData(true);
         if (activeTab !== "monthly_history") {
@@ -48105,7 +48533,7 @@ var WorkspaceDetailView = ({
         setUsingFallbackData(false);
       }
     }
-  }, [liveMetrics, date, shift, activeTab]);
+  }, [liveMetrics, date, shift, activeTab, calculatedOperationalDate]);
   React23.useMemo(() => {
     if (isHistoricView && date) {
       try {
@@ -48113,11 +48541,11 @@ var WorkspaceDetailView = ({
         return date;
       } catch (e) {
         console.error("Error parsing historic date:", e);
-        return getOperationalDate(timezone);
+        return calculatedOperationalDate || getOperationalDate(timezone);
       }
     }
-    return getOperationalDate(timezone);
-  }, [isHistoricView, date]);
+    return calculatedOperationalDate || getOperationalDate(timezone);
+  }, [isHistoricView, date, calculatedOperationalDate, timezone]);
   const handleMonthlyDataLoaded = React23.useCallback((data) => {
     console.log("[handleMonthlyDataLoaded] Received data:", {
       dataLength: data?.length,
@@ -48141,10 +48569,8 @@ var WorkspaceDetailView = ({
       if (!dayEntry) {
         dayEntry = {
           date: dateObj,
-          dayShift: null,
-          // Start with null instead of zeros
-          nightShift: null
-          // Start with null instead of zeros
+          shifts: {}
+          // Multi-shift structure: Record<number, CalendarShiftData>
         };
         dayDataMap.set(dateKey, dayEntry);
       }
@@ -48156,19 +48582,14 @@ var WorkspaceDetailView = ({
         pphThreshold: metric.pph_threshold || 0,
         idealOutput: metric.ideal_output || 0,
         rank: metric.workspace_rank || 0,
-        idleTime: metric.idle_time || 0
+        idleTime: metric.idle_time || 0,
+        hasData: true
       };
-      if (metric.shift_id === 0) {
-        dayEntry.dayShift = shiftData;
-      } else {
-        dayEntry.nightShift = shiftData;
-      }
+      dayEntry.shifts[metric.shift_id] = shiftData;
     });
-    const processedData = Array.from(dayDataMap.values()).filter((entry) => entry.dayShift !== null || entry.nightShift !== null).map((entry) => ({
+    const processedData = Array.from(dayDataMap.values()).filter((entry) => Object.keys(entry.shifts).length > 0).map((entry) => ({
       date: entry.date,
-      // If a shift is null (no data), provide zeros for compatibility
-      dayShift: entry.dayShift || { efficiency: 0, output: 0, cycleTime: 0, pph: 0, pphThreshold: 0, idealOutput: 0, rank: 0, idleTime: 0 },
-      nightShift: entry.nightShift || { efficiency: 0, output: 0, cycleTime: 0, pph: 0, pphThreshold: 0, idealOutput: 0, rank: 0, idleTime: 0 }
+      shifts: entry.shifts
     }));
     console.log(`[handleMonthlyDataLoaded] Transformed data for calendar:`, {
       count: processedData.length,
@@ -48176,7 +48597,6 @@ var WorkspaceDetailView = ({
     });
     setMonthlyData(processedData);
   }, []);
-  const effectiveLineId = lineId || selectedLineId;
   const formattedWorkspaceName = displayName || formatWorkspaceName3(workspace?.workspace_name || "", effectiveLineId);
   const shouldShowCycleTimeChart = showCycleTimeChart ?? formattedWorkspaceName.startsWith("FINAL ASSY");
   const handleBackNavigation = () => {
@@ -48197,7 +48617,7 @@ var WorkspaceDetailView = ({
       if (onNavigate) {
         const params = new URLSearchParams();
         params.set("fromMonthly", "true");
-        params.set("shift", selectedShift === "night" ? "1" : "0");
+        params.set("shift", selectedShift.toString());
         if (effectiveLineId) {
           params.set("lineId", effectiveLineId);
         }
@@ -48209,7 +48629,7 @@ var WorkspaceDetailView = ({
         if (onNavigate) {
           const params = new URLSearchParams();
           params.set("fromMonthly", "true");
-          params.set("shift", selectedShift === "night" ? "1" : "0");
+          params.set("shift", selectedShift.toString());
           if (effectiveLineId) {
             params.set("lineId", effectiveLineId);
           }
@@ -48222,11 +48642,16 @@ var WorkspaceDetailView = ({
       }
     }
   };
-  const getShiftIcon = (shiftType) => {
-    if (shiftType === "Day") {
+  const getShiftIcon2 = (shiftType) => {
+    const shiftTypeLower = shiftType?.toLowerCase() || "";
+    if (shiftTypeLower.includes("day") || shiftTypeLower.includes("morning")) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
-    } else {
+    } else if (shiftTypeLower.includes("afternoon") || shiftTypeLower.includes("noon") || shiftTypeLower.includes("midday")) {
+      return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" }) });
+    } else if (shiftTypeLower.includes("night") || shiftTypeLower.includes("evening")) {
       return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" }) });
+    } else {
+      return /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" }) });
     }
   };
   if (loading) {
@@ -48377,7 +48802,7 @@ var WorkspaceDetailView = ({
             /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "sm:hidden mt-3 flex items-center justify-center gap-2", children: [
               /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-gray-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-gray-700", children: formatISTDate2(new Date(workspace.date)) }) }),
               /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "inline-flex items-center gap-1 px-2.5 py-1 bg-gray-100 rounded-full", children: [
-                /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-700 scale-90", children: getShiftIcon(workspace.shift_type) }),
+                /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-gray-700 scale-90", children: getShiftIcon2(workspace.shift_type) }),
                 /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-gray-700", children: workspace.shift_type })
               ] }),
               !date && !shift && !usingFallbackData ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-green-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-green-700", children: /* @__PURE__ */ jsxRuntime.jsx(LiveTimer, {}) }) }) : date ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-blue-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-blue-700", children: getDaysDifference(workspace.date, timezone, dashboardConfig?.shiftConfig?.dayShift?.startTime || "06:00") }) }) : usingFallbackData ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "inline-flex items-center px-2.5 py-1 bg-amber-100 rounded-full", children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-amber-700", children: getDaysDifference(workspace.date, timezone, dashboardConfig?.shiftConfig?.dayShift?.startTime || "06:00") }) }) : null
@@ -48402,11 +48827,8 @@ var WorkspaceDetailView = ({
                 /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-px h-4 bg-blue-300" })
               ] }),
               /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
-                /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon(workspace.shift_type) }),
-                /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm md:text-base font-medium text-blue-600", children: [
-                  workspace.shift_type,
-                  " Shift"
-                ] })
+                /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon2(workspace.shift_type) }),
+                /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm md:text-base font-medium text-blue-600", children: workspace.shift_type })
               ] })
             ] }) })
           ] }),
@@ -48473,7 +48895,7 @@ var WorkspaceDetailView = ({
                   monthlyData,
                   selectedMonth,
                   selectedYear,
-                  selectedShift
+                  selectedShiftId: selectedShift
                 }
               ) })
             ] })
@@ -48742,15 +49164,16 @@ var WorkspaceDetailView = ({
                 month: selectedMonth,
                 year: selectedYear,
                 workspaceId,
-                selectedShift,
+                selectedShiftId: selectedShift,
                 monthlyDataLoading,
-                onDateSelect: (selectedDate, shift2) => {
+                availableShifts: shiftConfig?.shifts?.map((s) => ({ id: s.shiftId, name: s.shiftName })),
+                onDateSelect: (selectedDate, shiftId) => {
                   if (onDateSelect) {
-                    onDateSelect(selectedDate, shift2);
+                    onDateSelect(selectedDate, shiftId);
                   } else if (onNavigate) {
                     const params = new URLSearchParams();
                     params.set("date", selectedDate);
-                    params.set("shift", shift2 === "day" ? "0" : "1");
+                    params.set("shift", shiftId.toString());
                     params.set("fromMonthly", "true");
                     if (effectiveLineId) {
                       params.set("lineId", effectiveLineId);
@@ -48773,6 +49196,7 @@ var WorkspaceDetailView = ({
               workspaceId,
               workspaceName: formattedWorkspaceName,
               date,
+              lineId: effectiveLineId,
               shift,
               totalOutput: workspace?.total_actions,
               className: "h-[calc(100vh-10rem)]"
@@ -48929,6 +49353,13 @@ var SKUManagementView = () => {
 var useWorkspaceHealth = (options) => {
   const supabase = useSupabase();
   const databaseConfig = useDatabaseConfig();
+  const entityConfig = useEntityConfig();
+  const configuredLineIds = React23.useMemo(() => getConfiguredLineIds(entityConfig), [entityConfig]);
+  const firstConfiguredLineId = configuredLineIds[0];
+  const isFactoryView = !options.lineId || options.lineId === (entityConfig?.factoryViewId || "factory");
+  const effectiveLineIdForShiftConfig = isFactoryView ? firstConfiguredLineId : options.lineId;
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(effectiveLineIdForShiftConfig);
+  const timezone = useAppTimezone() || "UTC";
   const [workspaces, setWorkspaces] = React23.useState([]);
   const [summary, setSummary] = React23.useState({
     totalWorkspaces: 0,
@@ -48975,6 +49406,14 @@ var useWorkspaceHealth = (options) => {
   }, []);
   const fetchWorkspacesHealth = React23.useCallback(async () => {
     if (isFetchingRef.current) return;
+    if (isShiftConfigLoading) {
+      console.log("[useWorkspaceHealth] \u23F3 Waiting for shift config to load");
+      return;
+    }
+    if (!shiftConfig) {
+      console.warn("[useWorkspaceHealth] \u26A0\uFE0F Shift config is null, waiting for it to load");
+      return;
+    }
     if (!options.companyId) {
       setWorkspaces([]);
       setSummary(computeSummary([]));
@@ -48985,9 +49424,16 @@ var useWorkspaceHealth = (options) => {
       isFetchingRef.current = true;
       setLoading(true);
       setError(null);
+      console.log("[useWorkspaceHealth] \u{1F680} Fetching health status with shift config:", {
+        lineId: options.lineId,
+        hasShiftConfig: !!shiftConfig,
+        shiftId: shiftConfig?.shifts?.[0]?.shiftId
+      });
       const workspacesWithStatus = await workspaceHealthService.getWorkspaceHealthStatus({
         lineId: options.lineId,
-        companyId: options.companyId
+        companyId: options.companyId,
+        shiftConfig,
+        timezone
       });
       setWorkspaces(workspacesWithStatus);
       setSummary(computeSummary(workspacesWithStatus));
@@ -48999,7 +49445,7 @@ var useWorkspaceHealth = (options) => {
       setLoading(false);
       isFetchingRef.current = false;
     }
-  }, [options.companyId, options.lineId, computeSummary]);
+  }, [options.companyId, options.lineId, computeSummary, shiftConfig, isShiftConfigLoading, timezone]);
   React23.useEffect(() => {
     fetchWorkspacesHealth();
   }, [fetchWorkspacesHealth]);
@@ -49039,9 +49485,12 @@ var useWorkspaceHealth = (options) => {
   return {
     workspaces,
     summary,
-    loading,
+    loading: loading || isShiftConfigLoading || !shiftConfig,
     error,
-    refetch: fetchWorkspacesHealth
+    refetch: fetchWorkspacesHealth,
+    // Expose shift config so consumers can pass it to child components
+    shiftConfig,
+    isShiftConfigLoading
   };
 };
 var STATUS_COLORS = {
@@ -49240,7 +49689,8 @@ var formatTimeRange = (start, end, timezone) => {
 var WorkspaceUptimeDetailModal = ({
   workspace,
   isOpen,
-  onClose
+  onClose,
+  shiftConfig: passedShiftConfig
 }) => {
   const timezone = useAppTimezone() || "UTC";
   const logsContainerRef = React23.useRef(null);
@@ -49254,7 +49704,12 @@ var WorkspaceUptimeDetailModal = ({
     workspaceId: workspace?.workspace_id,
     companyId: workspace?.company_id,
     enabled: isOpen && Boolean(workspace?.workspace_id && workspace?.company_id),
-    refreshInterval: 6e4
+    refreshInterval: 6e4,
+    lineId: workspace?.line_id,
+    // Pass shift config from parent if available - avoids duplicate DB queries
+    // and ensures consistent shift timing across the view
+    shiftConfig: passedShiftConfig || void 0,
+    timezone
   });
   React23.useEffect(() => {
     if (!isOpen || !workspace) return;
@@ -49441,32 +49896,48 @@ var WorkspaceHealthView = ({
 }) => {
   const router$1 = router.useRouter();
   const [groupBy, setGroupBy] = React23.useState("line");
+  const entityConfig = useEntityConfig();
+  const configuredLineIds = React23.useMemo(() => getConfiguredLineIds(entityConfig), [entityConfig]);
+  const firstConfiguredLineId = configuredLineIds[0];
+  const factoryViewId = entityConfig?.factoryViewId || "factory";
+  const isFactoryView = !lineId || lineId === factoryViewId;
+  const effectiveLineId = isFactoryView ? firstConfiguredLineId : lineId;
   const timezone = useAppTimezone();
+  const { shiftConfig, isLoading: isShiftConfigLoading } = useDynamicShiftConfig(effectiveLineId);
   const [selectedWorkspace, setSelectedWorkspace] = React23.useState(null);
-  const operationalDate = getOperationalDate(timezone || "UTC");
-  const currentHour = (/* @__PURE__ */ new Date()).getHours();
-  const isNightShift = currentHour >= 18 || currentHour < 6;
-  const shiftType = isNightShift ? "Night" : "Day";
+  const effectiveTimezone = timezone || "UTC";
+  const currentShiftDetails = getCurrentShift(effectiveTimezone, shiftConfig);
+  const operationalDate = currentShiftDetails.date;
+  const shiftType = (currentShiftDetails.shiftName || "Day").replace(/ Shift$/i, "");
   const formatDate = (date) => {
     const d = new Date(date);
     return d.toLocaleDateString("en-IN", {
       month: "long",
       day: "numeric",
       year: "numeric",
-      timeZone: "Asia/Kolkata"
+      timeZone: effectiveTimezone
     });
   };
-  const getShiftIcon = (shift) => {
-    return shift === "Night" ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Moon, { className: "h-4 w-4" }) : /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Sun, { className: "h-4 w-4" });
+  const getShiftIcon2 = () => {
+    const shiftName = (currentShiftDetails.shiftName || "").toLowerCase();
+    if (shiftName.includes("night") || shiftName.includes("evening") || currentShiftDetails.shiftId === 1) {
+      return /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Moon, { className: "h-4 w-4" });
+    }
+    if (shiftName.includes("afternoon") || shiftName.includes("noon") || shiftName.includes("midday")) {
+      return /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Sun, { className: "h-4 w-4" });
+    }
+    return /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Sun, { className: "h-4 w-4" });
   };
   const {
     workspaces,
     summary,
     loading,
     error,
-    refetch
+    refetch,
+    shiftConfig: loadedShiftConfig
+    // Get shift config from the hook to pass to modal
   } = useWorkspaceHealth({
-    lineId,
+    lineId: effectiveLineId,
     companyId,
     enableRealtime: true,
     refreshInterval: 1e4
@@ -49528,7 +49999,7 @@ var WorkspaceHealthView = ({
     if (percentage >= 90) return "text-yellow-600 dark:text-yellow-400";
     return "text-red-600 dark:text-red-400";
   };
-  if (loading && !summary) {
+  if (loading && !summary || isShiftConfigLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "min-h-screen bg-gray-50 dark:bg-gray-900 p-4", children: /* @__PURE__ */ jsxRuntime.jsx(LoadingState, {}) });
   }
   if (error) {
@@ -49638,7 +50109,7 @@ var WorkspaceHealthView = ({
           /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs sm:text-sm md:text-base font-medium text-blue-600", children: formatDate(operationalDate) }),
           /* @__PURE__ */ jsxRuntime.jsx("div", { className: "hidden sm:block w-px h-4 bg-blue-300" }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1 sm:gap-2", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon(shiftType) }),
+            /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-blue-600", children: getShiftIcon2() }),
             /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs sm:text-sm md:text-base font-medium text-blue-600", children: [
               shiftType,
               " Shift"
@@ -49726,7 +50197,8 @@ var WorkspaceHealthView = ({
       {
         workspace: selectedWorkspace,
         isOpen: Boolean(selectedWorkspace),
-        onClose: handleCloseDetails
+        onClose: handleCloseDetails,
+        shiftConfig: loadedShiftConfig
       }
     )
   ] });
@@ -51763,25 +52235,15 @@ var TeamManagementView_default = TeamManagementView;
 function BottleneckClipsView({
   workspaceId: propWorkspaceId,
   workspaceName: propWorkspaceName,
+  lineId: propLineId,
   date: propDate,
   shift: propShift,
   totalOutput: propTotalOutput
 }) {
   const router$1 = router.useRouter();
-  const dashboardConfig = useDashboardConfig();
-  const timezone = useAppTimezone();
   const workspaceId = propWorkspaceId || router$1.query.workspaceId;
   const workspaceName = propWorkspaceName || router$1.query.workspaceName || "Workstation";
-  const operationalDate = React23.useMemo(() => {
-    if (propDate) return propDate;
-    return getOperationalDate(timezone || dashboardConfig.dateTimeConfig?.defaultTimezone || "UTC");
-  }, [propDate, timezone, dashboardConfig]);
-  const currentShift = React23.useMemo(() => {
-    if (propShift !== void 0) return propShift;
-    const tz = timezone || dashboardConfig.dateTimeConfig?.defaultTimezone || "UTC";
-    const shiftResult = getCurrentShift(tz, dashboardConfig?.shiftConfig);
-    return shiftResult.shiftId;
-  }, [propShift, dashboardConfig, timezone]);
+  const lineId = propLineId || router$1.query.lineId;
   if (!workspaceId) {
     return /* @__PURE__ */ jsxRuntime.jsx(LoadingPage_default, { message: "Loading workspace data..." });
   }
@@ -51830,8 +52292,9 @@ function BottleneckClipsView({
       {
         workspaceId,
         workspaceName,
-        date: operationalDate,
-        shift: currentShift,
+        lineId,
+        date: propDate,
+        shift: propShift,
         totalOutput: propTotalOutput,
         className: "h-full"
       }
@@ -53349,6 +53812,7 @@ exports.DEFAULT_ENDPOINTS_CONFIG = DEFAULT_ENDPOINTS_CONFIG;
 exports.DEFAULT_ENTITY_CONFIG = DEFAULT_ENTITY_CONFIG;
 exports.DEFAULT_MAP_VIEW_CONFIG = DEFAULT_MAP_VIEW_CONFIG;
 exports.DEFAULT_SHIFT_CONFIG = DEFAULT_SHIFT_CONFIG;
+exports.DEFAULT_SHIFT_DATA = DEFAULT_SHIFT_DATA;
 exports.DEFAULT_THEME_CONFIG = DEFAULT_THEME_CONFIG;
 exports.DEFAULT_VIDEO_CONFIG = DEFAULT_VIDEO_CONFIG;
 exports.DEFAULT_WORKSPACE_CONFIG = DEFAULT_WORKSPACE_CONFIG;
@@ -53532,6 +53996,7 @@ exports.getAllLineDisplayNames = getAllLineDisplayNames;
 exports.getAllThreadMessages = getAllThreadMessages;
 exports.getAllWorkspaceDisplayNamesAsync = getAllWorkspaceDisplayNamesAsync;
 exports.getAnonClient = getAnonClient;
+exports.getAvailableShiftIds = getAvailableShiftIds;
 exports.getBrowserName = getBrowserName;
 exports.getCameraNumber = getCameraNumber;
 exports.getCompanyMetricsTableName = getCompanyMetricsTableName;
@@ -53554,6 +54019,9 @@ exports.getNextUpdateInterval = getNextUpdateInterval;
 exports.getOperationalDate = getOperationalDate;
 exports.getS3SignedUrl = getS3SignedUrl;
 exports.getS3VideoSrc = getS3VideoSrc;
+exports.getShiftData = getShiftData;
+exports.getShiftNameById = getShiftNameById;
+exports.getShortShiftName = getShortShiftName;
 exports.getShortWorkspaceDisplayName = getShortWorkspaceDisplayName;
 exports.getShortWorkspaceDisplayNameAsync = getShortWorkspaceDisplayNameAsync;
 exports.getStoredWorkspaceMappings = getStoredWorkspaceMappings;
@@ -53566,6 +54034,7 @@ exports.getWorkspaceDisplayNameAsync = getWorkspaceDisplayNameAsync;
 exports.getWorkspaceDisplayNamesMap = getWorkspaceDisplayNamesMap;
 exports.getWorkspaceFromUrl = getWorkspaceFromUrl;
 exports.getWorkspaceNavigationParams = getWorkspaceNavigationParams;
+exports.hasAnyShiftData = hasAnyShiftData;
 exports.identifyCoreUser = identifyCoreUser;
 exports.initializeCoreMixpanel = initializeCoreMixpanel;
 exports.isLegacyConfiguration = isLegacyConfiguration;