@optifye/dashboard-core 6.4.0 → 6.4.1

package/dist/index.js

@@ -3859,7 +3859,12 @@ var S3ClipsService = class {
    */
   async listS3Clips(params) {
     const { workspaceId, date, shiftId, maxKeys } = params;
+    if (!isValidShiftId(shiftId)) {
+      console.error(`[S3ClipsService] Invalid shift ID: ${shiftId}. Must be 0 (day) or 1 (night)`);
+      return [];
+    }
     const prefix = `sop_violations/${workspaceId}/${date}/${shiftId}/`;
+    console.log(`[S3ClipsService] Listing clips for workspace: ${workspaceId}, date: ${date}, shift: ${shiftId}`);
     const deduplicationKey = `list-s3-clips:${prefix}:${maxKeys || "all"}`;
     return this.requestCache.deduplicate(
       deduplicationKey,
@@ -4040,6 +4045,10 @@ var S3ClipsService = class {
     return sopConfig.default;
   }
   async getClipCounts(workspaceId, date, shiftId, buildIndex) {
+    if (!isValidShiftId(shiftId)) {
+      console.error(`[S3ClipsService] getClipCounts - Invalid shift ID: ${shiftId}. Must be 0 (day) or 1 (night)`);
+      return buildIndex ? { counts: {}, videoIndex: { byCategory: /* @__PURE__ */ new Map(), allVideos: [], counts: {}, workspaceId, date, shiftId: "0", lastUpdated: /* @__PURE__ */ new Date() } } : {};
+    }
     const deduplicationKey = `clip-counts:${workspaceId}:${date}:${shiftId}:${buildIndex ? "with-index" : "counts-only"}`;
     return this.requestCache.deduplicate(
       deduplicationKey,
@@ -4069,7 +4078,8 @@ var S3ClipsService = class {
         "cycle_completion",
         "bottleneck"
       ];
-      console.log(`[S3ClipsService] ${buildIndex ? "Building video index and counting" : "Fast counting"} clips for ${workspaceId} on ${date}, shift ${shiftId}`);
+      const shiftName = shiftId === 0 || shiftId === "0" ? "Day" : "Night";
+      console.log(`[S3ClipsService] ${buildIndex ? "Building video index and counting" : "Fast counting"} clips for ${workspaceId} on ${date}, shift ${shiftId} (${shiftName} Shift)`);
       const startTime = performance.now();
       const videoIndex = buildIndex ? {
         byCategory: /* @__PURE__ */ new Map(),
@@ -4216,6 +4226,10 @@ var S3ClipsService = class {
    * Get first clip for a specific category with deduplication
    */
   async getFirstClipForCategory(workspaceId, date, shiftId, category) {
+    if (!isValidShiftId(shiftId)) {
+      console.error(`[S3ClipsService] getFirstClipForCategory - Invalid shift ID: ${shiftId}. Must be 0 (day) or 1 (night)`);
+      return null;
+    }
     const deduplicationKey = `first-clip:${workspaceId}:${date}:${shiftId}:${category}`;
     return this.requestCache.deduplicate(
       deduplicationKey,
@@ -11623,7 +11637,18 @@ var usePrefetchClipCounts = ({
   }, [subscriberId]);
   const prefetchParams = React19.useMemo(() => {
     const operationalDate = date || getOperationalDate();
-    const shiftStr = shift?.toString() || "0";
+    let shiftStr;
+    if (shift !== void 0 && shift !== null) {
+      shiftStr = shift.toString();
+      console.log(`[usePrefetchClipCounts] Using provided shift: ${shiftStr} for date: ${operationalDate}`);
+    } else if (date) {
+      shiftStr = "0";
+      console.log(`[usePrefetchClipCounts] No shift provided for historical date ${date}, defaulting to day shift (0)`);
+    } else {
+      const currentShift = getCurrentShift2();
+      shiftStr = currentShift.shiftId.toString();
+      console.log(`[usePrefetchClipCounts] Using current operational shift: ${shiftStr} (${currentShift.shiftName})`);
+    }
     return {
       workspaceId: workspaceId || "",
       date: operationalDate,
@@ -26290,6 +26315,21 @@ var BottlenecksContent = ({
     }
     return videoPrefetchManager.getS3Service(dashboardConfig);
   }, [dashboardConfig]);
+  const effectiveShift = React19.useMemo(() => {
+    if (shift !== void 0 && shift !== null) {
+      const shiftStr = shift.toString();
+      console.log(`[BottlenecksContent] Using provided shift: ${shiftStr} for date: ${date}`);
+      return shiftStr;
+    }
+    if (date) {
+      console.log(`[BottlenecksContent] No shift provided for historical date ${date}, defaulting to day shift (0)`);
+      return "0";
+    } else {
+      const currentShift = getCurrentShift2();
+      console.log(`[BottlenecksContent] Using current operational shift: ${currentShift.shiftId} (${currentShift.shiftName})`);
+      return currentShift.shiftId.toString();
+    }
+  }, [shift, date]);
   const {
     data: prefetchData,
     isFullyIndexed,
@@ -26298,7 +26338,7 @@ var BottlenecksContent = ({
   } = usePrefetchClipCounts({
     workspaceId,
     date: date || getOperationalDate(),
-    shift: shift?.toString() || "0",
+    shift: effectiveShift,
     enabled: !!workspaceId && !!s3ClipsService,
     buildIndex: true
   });
@@ -26312,7 +26352,7 @@ var BottlenecksContent = ({
     fetchInProgressRef.current.add(operationKey);
     try {
       const operationalDate = date || getOperationalDate();
-      const shiftStr = shift?.toString() || "0";
+      const shiftStr = effectiveShift;
       console.log(`[BottlenecksContent] Fetching clip counts directly for ${workspaceId}`);
       const cacheKey = `clip-counts:${workspaceId}:${operationalDate}:${shiftStr}`;
       const cachedResult = await smartVideoCache.getClipCounts(cacheKey);
@@ -26353,7 +26393,7 @@ var BottlenecksContent = ({
     } finally {
       fetchInProgressRef.current.delete(operationKey);
     }
-  }, [workspaceId, date, s3ClipsService, shift, dashboardConfig, updateClipCounts, updateVideoIndex]);
+  }, [workspaceId, date, s3ClipsService, effectiveShift, dashboardConfig, updateClipCounts, updateVideoIndex]);
   const loadingCategoryRef = React19.useRef(null);
   const videoRetryCountRef = React19.useRef(0);
   const loadingVideosRef = React19.useRef(/* @__PURE__ */ new Set());
@@ -26401,7 +26441,7 @@ var BottlenecksContent = ({
         }
         if (!video) {
           const operationalDate = date || getOperationalDate();
-          const shiftStr = shift?.toString() || "0";
+          const shiftStr = effectiveShift;
           video = await s3ClipsService.getClipByIndex(
             workspaceId,
             operationalDate,
@@ -26434,7 +26474,7 @@ var BottlenecksContent = ({
     Promise.all(loadPromises).catch((err) => {
       console.warn("[ensureVideosLoaded] Some videos failed to preload:", err);
     });
-  }, [s3ClipsService, workspaceId, clipCounts, sopCategories, date, shift]);
+  }, [s3ClipsService, workspaceId, clipCounts, sopCategories, date, effectiveShift]);
   const loadFirstVideoForCategory = React19.useCallback(async (category) => {
     if (!workspaceId || !s3ClipsService || !isMountedRef.current) return;
     const targetCategory = category || activeFilterRef.current;
@@ -26450,7 +26490,7 @@ var BottlenecksContent = ({
     }
     try {
       const operationalDate = date || getOperationalDate();
-      const shiftStr = shift?.toString() || "0";
+      const shiftStr = effectiveShift;
       if (!clipCounts[targetCategory] && !videoIndex) {
         const cacheKey = `clip-counts:${workspaceId}:${operationalDate}:${shiftStr}`;
         const cachedResult = await smartVideoCache.getClipCounts(cacheKey);
@@ -26532,12 +26572,12 @@ var BottlenecksContent = ({
       loadingCategoryRef.current = null;
       fetchInProgressRef.current.delete(operationKey);
     }
-  }, [workspaceId, date, s3ClipsService, clipCounts, videoIndex, shift, updateClipCounts, updateVideoIndex]);
+  }, [workspaceId, date, s3ClipsService, clipCounts, videoIndex, effectiveShift, updateClipCounts, updateVideoIndex]);
   React19.useEffect(() => {
     if (s3ClipsService && !prefetchData) {
       fetchClipCounts();
     }
-  }, [workspaceId, date, shift, s3ClipsService, fetchClipCounts, updateClipCounts, updateVideoIndex, prefetchData]);
+  }, [workspaceId, date, effectiveShift, s3ClipsService, fetchClipCounts, updateClipCounts, updateVideoIndex, prefetchData]);
   React19.useEffect(() => {
     if (prefetchData) {
       console.log(`[BottlenecksContent] Received prefetch update - status: ${prefetchStatus}, videos: ${prefetchData.videoIndex.allVideos.length}, ID: ${prefetchData.videoIndex._debugId || "NO_ID"}`);
@@ -26724,7 +26764,7 @@ var BottlenecksContent = ({
         }
         if (!video && s3ClipsService) {
           const operationalDate = date || getOperationalDate();
-          const shiftStr = shift?.toString() || "0";
+          const shiftStr = effectiveShift;
           video = await s3ClipsService.getClipByIndex(
             workspaceId,
             operationalDate,
@@ -26760,7 +26800,7 @@ var BottlenecksContent = ({
         }
       }
     }
-  }, [clipCounts, filteredVideos.length, s3ClipsService, workspaceId, date, shift]);
+  }, [clipCounts, filteredVideos.length, s3ClipsService, workspaceId, date, effectiveShift]);
   const handlePrevious = React19.useCallback(() => {
     if (!isMountedRef.current) return;
     const currentIdx = currentIndexRef.current;

package/dist/index.mjs

@@ -3829,7 +3829,12 @@ var S3ClipsService = class {
    */
   async listS3Clips(params) {
     const { workspaceId, date, shiftId, maxKeys } = params;
+    if (!isValidShiftId(shiftId)) {
+      console.error(`[S3ClipsService] Invalid shift ID: ${shiftId}. Must be 0 (day) or 1 (night)`);
+      return [];
+    }
     const prefix = `sop_violations/${workspaceId}/${date}/${shiftId}/`;
+    console.log(`[S3ClipsService] Listing clips for workspace: ${workspaceId}, date: ${date}, shift: ${shiftId}`);
     const deduplicationKey = `list-s3-clips:${prefix}:${maxKeys || "all"}`;
     return this.requestCache.deduplicate(
       deduplicationKey,
@@ -4010,6 +4015,10 @@ var S3ClipsService = class {
     return sopConfig.default;
   }
   async getClipCounts(workspaceId, date, shiftId, buildIndex) {
+    if (!isValidShiftId(shiftId)) {
+      console.error(`[S3ClipsService] getClipCounts - Invalid shift ID: ${shiftId}. Must be 0 (day) or 1 (night)`);
+      return buildIndex ? { counts: {}, videoIndex: { byCategory: /* @__PURE__ */ new Map(), allVideos: [], counts: {}, workspaceId, date, shiftId: "0", lastUpdated: /* @__PURE__ */ new Date() } } : {};
+    }
     const deduplicationKey = `clip-counts:${workspaceId}:${date}:${shiftId}:${buildIndex ? "with-index" : "counts-only"}`;
     return this.requestCache.deduplicate(
       deduplicationKey,
@@ -4039,7 +4048,8 @@ var S3ClipsService = class {
         "cycle_completion",
         "bottleneck"
       ];
-      console.log(`[S3ClipsService] ${buildIndex ? "Building video index and counting" : "Fast counting"} clips for ${workspaceId} on ${date}, shift ${shiftId}`);
+      const shiftName = shiftId === 0 || shiftId === "0" ? "Day" : "Night";
+      console.log(`[S3ClipsService] ${buildIndex ? "Building video index and counting" : "Fast counting"} clips for ${workspaceId} on ${date}, shift ${shiftId} (${shiftName} Shift)`);
       const startTime = performance.now();
       const videoIndex = buildIndex ? {
         byCategory: /* @__PURE__ */ new Map(),
@@ -4186,6 +4196,10 @@ var S3ClipsService = class {
    * Get first clip for a specific category with deduplication
    */
   async getFirstClipForCategory(workspaceId, date, shiftId, category) {
+    if (!isValidShiftId(shiftId)) {
+      console.error(`[S3ClipsService] getFirstClipForCategory - Invalid shift ID: ${shiftId}. Must be 0 (day) or 1 (night)`);
+      return null;
+    }
     const deduplicationKey = `first-clip:${workspaceId}:${date}:${shiftId}:${category}`;
     return this.requestCache.deduplicate(
       deduplicationKey,
@@ -11593,7 +11607,18 @@ var usePrefetchClipCounts = ({
   }, [subscriberId]);
   const prefetchParams = useMemo(() => {
     const operationalDate = date || getOperationalDate();
-    const shiftStr = shift?.toString() || "0";
+    let shiftStr;
+    if (shift !== void 0 && shift !== null) {
+      shiftStr = shift.toString();
+      console.log(`[usePrefetchClipCounts] Using provided shift: ${shiftStr} for date: ${operationalDate}`);
+    } else if (date) {
+      shiftStr = "0";
+      console.log(`[usePrefetchClipCounts] No shift provided for historical date ${date}, defaulting to day shift (0)`);
+    } else {
+      const currentShift = getCurrentShift2();
+      shiftStr = currentShift.shiftId.toString();
+      console.log(`[usePrefetchClipCounts] Using current operational shift: ${shiftStr} (${currentShift.shiftName})`);
+    }
     return {
       workspaceId: workspaceId || "",
       date: operationalDate,
@@ -26260,6 +26285,21 @@ var BottlenecksContent = ({
     }
     return videoPrefetchManager.getS3Service(dashboardConfig);
   }, [dashboardConfig]);
+  const effectiveShift = useMemo(() => {
+    if (shift !== void 0 && shift !== null) {
+      const shiftStr = shift.toString();
+      console.log(`[BottlenecksContent] Using provided shift: ${shiftStr} for date: ${date}`);
+      return shiftStr;
+    }
+    if (date) {
+      console.log(`[BottlenecksContent] No shift provided for historical date ${date}, defaulting to day shift (0)`);
+      return "0";
+    } else {
+      const currentShift = getCurrentShift2();
+      console.log(`[BottlenecksContent] Using current operational shift: ${currentShift.shiftId} (${currentShift.shiftName})`);
+      return currentShift.shiftId.toString();
+    }
+  }, [shift, date]);
   const {
     data: prefetchData,
     isFullyIndexed,
@@ -26268,7 +26308,7 @@ var BottlenecksContent = ({
   } = usePrefetchClipCounts({
     workspaceId,
     date: date || getOperationalDate(),
-    shift: shift?.toString() || "0",
+    shift: effectiveShift,
     enabled: !!workspaceId && !!s3ClipsService,
     buildIndex: true
   });
@@ -26282,7 +26322,7 @@ var BottlenecksContent = ({
     fetchInProgressRef.current.add(operationKey);
     try {
       const operationalDate = date || getOperationalDate();
-      const shiftStr = shift?.toString() || "0";
+      const shiftStr = effectiveShift;
       console.log(`[BottlenecksContent] Fetching clip counts directly for ${workspaceId}`);
       const cacheKey = `clip-counts:${workspaceId}:${operationalDate}:${shiftStr}`;
       const cachedResult = await smartVideoCache.getClipCounts(cacheKey);
@@ -26323,7 +26363,7 @@ var BottlenecksContent = ({
     } finally {
       fetchInProgressRef.current.delete(operationKey);
     }
-  }, [workspaceId, date, s3ClipsService, shift, dashboardConfig, updateClipCounts, updateVideoIndex]);
+  }, [workspaceId, date, s3ClipsService, effectiveShift, dashboardConfig, updateClipCounts, updateVideoIndex]);
   const loadingCategoryRef = useRef(null);
   const videoRetryCountRef = useRef(0);
   const loadingVideosRef = useRef(/* @__PURE__ */ new Set());
@@ -26371,7 +26411,7 @@ var BottlenecksContent = ({
         }
         if (!video) {
           const operationalDate = date || getOperationalDate();
-          const shiftStr = shift?.toString() || "0";
+          const shiftStr = effectiveShift;
           video = await s3ClipsService.getClipByIndex(
             workspaceId,
             operationalDate,
@@ -26404,7 +26444,7 @@ var BottlenecksContent = ({
     Promise.all(loadPromises).catch((err) => {
       console.warn("[ensureVideosLoaded] Some videos failed to preload:", err);
     });
-  }, [s3ClipsService, workspaceId, clipCounts, sopCategories, date, shift]);
+  }, [s3ClipsService, workspaceId, clipCounts, sopCategories, date, effectiveShift]);
   const loadFirstVideoForCategory = useCallback(async (category) => {
     if (!workspaceId || !s3ClipsService || !isMountedRef.current) return;
     const targetCategory = category || activeFilterRef.current;
@@ -26420,7 +26460,7 @@ var BottlenecksContent = ({
     }
     try {
       const operationalDate = date || getOperationalDate();
-      const shiftStr = shift?.toString() || "0";
+      const shiftStr = effectiveShift;
       if (!clipCounts[targetCategory] && !videoIndex) {
         const cacheKey = `clip-counts:${workspaceId}:${operationalDate}:${shiftStr}`;
         const cachedResult = await smartVideoCache.getClipCounts(cacheKey);
@@ -26502,12 +26542,12 @@ var BottlenecksContent = ({
       loadingCategoryRef.current = null;
       fetchInProgressRef.current.delete(operationKey);
     }
-  }, [workspaceId, date, s3ClipsService, clipCounts, videoIndex, shift, updateClipCounts, updateVideoIndex]);
+  }, [workspaceId, date, s3ClipsService, clipCounts, videoIndex, effectiveShift, updateClipCounts, updateVideoIndex]);
   useEffect(() => {
     if (s3ClipsService && !prefetchData) {
       fetchClipCounts();
     }
-  }, [workspaceId, date, shift, s3ClipsService, fetchClipCounts, updateClipCounts, updateVideoIndex, prefetchData]);
+  }, [workspaceId, date, effectiveShift, s3ClipsService, fetchClipCounts, updateClipCounts, updateVideoIndex, prefetchData]);
   useEffect(() => {
     if (prefetchData) {
       console.log(`[BottlenecksContent] Received prefetch update - status: ${prefetchStatus}, videos: ${prefetchData.videoIndex.allVideos.length}, ID: ${prefetchData.videoIndex._debugId || "NO_ID"}`);
@@ -26694,7 +26734,7 @@ var BottlenecksContent = ({
         }
         if (!video && s3ClipsService) {
           const operationalDate = date || getOperationalDate();
-          const shiftStr = shift?.toString() || "0";
+          const shiftStr = effectiveShift;
           video = await s3ClipsService.getClipByIndex(
             workspaceId,
             operationalDate,
@@ -26730,7 +26770,7 @@ var BottlenecksContent = ({
         }
       }
     }
-  }, [clipCounts, filteredVideos.length, s3ClipsService, workspaceId, date, shift]);
+  }, [clipCounts, filteredVideos.length, s3ClipsService, workspaceId, date, effectiveShift]);
   const handlePrevious = useCallback(() => {
     if (!isMountedRef.current) return;
     const currentIdx = currentIndexRef.current;

package/package.json

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