@optifye/dashboard-core 6.10.10 → 6.10.11

package/dist/index.d.mts

@@ -4816,6 +4816,7 @@ declare class WorkspaceHealthService {
     private getFromCache;
     private setCache;
     private getShiftTiming;
+    private getShiftTimingForDateShift;
     private normalizeHourBucket;
     private normalizeOutputHourly;
     private interpretUptimeValue;

package/dist/index.d.ts

@@ -4816,6 +4816,7 @@ declare class WorkspaceHealthService {
     private getFromCache;
     private setCache;
     private getShiftTiming;
+    private getShiftTimingForDateShift;
     private normalizeHourBucket;
     private normalizeOutputHourly;
     private interpretUptimeValue;

package/dist/index.js

@@ -536,8 +536,13 @@ var memoizedOutputArrayAggregation = createMemoizedFunction(
 var getOperationalDate = (timezone, date = /* @__PURE__ */ new Date(), shiftStartTime = "06:00") => {
   const zonedDate = dateFnsTz.toZonedTime(date, timezone);
   const hours = zonedDate.getHours();
-  const [startHour = 6] = shiftStartTime.split(":").map(Number);
-  const operationalDate = hours < startHour ? dateFns.subDays(zonedDate, 1) : zonedDate;
+  const minutes = zonedDate.getMinutes();
+  const [startHourRaw, startMinuteRaw] = shiftStartTime.split(":").map(Number);
+  const startHour = Number.isFinite(startHourRaw) ? startHourRaw : 6;
+  const startMinute = Number.isFinite(startMinuteRaw) ? startMinuteRaw : 0;
+  const currentTotalMinutes = hours * 60 + minutes;
+  const shiftStartTotalMinutes = startHour * 60 + startMinute;
+  const operationalDate = currentTotalMinutes < shiftStartTotalMinutes ? dateFns.subDays(zonedDate, 1) : zonedDate;
   return dateFns.format(operationalDate, "yyyy-MM-dd");
 };
 function formatTimeInZone(time2, timezone, formatString = "HH:mm:ss") {
@@ -2457,6 +2462,39 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
       pendingMinutes
     };
   }
+  getShiftTimingForDateShift(shiftConfig, queryDate, queryShiftId) {
+    const targetShiftConfig = shiftConfig?.shifts?.find((s) => s.shiftId === queryShiftId);
+    const startTime = targetShiftConfig?.startTime || "06:00";
+    const endTime = targetShiftConfig?.endTime || "18:00";
+    const [year, month, day] = queryDate.split("-").map(Number);
+    const [startHour = 0, startMin = 0] = startTime.split(":").map(Number);
+    const [endHour = 0, endMin = 0] = endTime.split(":").map(Number);
+    const shiftStartDate = new Date(year, month - 1, day, startHour, startMin, 0);
+    let shiftEndDate;
+    if (endHour < startHour || endHour === startHour && endMin < startMin) {
+      shiftEndDate = new Date(year, month - 1, day + 1, endHour, endMin, 0);
+    } else {
+      shiftEndDate = new Date(year, month - 1, day, endHour, endMin, 0);
+    }
+    const totalMinutes = Math.floor((shiftEndDate.getTime() - shiftStartDate.getTime()) / (1e3 * 60));
+    const now2 = /* @__PURE__ */ new Date();
+    let completedMinutes;
+    if (shiftEndDate < now2) {
+      completedMinutes = totalMinutes;
+    } else if (shiftStartDate > now2) {
+      completedMinutes = 0;
+    } else {
+      completedMinutes = Math.floor((now2.getTime() - shiftStartDate.getTime()) / (1e3 * 60));
+    }
+    const pendingMinutes = totalMinutes - completedMinutes;
+    return {
+      shiftStartDate,
+      shiftEndDate,
+      totalMinutes,
+      completedMinutes,
+      pendingMinutes
+    };
+  }
   normalizeHourBucket(bucket) {
     if (Array.isArray(bucket)) return bucket;
     if (bucket && Array.isArray(bucket.values)) return bucket.values;
@@ -2926,14 +2964,22 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     if (!passedShiftConfig) {
       console.warn("[workspaceHealthService.calculateWorkspaceUptime] \u26A0\uFE0F No shiftConfig passed! Falling back to static config. This may cause incorrect shift_id queries.");
     }
-    const {
-      shiftId: currentShiftId,
-      date: currentDate,
-      shiftStartDate,
-      completedMinutes
-    } = this.getShiftTiming(effectiveTimezone, shiftConfig);
-    const queryDate = overrideDate ?? currentDate;
-    const queryShiftId = overrideShiftId ?? currentShiftId;
+    const currentTiming = this.getShiftTiming(effectiveTimezone, shiftConfig);
+    const queryDate = overrideDate ?? currentTiming.date;
+    const queryShiftId = overrideShiftId ?? currentTiming.shiftId;
+    let shiftStartDate = currentTiming.shiftStartDate;
+    let completedMinutes = currentTiming.completedMinutes;
+    const isHistoricalDate = overrideDate && overrideDate !== currentTiming.date;
+    const isDifferentShift = overrideShiftId !== void 0 && overrideShiftId !== currentTiming.shiftId;
+    if (isHistoricalDate || isDifferentShift) {
+      const overrideTiming = this.getShiftTimingForDateShift(
+        shiftConfig,
+        queryDate,
+        queryShiftId
+      );
+      shiftStartDate = overrideTiming.shiftStartDate;
+      completedMinutes = overrideTiming.completedMinutes;
+    }
     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, line_id").eq("date", queryDate).eq("shift_id", queryShiftId);
@@ -3008,12 +3054,27 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     const queryConfigs = [];
     lineShiftConfigs.forEach((config, lineId) => {
       const timing = this.getShiftTiming(timezone, config);
+      const queryDate = overrideDate ?? timing.date;
+      const queryShiftId = overrideShiftId ?? timing.shiftId;
+      let shiftStartDate = timing.shiftStartDate;
+      let completedMinutes = timing.completedMinutes;
+      const isHistoricalDate = overrideDate && overrideDate !== timing.date;
+      const isDifferentShift = overrideShiftId !== void 0 && overrideShiftId !== timing.shiftId;
+      if (isHistoricalDate || isDifferentShift) {
+        const overrideTiming = this.getShiftTimingForDateShift(
+          config,
+          queryDate,
+          queryShiftId
+        );
+        shiftStartDate = overrideTiming.shiftStartDate;
+        completedMinutes = overrideTiming.completedMinutes;
+      }
       queryConfigs.push({
         lineId,
-        date: overrideDate ?? timing.date,
-        shiftId: overrideShiftId ?? timing.shiftId,
-        shiftStartDate: timing.shiftStartDate,
-        completedMinutes: timing.completedMinutes
+        date: queryDate,
+        shiftId: queryShiftId,
+        shiftStartDate,
+        completedMinutes
       });
     });
     const uniqueQueries = /* @__PURE__ */ new Map();
@@ -3038,7 +3099,12 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     });
     const queryPromises = Array.from(uniqueQueries.entries()).map(async ([key, { date, shiftId, lineConfigs }]) => {
       try {
-        const { data, error } = await supabase.from(tableName).select("workspace_id, workspace_display_name, output_hourly, output_array, line_id").eq("date", date).eq("shift_id", shiftId);
+        const lineIds = Array.from(new Set(lineConfigs.map((lc) => lc.lineId).filter(Boolean)));
+        let query = supabase.from(tableName).select("workspace_id, workspace_display_name, output_hourly, output_array, line_id").eq("date", date).eq("shift_id", shiftId);
+        if (lineIds.length > 0) {
+          query = query.in("line_id", lineIds);
+        }
+        const { data, error } = await query;
         if (error) {
           console.error(`[calculateWorkspaceUptimeMultiLine] Error fetching metrics for ${key}:`, error);
           return { records: [], lineConfigs };
@@ -3059,11 +3125,16 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
           recordWorkspaceDisplayName: record.workspace_display_name,
           availableLineIds: lineConfigs.map((lc) => lc.lineId),
           matchFound: !!lineConfig,
-          matchedLineId: lineConfig?.lineId || "FALLBACK to " + lineConfigs[0]?.lineId
+          matchedLineId: lineConfig?.lineId || "none"
         });
-        const effectiveLineConfig = lineConfig || lineConfigs[0];
-        if (!effectiveLineConfig) continue;
-        const { shiftStartDate, completedMinutes } = effectiveLineConfig;
+        if (!lineConfig) {
+          console.warn("[calculateWorkspaceUptimeMultiLine] No line config match for record, skipping", {
+            recordLineId: record.line_id,
+            recordWorkspaceId: record.workspace_id
+          });
+          continue;
+        }
+        const { shiftStartDate, completedMinutes } = lineConfig;
         const outputHourly = this.normalizeOutputHourly(record.output_hourly || {});
         const outputArray = Array.isArray(record.output_array) ? record.output_array : [];
         let uptimeMinutes = 0;
@@ -58039,6 +58110,8 @@ var ClipVideoCarousel = ({ clips, clipsService }) => {
   const [videos, setVideos] = React24.useState([]);
   const [loading, setLoading] = React24.useState(false);
   const [error, setError] = React24.useState(null);
+  const currentVideo = videos[currentIndex];
+  const { crop: workspaceCrop } = useWorkspaceCrop(currentVideo?.workspace_id || null);
   React24.useEffect(() => {
     let cancelled = false;
     const load = async () => {
@@ -58058,7 +58131,8 @@ var ClipVideoCarousel = ({ clips, clipsService }) => {
             const cycleTime = typeof c.cycle_time_seconds === "number" ? c.cycle_time_seconds : typeof c.cycle_sec === "number" ? c.cycle_sec : void 0;
             return {
               ...video,
-              cycle_time_seconds: cycleTime ?? video.cycle_time_seconds
+              cycle_time_seconds: cycleTime ?? video.cycle_time_seconds,
+              workspace_id: c.workspace_id
             };
           })
         );
@@ -58089,17 +58163,17 @@ var ClipVideoCarousel = ({ clips, clipsService }) => {
     setCurrentIndex((prev) => (prev - 1 + Math.max(videos.length, 1)) % Math.max(videos.length, 1));
   };
   if (!clips || clips.length === 0) return null;
-  const currentVideo = videos[currentIndex];
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative group bg-gray-900 rounded-lg overflow-hidden aspect-video", children: [
     loading && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "absolute inset-0 flex items-center justify-center text-sm text-white/80", children: "Loading clips\u2026" }),
     !loading && error && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "absolute inset-0 flex items-center justify-center text-sm text-white/80", children: error }),
     !loading && !error && currentVideo?.src && /* @__PURE__ */ jsxRuntime.jsx(
-      VideoPlayer,
+      CroppedVideoPlayer,
       {
         src: currentVideo.src,
         className: "w-full h-full object-cover opacity-90 group-hover:opacity-100 transition-opacity",
         controls: true,
-        playsInline: true
+        playsInline: true,
+        crop: workspaceCrop?.crop || null
       },
       currentVideo.src
     ),

package/dist/index.mjs

@@ -507,8 +507,13 @@ var memoizedOutputArrayAggregation = createMemoizedFunction(
 var getOperationalDate = (timezone, date = /* @__PURE__ */ new Date(), shiftStartTime = "06:00") => {
   const zonedDate = toZonedTime(date, timezone);
   const hours = zonedDate.getHours();
-  const [startHour = 6] = shiftStartTime.split(":").map(Number);
-  const operationalDate = hours < startHour ? subDays(zonedDate, 1) : zonedDate;
+  const minutes = zonedDate.getMinutes();
+  const [startHourRaw, startMinuteRaw] = shiftStartTime.split(":").map(Number);
+  const startHour = Number.isFinite(startHourRaw) ? startHourRaw : 6;
+  const startMinute = Number.isFinite(startMinuteRaw) ? startMinuteRaw : 0;
+  const currentTotalMinutes = hours * 60 + minutes;
+  const shiftStartTotalMinutes = startHour * 60 + startMinute;
+  const operationalDate = currentTotalMinutes < shiftStartTotalMinutes ? subDays(zonedDate, 1) : zonedDate;
   return format(operationalDate, "yyyy-MM-dd");
 };
 function formatTimeInZone(time2, timezone, formatString = "HH:mm:ss") {
@@ -2428,6 +2433,39 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
       pendingMinutes
     };
   }
+  getShiftTimingForDateShift(shiftConfig, queryDate, queryShiftId) {
+    const targetShiftConfig = shiftConfig?.shifts?.find((s) => s.shiftId === queryShiftId);
+    const startTime = targetShiftConfig?.startTime || "06:00";
+    const endTime = targetShiftConfig?.endTime || "18:00";
+    const [year, month, day] = queryDate.split("-").map(Number);
+    const [startHour = 0, startMin = 0] = startTime.split(":").map(Number);
+    const [endHour = 0, endMin = 0] = endTime.split(":").map(Number);
+    const shiftStartDate = new Date(year, month - 1, day, startHour, startMin, 0);
+    let shiftEndDate;
+    if (endHour < startHour || endHour === startHour && endMin < startMin) {
+      shiftEndDate = new Date(year, month - 1, day + 1, endHour, endMin, 0);
+    } else {
+      shiftEndDate = new Date(year, month - 1, day, endHour, endMin, 0);
+    }
+    const totalMinutes = Math.floor((shiftEndDate.getTime() - shiftStartDate.getTime()) / (1e3 * 60));
+    const now2 = /* @__PURE__ */ new Date();
+    let completedMinutes;
+    if (shiftEndDate < now2) {
+      completedMinutes = totalMinutes;
+    } else if (shiftStartDate > now2) {
+      completedMinutes = 0;
+    } else {
+      completedMinutes = Math.floor((now2.getTime() - shiftStartDate.getTime()) / (1e3 * 60));
+    }
+    const pendingMinutes = totalMinutes - completedMinutes;
+    return {
+      shiftStartDate,
+      shiftEndDate,
+      totalMinutes,
+      completedMinutes,
+      pendingMinutes
+    };
+  }
   normalizeHourBucket(bucket) {
     if (Array.isArray(bucket)) return bucket;
     if (bucket && Array.isArray(bucket.values)) return bucket.values;
@@ -2897,14 +2935,22 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     if (!passedShiftConfig) {
       console.warn("[workspaceHealthService.calculateWorkspaceUptime] \u26A0\uFE0F No shiftConfig passed! Falling back to static config. This may cause incorrect shift_id queries.");
     }
-    const {
-      shiftId: currentShiftId,
-      date: currentDate,
-      shiftStartDate,
-      completedMinutes
-    } = this.getShiftTiming(effectiveTimezone, shiftConfig);
-    const queryDate = overrideDate ?? currentDate;
-    const queryShiftId = overrideShiftId ?? currentShiftId;
+    const currentTiming = this.getShiftTiming(effectiveTimezone, shiftConfig);
+    const queryDate = overrideDate ?? currentTiming.date;
+    const queryShiftId = overrideShiftId ?? currentTiming.shiftId;
+    let shiftStartDate = currentTiming.shiftStartDate;
+    let completedMinutes = currentTiming.completedMinutes;
+    const isHistoricalDate = overrideDate && overrideDate !== currentTiming.date;
+    const isDifferentShift = overrideShiftId !== void 0 && overrideShiftId !== currentTiming.shiftId;
+    if (isHistoricalDate || isDifferentShift) {
+      const overrideTiming = this.getShiftTimingForDateShift(
+        shiftConfig,
+        queryDate,
+        queryShiftId
+      );
+      shiftStartDate = overrideTiming.shiftStartDate;
+      completedMinutes = overrideTiming.completedMinutes;
+    }
     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, line_id").eq("date", queryDate).eq("shift_id", queryShiftId);
@@ -2979,12 +3025,27 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     const queryConfigs = [];
     lineShiftConfigs.forEach((config, lineId) => {
       const timing = this.getShiftTiming(timezone, config);
+      const queryDate = overrideDate ?? timing.date;
+      const queryShiftId = overrideShiftId ?? timing.shiftId;
+      let shiftStartDate = timing.shiftStartDate;
+      let completedMinutes = timing.completedMinutes;
+      const isHistoricalDate = overrideDate && overrideDate !== timing.date;
+      const isDifferentShift = overrideShiftId !== void 0 && overrideShiftId !== timing.shiftId;
+      if (isHistoricalDate || isDifferentShift) {
+        const overrideTiming = this.getShiftTimingForDateShift(
+          config,
+          queryDate,
+          queryShiftId
+        );
+        shiftStartDate = overrideTiming.shiftStartDate;
+        completedMinutes = overrideTiming.completedMinutes;
+      }
       queryConfigs.push({
         lineId,
-        date: overrideDate ?? timing.date,
-        shiftId: overrideShiftId ?? timing.shiftId,
-        shiftStartDate: timing.shiftStartDate,
-        completedMinutes: timing.completedMinutes
+        date: queryDate,
+        shiftId: queryShiftId,
+        shiftStartDate,
+        completedMinutes
       });
     });
     const uniqueQueries = /* @__PURE__ */ new Map();
@@ -3009,7 +3070,12 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     });
     const queryPromises = Array.from(uniqueQueries.entries()).map(async ([key, { date, shiftId, lineConfigs }]) => {
       try {
-        const { data, error } = await supabase.from(tableName).select("workspace_id, workspace_display_name, output_hourly, output_array, line_id").eq("date", date).eq("shift_id", shiftId);
+        const lineIds = Array.from(new Set(lineConfigs.map((lc) => lc.lineId).filter(Boolean)));
+        let query = supabase.from(tableName).select("workspace_id, workspace_display_name, output_hourly, output_array, line_id").eq("date", date).eq("shift_id", shiftId);
+        if (lineIds.length > 0) {
+          query = query.in("line_id", lineIds);
+        }
+        const { data, error } = await query;
         if (error) {
           console.error(`[calculateWorkspaceUptimeMultiLine] Error fetching metrics for ${key}:`, error);
           return { records: [], lineConfigs };
@@ -3030,11 +3096,16 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
           recordWorkspaceDisplayName: record.workspace_display_name,
           availableLineIds: lineConfigs.map((lc) => lc.lineId),
           matchFound: !!lineConfig,
-          matchedLineId: lineConfig?.lineId || "FALLBACK to " + lineConfigs[0]?.lineId
+          matchedLineId: lineConfig?.lineId || "none"
         });
-        const effectiveLineConfig = lineConfig || lineConfigs[0];
-        if (!effectiveLineConfig) continue;
-        const { shiftStartDate, completedMinutes } = effectiveLineConfig;
+        if (!lineConfig) {
+          console.warn("[calculateWorkspaceUptimeMultiLine] No line config match for record, skipping", {
+            recordLineId: record.line_id,
+            recordWorkspaceId: record.workspace_id
+          });
+          continue;
+        }
+        const { shiftStartDate, completedMinutes } = lineConfig;
         const outputHourly = this.normalizeOutputHourly(record.output_hourly || {});
         const outputArray = Array.isArray(record.output_array) ? record.output_array : [];
         let uptimeMinutes = 0;
@@ -58010,6 +58081,8 @@ var ClipVideoCarousel = ({ clips, clipsService }) => {
   const [videos, setVideos] = useState([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
+  const currentVideo = videos[currentIndex];
+  const { crop: workspaceCrop } = useWorkspaceCrop(currentVideo?.workspace_id || null);
   useEffect(() => {
     let cancelled = false;
     const load = async () => {
@@ -58029,7 +58102,8 @@ var ClipVideoCarousel = ({ clips, clipsService }) => {
             const cycleTime = typeof c.cycle_time_seconds === "number" ? c.cycle_time_seconds : typeof c.cycle_sec === "number" ? c.cycle_sec : void 0;
             return {
               ...video,
-              cycle_time_seconds: cycleTime ?? video.cycle_time_seconds
+              cycle_time_seconds: cycleTime ?? video.cycle_time_seconds,
+              workspace_id: c.workspace_id
             };
           })
         );
@@ -58060,17 +58134,17 @@ var ClipVideoCarousel = ({ clips, clipsService }) => {
     setCurrentIndex((prev) => (prev - 1 + Math.max(videos.length, 1)) % Math.max(videos.length, 1));
   };
   if (!clips || clips.length === 0) return null;
-  const currentVideo = videos[currentIndex];
   return /* @__PURE__ */ jsxs("div", { className: "relative group bg-gray-900 rounded-lg overflow-hidden aspect-video", children: [
     loading && /* @__PURE__ */ jsx("div", { className: "absolute inset-0 flex items-center justify-center text-sm text-white/80", children: "Loading clips\u2026" }),
     !loading && error && /* @__PURE__ */ jsx("div", { className: "absolute inset-0 flex items-center justify-center text-sm text-white/80", children: error }),
     !loading && !error && currentVideo?.src && /* @__PURE__ */ jsx(
-      VideoPlayer,
+      CroppedVideoPlayer,
       {
         src: currentVideo.src,
         className: "w-full h-full object-cover opacity-90 group-hover:opacity-100 transition-opacity",
         controls: true,
-        playsInline: true
+        playsInline: true,
+        crop: workspaceCrop?.crop || null
       },
       currentVideo.src
     ),

package/package.json

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