@optifye/dashboard-core 6.1.0 → 6.1.5

package/dist/index.js

@@ -32591,69 +32591,119 @@ var TargetsView = ({
   const { skus, isLoading: skusLoading } = useSKUs(companyId);
   const skuEnabled = dashboardConfig?.skuConfig?.enabled || false;
   React19.useEffect(() => {
-    const fetchLineDetails = async () => {
+    let timeoutId;
+    let retryCount = 0;
+    const MAX_RETRIES2 = 2;
+    const LOADING_TIMEOUT = 15e3;
+    const fetchInitialData = async () => {
       if (!supabase || lineIds.length === 0) return;
-      const detailsPromises = lineIds.map(async (lineId) => {
-        try {
-          const { data, error } = await supabase.from("lines").select("factory_id").eq("id", lineId).single();
-          if (error) {
-            console.error(`Error fetching factory_id for line ${lineId}:`, error);
-            return { lineId, factoryId: void 0 };
-          }
-          return { lineId, factoryId: data?.factory_id };
-        } catch (err) {
-          console.error(`Exception fetching factory_id for line ${lineId}:`, err);
-          return { lineId, factoryId: void 0 };
+      setIsLoading(true);
+      timeoutId = setTimeout(() => {
+        console.error("Loading timeout reached");
+        if (retryCount < MAX_RETRIES2) {
+          retryCount++;
+          console.log(`Retrying... (attempt ${retryCount + 1}/${MAX_RETRIES2 + 1})`);
+          sonner.toast.warning("Loading is taking longer than expected. Retrying...");
+          fetchInitialData();
+        } else {
+          setIsLoading(false);
+          sonner.toast.error("Failed to load data. Please refresh the page.");
         }
-      });
-      const results = await Promise.all(detailsPromises);
-      setLineWorkspaces((prev) => {
-        const newWorkspaces = { ...prev };
-        let needsUpdate = false;
-        results.forEach((result) => {
-          if (result.factoryId && newWorkspaces[result.lineId] && newWorkspaces[result.lineId].factoryId !== result.factoryId) {
-            newWorkspaces[result.lineId].factoryId = result.factoryId;
-            needsUpdate = true;
-          }
-        });
-        return needsUpdate ? newWorkspaces : prev;
-      });
-    };
-    fetchLineDetails();
-  }, [supabase, lineIds]);
-  React19.useEffect(() => {
-    const fetchActions = async () => {
-      if (!supabase) {
-        console.error("Supabase client not available in fetchActions");
-        sonner.toast.error("Initialization error, please refresh.");
-        return;
-      }
+      }, LOADING_TIMEOUT);
       try {
-        const actions = await actionService.getActionsByName(
-          [ACTION_NAMES.ASSEMBLY, ACTION_NAMES.PACKAGING],
-          companyId
-        );
+        const [factoryResults, actions] = await Promise.all([
+          // Fetch factory IDs
+          Promise.all(lineIds.map(async (lineId) => {
+            try {
+              const { data, error } = await supabase.from("lines").select("factory_id").eq("id", lineId).single();
+              if (error) {
+                console.error(`Error fetching factory_id for line ${lineId}:`, error);
+                return { lineId, factoryId: void 0 };
+              }
+              return { lineId, factoryId: data?.factory_id };
+            } catch (err) {
+              console.error(`Exception fetching factory_id for line ${lineId}:`, err);
+              return { lineId, factoryId: void 0 };
+            }
+          })),
+          // Fetch action IDs
+          actionService.getActionsByName(
+            [ACTION_NAMES.ASSEMBLY, ACTION_NAMES.PACKAGING],
+            companyId
+          )
+        ]);
         const assemblyAction = actions.find((a) => a.action_name === ACTION_NAMES.ASSEMBLY);
         const packagingAction = actions.find((a) => a.action_name === ACTION_NAMES.PACKAGING);
         if (!assemblyAction || !packagingAction) {
           throw new Error("Could not find required actions");
         }
-        const ids = {
+        const actionIdsData = {
           assembly: assemblyAction.id,
           packaging: packagingAction.id
         };
-        console.log("Fetched Action IDs:", {
-          "Assembly Action ID": ids.assembly,
-          "Packaging Action ID": ids.packaging
+        setActionIds(actionIdsData);
+        const updatedLineWorkspaces = { ...initialLineWorkspaces };
+        factoryResults.forEach((result) => {
+          if (result.factoryId && updatedLineWorkspaces[result.lineId]) {
+            updatedLineWorkspaces[result.lineId].factoryId = result.factoryId;
+          }
         });
-        setActionIds(ids);
+        const currentDate = getOperationalDate();
+        for (const lineId of lineIds) {
+          if (!updatedLineWorkspaces[lineId]?.factoryId) {
+            console.warn(`Skipping workspace fetch for line ${lineId} - no factory ID`);
+            continue;
+          }
+          try {
+            const workspacesData = await workspaceService.getWorkspaces(lineId);
+            const actionThresholds = await workspaceService.getActionThresholds(
+              lineId,
+              currentDate,
+              selectedShift
+            );
+            const mappedWorkspaces = workspacesData.map((ws) => {
+              const threshold = actionThresholds.find((t) => t.workspace_id === ws.id);
+              return {
+                id: ws.id,
+                name: ws.workspace_id,
+                targetPPH: threshold?.pph_threshold ?? (ws.action_pph_threshold === null ? "" : ws.action_pph_threshold),
+                targetCycleTime: threshold?.ideal_cycle_time ?? (ws.action_cycle_time === null ? "" : ws.action_cycle_time),
+                targetDayOutput: threshold?.total_day_output ?? (ws.action_total_day_output === null ? "" : ws.action_total_day_output),
+                actionType: ws.action_id === actionIdsData.assembly ? "assembly" : ws.action_id === actionIdsData.packaging ? "packaging" : "assembly",
+                actionId: ws.action_id === actionIdsData.assembly ? actionIdsData.assembly : ws.action_id === actionIdsData.packaging ? actionIdsData.packaging : actionIdsData.assembly
+              };
+            }).sort((a, b) => a.name.localeCompare(b.name, void 0, { numeric: true }));
+            updatedLineWorkspaces[lineId].workspaces = mappedWorkspaces;
+          } catch (error) {
+            console.error(`Error fetching workspace data for line ${lineId}:`, error);
+          }
+        }
+        setLineWorkspaces(updatedLineWorkspaces);
+        await fetchAllShiftsData(updatedLineWorkspaces);
       } catch (error) {
-        console.error("Error fetching actions:", error);
-        sonner.toast.error("Failed to load action data");
+        console.error("Error fetching initial data:", error);
+        clearTimeout(timeoutId);
+        if (retryCount < MAX_RETRIES2) {
+          retryCount++;
+          console.log(`Error occurred, retrying... (attempt ${retryCount + 1}/${MAX_RETRIES2 + 1})`);
+          sonner.toast.warning("Error loading data. Retrying...");
+          setTimeout(() => fetchInitialData(), 1e3);
+        } else {
+          sonner.toast.error("Failed to load initial data");
+          setIsLoading(false);
+        }
+      } finally {
+        clearTimeout(timeoutId);
+        if (retryCount === 0 || retryCount >= MAX_RETRIES2) {
+          setIsLoading(false);
+        }
       }
     };
-    fetchActions();
-  }, [supabase, companyId]);
+    fetchInitialData();
+    return () => {
+      clearTimeout(timeoutId);
+    };
+  }, [supabase, lineIds, companyId]);
   React19.useCallback(async (shiftId) => {
     try {
       if (!supabase) return;
@@ -32896,92 +32946,6 @@ var TargetsView = ({
       };
     }
   }, [supabase]);
-  React19.useEffect(() => {
-    const allFactoryIdsLoaded = lineIds.every((lineId) => lineWorkspaces[lineId]?.factoryId);
-    if (!actionIds || !allFactoryIdsLoaded) {
-      return;
-    }
-    const workspacesAlreadyLoadedForAnyLine = Object.values(lineWorkspaces).some(
-      (line) => line.workspaces && line.workspaces.length > 0
-    );
-    if (workspacesAlreadyLoadedForAnyLine) {
-      setIsLoading(false);
-      return;
-    }
-    const fetchWorkspacesAndThenThresholds = async () => {
-      setIsLoading(true);
-      try {
-        if (!supabase) {
-          sonner.toast.error("Supabase client not available");
-          setIsLoading(false);
-          return;
-        }
-        console.log("Starting workspace fetch with actionIds and loaded factoryIds.");
-        const newUpdatedLineWorkspaces = { ...lineWorkspaces };
-        let workspacesHaveBeenUpdated = false;
-        for (const lineId of lineIds) {
-          if (!newUpdatedLineWorkspaces[lineId]?.factoryId) {
-            console.warn(`FactoryId for line ${lineId} missing during workspace fetch. Skipping its workspaces.`);
-            continue;
-          }
-          try {
-            const fetchedLineWorkspacesData = await workspaceService.getWorkspaces(lineId);
-            let mappedWorkspaces = fetchedLineWorkspacesData.map((ws) => ({
-              id: ws.id,
-              name: ws.workspace_id,
-              targetPPH: ws.action_pph_threshold === null ? "" : ws.action_pph_threshold,
-              targetCycleTime: ws.action_cycle_time === null ? "" : ws.action_cycle_time,
-              targetDayOutput: ws.action_total_day_output === null ? "" : ws.action_total_day_output,
-              actionType: ws.action_id === actionIds.assembly ? "assembly" : ws.action_id === actionIds.packaging ? "packaging" : "assembly",
-              actionId: ws.action_id === actionIds.assembly ? actionIds.assembly : ws.action_id === actionIds.packaging ? actionIds.packaging : actionIds.assembly
-            })).sort((a, b) => a.name.localeCompare(b.name, void 0, { numeric: true }));
-            const currentDate = getOperationalDate();
-            try {
-              const actionThresholds = await workspaceService.getActionThresholds(
-                lineId,
-                currentDate,
-                selectedShift
-              );
-              mappedWorkspaces = mappedWorkspaces.map((ws) => {
-                const threshold = actionThresholds.find((t) => t.workspace_id === ws.id);
-                if (threshold) {
-                  return {
-                    ...ws,
-                    targetPPH: threshold.pph_threshold,
-                    targetCycleTime: threshold.ideal_cycle_time,
-                    targetDayOutput: threshold.total_day_output
-                  };
-                }
-                return ws;
-              });
-              console.log(`Merged action thresholds for line ${lineId}, found ${actionThresholds.length} saved thresholds`);
-            } catch (error) {
-              console.error(`Error fetching action thresholds for line ${lineId}:`, error);
-            }
-            if (JSON.stringify(mappedWorkspaces) !== JSON.stringify(newUpdatedLineWorkspaces[lineId].workspaces)) {
-              newUpdatedLineWorkspaces[lineId] = {
-                ...newUpdatedLineWorkspaces[lineId],
-                workspaces: mappedWorkspaces
-              };
-              workspacesHaveBeenUpdated = true;
-            }
-          } catch (error) {
-            console.error(`Error fetching workspaces for line ${lineId}:`, error);
-          }
-        }
-        if (workspacesHaveBeenUpdated) {
-          setLineWorkspaces(newUpdatedLineWorkspaces);
-        }
-        await fetchAllShiftsData(newUpdatedLineWorkspaces);
-      } catch (error) {
-        console.error("Error in fetchWorkspacesAndThenThresholds:", error);
-        sonner.toast.error("Failed to load workspace data");
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchWorkspacesAndThenThresholds();
-  }, [actionIds, supabase, lineIds]);
   const toggleLineDropdown = React19.useCallback((lineId) => {
     setLineWorkspaces((prev) => {
       const newIsOpen = !prev[lineId].isOpen;
@@ -33208,14 +33172,15 @@ var TargetsView = ({
       console.log(`[handleSaveLine] workspaceThresholdUpdates for ${lineId}:`, workspaceThresholdUpdates);
       await workspaceService.updateActionThresholds(workspaceThresholdUpdates);
       console.log(`[handleSaveLine] Successfully updated action thresholds for ${lineId}`);
+      const packagingWorkspaces = lineDataToSave.workspaces.filter((ws) => ws.actionType === "packaging");
       const lineThresholdData = {
         factory_id: currentFactoryId,
         line_id: lineId,
         date: currentDate,
         shift_id: selectedShift,
         product_code: lineDataToSave.productId,
-        threshold_day_output: lineDataToSave.workspaces.reduce((acc, ws) => acc + (Number(ws.targetDayOutput) || 0), 0),
-        threshold_pph: lineDataToSave.workspaces.reduce((acc, ws) => acc + (Number(ws.targetPPH) || 0), 0),
+        threshold_day_output: packagingWorkspaces.reduce((acc, ws) => acc + (Number(ws.targetDayOutput) || 0), 0),
+        threshold_pph: packagingWorkspaces.reduce((acc, ws) => acc + (Number(ws.targetPPH) || 0), 0),
         ...skuEnabled && lineDataToSave.selectedSKU ? { sku_id: lineDataToSave.selectedSKU.id } : {}
       };
       console.log(`[handleSaveLine] lineThresholdData for upsert on ${lineId}:`, lineThresholdData);
@@ -33226,20 +33191,6 @@ var TargetsView = ({
         throw lineUpsertError;
       }
       console.log(`[handleSaveLine] Successfully upserted line_thresholds for ${lineId}`);
-      const operatingHoursData = {
-        line_id: lineId,
-        shift_id: selectedShift,
-        start_time: lineDataToSave.shiftStartTime,
-        end_time: lineDataToSave.shiftEndTime,
-        breaks: lineDataToSave.breaks
-      };
-      console.log(`[handleSaveLine] operatingHoursData for upsert on ${lineId}:`, operatingHoursData);
-      const { error: operatingHoursError } = await supabase.from("line_operating_hours").upsert(operatingHoursData, { onConflict: "line_id,shift_id" });
-      if (operatingHoursError) {
-        console.error(`[handleSaveLine] Error upserting line_operating_hours for ${lineId}:`, operatingHoursError);
-        sonner.toast.error(`Failed to update shift hours for ${lineNames[lineId] || lineId}`);
-      }
-      console.log(`[handleSaveLine] Successfully upserted line_operating_hours for ${lineId}`);
       setSaveSuccess((prev) => ({ ...prev, [lineId]: true }));
       sonner.toast.success(`${lineNames[lineId] || lineId} targets saved successfully`);
       if (onSaveChanges) onSaveChanges(lineId);
@@ -33284,19 +33235,6 @@ var TargetsView = ({
         })
       }
     }));
-    try {
-      const line = lineWorkspaces[updates.lineId];
-      const currentHours = await loadOperatingHours(updates.lineId, selectedShift);
-      await supabase?.from("line_operating_hours").upsert({
-        line_id: updates.lineId,
-        shift_id: selectedShift,
-        start_time: line.shiftStartTime,
-        end_time: line.shiftEndTime,
-        breaks: currentHours?.breaks || line.breaks || []
-      });
-    } catch (error) {
-      console.error("Error updating line operating hours:", error);
-    }
     sonner.toast.success(`Updated ${updates.workspaceIds.length} workspaces in ${lineNames[updates.lineId] || updates.lineId}`);
     setIsBulkConfigureOpen(false);
   };

package/dist/index.mjs

@@ -32562,69 +32562,119 @@ var TargetsView = ({
   const { skus, isLoading: skusLoading } = useSKUs(companyId);
   const skuEnabled = dashboardConfig?.skuConfig?.enabled || false;
   useEffect(() => {
-    const fetchLineDetails = async () => {
+    let timeoutId;
+    let retryCount = 0;
+    const MAX_RETRIES2 = 2;
+    const LOADING_TIMEOUT = 15e3;
+    const fetchInitialData = async () => {
       if (!supabase || lineIds.length === 0) return;
-      const detailsPromises = lineIds.map(async (lineId) => {
-        try {
-          const { data, error } = await supabase.from("lines").select("factory_id").eq("id", lineId).single();
-          if (error) {
-            console.error(`Error fetching factory_id for line ${lineId}:`, error);
-            return { lineId, factoryId: void 0 };
-          }
-          return { lineId, factoryId: data?.factory_id };
-        } catch (err) {
-          console.error(`Exception fetching factory_id for line ${lineId}:`, err);
-          return { lineId, factoryId: void 0 };
+      setIsLoading(true);
+      timeoutId = setTimeout(() => {
+        console.error("Loading timeout reached");
+        if (retryCount < MAX_RETRIES2) {
+          retryCount++;
+          console.log(`Retrying... (attempt ${retryCount + 1}/${MAX_RETRIES2 + 1})`);
+          toast.warning("Loading is taking longer than expected. Retrying...");
+          fetchInitialData();
+        } else {
+          setIsLoading(false);
+          toast.error("Failed to load data. Please refresh the page.");
         }
-      });
-      const results = await Promise.all(detailsPromises);
-      setLineWorkspaces((prev) => {
-        const newWorkspaces = { ...prev };
-        let needsUpdate = false;
-        results.forEach((result) => {
-          if (result.factoryId && newWorkspaces[result.lineId] && newWorkspaces[result.lineId].factoryId !== result.factoryId) {
-            newWorkspaces[result.lineId].factoryId = result.factoryId;
-            needsUpdate = true;
-          }
-        });
-        return needsUpdate ? newWorkspaces : prev;
-      });
-    };
-    fetchLineDetails();
-  }, [supabase, lineIds]);
-  useEffect(() => {
-    const fetchActions = async () => {
-      if (!supabase) {
-        console.error("Supabase client not available in fetchActions");
-        toast.error("Initialization error, please refresh.");
-        return;
-      }
+      }, LOADING_TIMEOUT);
       try {
-        const actions = await actionService.getActionsByName(
-          [ACTION_NAMES.ASSEMBLY, ACTION_NAMES.PACKAGING],
-          companyId
-        );
+        const [factoryResults, actions] = await Promise.all([
+          // Fetch factory IDs
+          Promise.all(lineIds.map(async (lineId) => {
+            try {
+              const { data, error } = await supabase.from("lines").select("factory_id").eq("id", lineId).single();
+              if (error) {
+                console.error(`Error fetching factory_id for line ${lineId}:`, error);
+                return { lineId, factoryId: void 0 };
+              }
+              return { lineId, factoryId: data?.factory_id };
+            } catch (err) {
+              console.error(`Exception fetching factory_id for line ${lineId}:`, err);
+              return { lineId, factoryId: void 0 };
+            }
+          })),
+          // Fetch action IDs
+          actionService.getActionsByName(
+            [ACTION_NAMES.ASSEMBLY, ACTION_NAMES.PACKAGING],
+            companyId
+          )
+        ]);
         const assemblyAction = actions.find((a) => a.action_name === ACTION_NAMES.ASSEMBLY);
         const packagingAction = actions.find((a) => a.action_name === ACTION_NAMES.PACKAGING);
         if (!assemblyAction || !packagingAction) {
           throw new Error("Could not find required actions");
         }
-        const ids = {
+        const actionIdsData = {
           assembly: assemblyAction.id,
           packaging: packagingAction.id
         };
-        console.log("Fetched Action IDs:", {
-          "Assembly Action ID": ids.assembly,
-          "Packaging Action ID": ids.packaging
+        setActionIds(actionIdsData);
+        const updatedLineWorkspaces = { ...initialLineWorkspaces };
+        factoryResults.forEach((result) => {
+          if (result.factoryId && updatedLineWorkspaces[result.lineId]) {
+            updatedLineWorkspaces[result.lineId].factoryId = result.factoryId;
+          }
         });
-        setActionIds(ids);
+        const currentDate = getOperationalDate();
+        for (const lineId of lineIds) {
+          if (!updatedLineWorkspaces[lineId]?.factoryId) {
+            console.warn(`Skipping workspace fetch for line ${lineId} - no factory ID`);
+            continue;
+          }
+          try {
+            const workspacesData = await workspaceService.getWorkspaces(lineId);
+            const actionThresholds = await workspaceService.getActionThresholds(
+              lineId,
+              currentDate,
+              selectedShift
+            );
+            const mappedWorkspaces = workspacesData.map((ws) => {
+              const threshold = actionThresholds.find((t) => t.workspace_id === ws.id);
+              return {
+                id: ws.id,
+                name: ws.workspace_id,
+                targetPPH: threshold?.pph_threshold ?? (ws.action_pph_threshold === null ? "" : ws.action_pph_threshold),
+                targetCycleTime: threshold?.ideal_cycle_time ?? (ws.action_cycle_time === null ? "" : ws.action_cycle_time),
+                targetDayOutput: threshold?.total_day_output ?? (ws.action_total_day_output === null ? "" : ws.action_total_day_output),
+                actionType: ws.action_id === actionIdsData.assembly ? "assembly" : ws.action_id === actionIdsData.packaging ? "packaging" : "assembly",
+                actionId: ws.action_id === actionIdsData.assembly ? actionIdsData.assembly : ws.action_id === actionIdsData.packaging ? actionIdsData.packaging : actionIdsData.assembly
+              };
+            }).sort((a, b) => a.name.localeCompare(b.name, void 0, { numeric: true }));
+            updatedLineWorkspaces[lineId].workspaces = mappedWorkspaces;
+          } catch (error) {
+            console.error(`Error fetching workspace data for line ${lineId}:`, error);
+          }
+        }
+        setLineWorkspaces(updatedLineWorkspaces);
+        await fetchAllShiftsData(updatedLineWorkspaces);
       } catch (error) {
-        console.error("Error fetching actions:", error);
-        toast.error("Failed to load action data");
+        console.error("Error fetching initial data:", error);
+        clearTimeout(timeoutId);
+        if (retryCount < MAX_RETRIES2) {
+          retryCount++;
+          console.log(`Error occurred, retrying... (attempt ${retryCount + 1}/${MAX_RETRIES2 + 1})`);
+          toast.warning("Error loading data. Retrying...");
+          setTimeout(() => fetchInitialData(), 1e3);
+        } else {
+          toast.error("Failed to load initial data");
+          setIsLoading(false);
+        }
+      } finally {
+        clearTimeout(timeoutId);
+        if (retryCount === 0 || retryCount >= MAX_RETRIES2) {
+          setIsLoading(false);
+        }
       }
     };
-    fetchActions();
-  }, [supabase, companyId]);
+    fetchInitialData();
+    return () => {
+      clearTimeout(timeoutId);
+    };
+  }, [supabase, lineIds, companyId]);
   useCallback(async (shiftId) => {
     try {
       if (!supabase) return;
@@ -32867,92 +32917,6 @@ var TargetsView = ({
       };
     }
   }, [supabase]);
-  useEffect(() => {
-    const allFactoryIdsLoaded = lineIds.every((lineId) => lineWorkspaces[lineId]?.factoryId);
-    if (!actionIds || !allFactoryIdsLoaded) {
-      return;
-    }
-    const workspacesAlreadyLoadedForAnyLine = Object.values(lineWorkspaces).some(
-      (line) => line.workspaces && line.workspaces.length > 0
-    );
-    if (workspacesAlreadyLoadedForAnyLine) {
-      setIsLoading(false);
-      return;
-    }
-    const fetchWorkspacesAndThenThresholds = async () => {
-      setIsLoading(true);
-      try {
-        if (!supabase) {
-          toast.error("Supabase client not available");
-          setIsLoading(false);
-          return;
-        }
-        console.log("Starting workspace fetch with actionIds and loaded factoryIds.");
-        const newUpdatedLineWorkspaces = { ...lineWorkspaces };
-        let workspacesHaveBeenUpdated = false;
-        for (const lineId of lineIds) {
-          if (!newUpdatedLineWorkspaces[lineId]?.factoryId) {
-            console.warn(`FactoryId for line ${lineId} missing during workspace fetch. Skipping its workspaces.`);
-            continue;
-          }
-          try {
-            const fetchedLineWorkspacesData = await workspaceService.getWorkspaces(lineId);
-            let mappedWorkspaces = fetchedLineWorkspacesData.map((ws) => ({
-              id: ws.id,
-              name: ws.workspace_id,
-              targetPPH: ws.action_pph_threshold === null ? "" : ws.action_pph_threshold,
-              targetCycleTime: ws.action_cycle_time === null ? "" : ws.action_cycle_time,
-              targetDayOutput: ws.action_total_day_output === null ? "" : ws.action_total_day_output,
-              actionType: ws.action_id === actionIds.assembly ? "assembly" : ws.action_id === actionIds.packaging ? "packaging" : "assembly",
-              actionId: ws.action_id === actionIds.assembly ? actionIds.assembly : ws.action_id === actionIds.packaging ? actionIds.packaging : actionIds.assembly
-            })).sort((a, b) => a.name.localeCompare(b.name, void 0, { numeric: true }));
-            const currentDate = getOperationalDate();
-            try {
-              const actionThresholds = await workspaceService.getActionThresholds(
-                lineId,
-                currentDate,
-                selectedShift
-              );
-              mappedWorkspaces = mappedWorkspaces.map((ws) => {
-                const threshold = actionThresholds.find((t) => t.workspace_id === ws.id);
-                if (threshold) {
-                  return {
-                    ...ws,
-                    targetPPH: threshold.pph_threshold,
-                    targetCycleTime: threshold.ideal_cycle_time,
-                    targetDayOutput: threshold.total_day_output
-                  };
-                }
-                return ws;
-              });
-              console.log(`Merged action thresholds for line ${lineId}, found ${actionThresholds.length} saved thresholds`);
-            } catch (error) {
-              console.error(`Error fetching action thresholds for line ${lineId}:`, error);
-            }
-            if (JSON.stringify(mappedWorkspaces) !== JSON.stringify(newUpdatedLineWorkspaces[lineId].workspaces)) {
-              newUpdatedLineWorkspaces[lineId] = {
-                ...newUpdatedLineWorkspaces[lineId],
-                workspaces: mappedWorkspaces
-              };
-              workspacesHaveBeenUpdated = true;
-            }
-          } catch (error) {
-            console.error(`Error fetching workspaces for line ${lineId}:`, error);
-          }
-        }
-        if (workspacesHaveBeenUpdated) {
-          setLineWorkspaces(newUpdatedLineWorkspaces);
-        }
-        await fetchAllShiftsData(newUpdatedLineWorkspaces);
-      } catch (error) {
-        console.error("Error in fetchWorkspacesAndThenThresholds:", error);
-        toast.error("Failed to load workspace data");
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    fetchWorkspacesAndThenThresholds();
-  }, [actionIds, supabase, lineIds]);
   const toggleLineDropdown = useCallback((lineId) => {
     setLineWorkspaces((prev) => {
       const newIsOpen = !prev[lineId].isOpen;
@@ -33179,14 +33143,15 @@ var TargetsView = ({
       console.log(`[handleSaveLine] workspaceThresholdUpdates for ${lineId}:`, workspaceThresholdUpdates);
       await workspaceService.updateActionThresholds(workspaceThresholdUpdates);
       console.log(`[handleSaveLine] Successfully updated action thresholds for ${lineId}`);
+      const packagingWorkspaces = lineDataToSave.workspaces.filter((ws) => ws.actionType === "packaging");
       const lineThresholdData = {
         factory_id: currentFactoryId,
         line_id: lineId,
         date: currentDate,
         shift_id: selectedShift,
         product_code: lineDataToSave.productId,
-        threshold_day_output: lineDataToSave.workspaces.reduce((acc, ws) => acc + (Number(ws.targetDayOutput) || 0), 0),
-        threshold_pph: lineDataToSave.workspaces.reduce((acc, ws) => acc + (Number(ws.targetPPH) || 0), 0),
+        threshold_day_output: packagingWorkspaces.reduce((acc, ws) => acc + (Number(ws.targetDayOutput) || 0), 0),
+        threshold_pph: packagingWorkspaces.reduce((acc, ws) => acc + (Number(ws.targetPPH) || 0), 0),
         ...skuEnabled && lineDataToSave.selectedSKU ? { sku_id: lineDataToSave.selectedSKU.id } : {}
       };
       console.log(`[handleSaveLine] lineThresholdData for upsert on ${lineId}:`, lineThresholdData);
@@ -33197,20 +33162,6 @@ var TargetsView = ({
         throw lineUpsertError;
       }
       console.log(`[handleSaveLine] Successfully upserted line_thresholds for ${lineId}`);
-      const operatingHoursData = {
-        line_id: lineId,
-        shift_id: selectedShift,
-        start_time: lineDataToSave.shiftStartTime,
-        end_time: lineDataToSave.shiftEndTime,
-        breaks: lineDataToSave.breaks
-      };
-      console.log(`[handleSaveLine] operatingHoursData for upsert on ${lineId}:`, operatingHoursData);
-      const { error: operatingHoursError } = await supabase.from("line_operating_hours").upsert(operatingHoursData, { onConflict: "line_id,shift_id" });
-      if (operatingHoursError) {
-        console.error(`[handleSaveLine] Error upserting line_operating_hours for ${lineId}:`, operatingHoursError);
-        toast.error(`Failed to update shift hours for ${lineNames[lineId] || lineId}`);
-      }
-      console.log(`[handleSaveLine] Successfully upserted line_operating_hours for ${lineId}`);
       setSaveSuccess((prev) => ({ ...prev, [lineId]: true }));
       toast.success(`${lineNames[lineId] || lineId} targets saved successfully`);
       if (onSaveChanges) onSaveChanges(lineId);
@@ -33255,19 +33206,6 @@ var TargetsView = ({
         })
       }
     }));
-    try {
-      const line = lineWorkspaces[updates.lineId];
-      const currentHours = await loadOperatingHours(updates.lineId, selectedShift);
-      await supabase?.from("line_operating_hours").upsert({
-        line_id: updates.lineId,
-        shift_id: selectedShift,
-        start_time: line.shiftStartTime,
-        end_time: line.shiftEndTime,
-        breaks: currentHours?.breaks || line.breaks || []
-      });
-    } catch (error) {
-      console.error("Error updating line operating hours:", error);
-    }
     toast.success(`Updated ${updates.workspaceIds.length} workspaces in ${lineNames[updates.lineId] || updates.lineId}`);
     setIsBulkConfigureOpen(false);
   };

package/package.json

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