@optifye/dashboard-core 6.1.5 → 6.1.7

package/dist/index.d.mts

@@ -682,6 +682,7 @@ interface SimpleLine {
     factory_name: string;
     company_id: string;
     company_name: string;
+    enable: boolean;
 }
 interface WorkspaceMonthlyMetric {
     date: string;
@@ -759,6 +760,7 @@ interface Workspace {
     action_pph_threshold: number | null;
     action_cycle_time: number | null;
     action_total_day_output: number | null;
+    enable: boolean;
 }
 interface ActionThreshold {
     line_id: string;

package/dist/index.d.ts

@@ -682,6 +682,7 @@ interface SimpleLine {
     factory_name: string;
     company_id: string;
     company_name: string;
+    enable: boolean;
 }
 interface WorkspaceMonthlyMetric {
     date: string;
@@ -759,6 +760,7 @@ interface Workspace {
     action_pph_threshold: number | null;
     action_cycle_time: number | null;
     action_total_day_output: number | null;
+    enable: boolean;
 }
 interface ActionThreshold {
     line_id: string;

package/dist/index.js

@@ -948,8 +948,9 @@ var dashboardService = {
           factory_id,
           factories!lines_factory_id_fkey(factory_name),
           company_id,
-          companies!lines_company_id_fkey(company_name:name)
-        `);
+          companies!lines_company_id_fkey(company_name:name),
+          enable
+        `).eq("enable", true);
       if (companyId) {
         query = query.eq("company_id", companyId);
       }
@@ -965,7 +966,9 @@ var dashboardService = {
         factory_id: line.factory_id,
         factory_name: line.factories?.factory_name ?? "N/A",
         company_id: line.company_id,
-        company_name: line.companies?.company_name ?? "N/A"
+        company_name: line.companies?.company_name ?? "N/A",
+        enable: line.enable ?? true
+        // Default to true if not specified
       }));
       return transformedLines;
     } catch (err) {
@@ -1547,7 +1550,7 @@ var workspaceService = {
     const config = _getDashboardConfigInstance();
     const dbConfig = config?.databaseConfig;
     const workspacesTable = getTable3(dbConfig, "workspaces");
-    const { data, error } = await supabase.from(workspacesTable).select("id, line_id, workspace_id, action_id, action_pph_threshold, action_cycle_time, action_total_day_output").eq("line_id", lineId).order("workspace_id", { ascending: true });
+    const { data, error } = await supabase.from(workspacesTable).select("id, line_id, workspace_id, action_id, action_pph_threshold, action_cycle_time, action_total_day_output, enable").eq("line_id", lineId).order("workspace_id", { ascending: true });
     if (error) {
       console.error(`Error fetching workspaces from ${workspacesTable}:`, error);
       throw error;
@@ -1568,7 +1571,7 @@ var workspaceService = {
     const dbConfig = config?.databaseConfig;
     const workspacesTable = getTable3(dbConfig, "workspaces");
     console.log("\u{1F504} Using workspaces table:", workspacesTable);
-    let query = supabase.from(workspacesTable).select("workspace_id, display_name, line_id");
+    let query = supabase.from(workspacesTable).select("workspace_id, display_name, line_id, enable");
     console.log("\u{1F504} Supabase query created, about to add filters...");
     if (lineId) {
       query = query.eq("line_id", lineId);
@@ -1587,10 +1590,10 @@ var workspaceService = {
     console.log("Raw workspace data from Supabase:", data);
     const displayNamesMap = /* @__PURE__ */ new Map();
     (data || []).forEach((workspace) => {
-      if (workspace.workspace_id && workspace.display_name) {
+      if (workspace.workspace_id && workspace.display_name && workspace.enable === true) {
         const displayName = workspace.display_name.trim();
         displayNamesMap.set(workspace.workspace_id, displayName);
-        console.log(`\u2705 Mapped: ${workspace.workspace_id} -> ${displayName}`);
+        console.log(`\u2705 Mapped: ${workspace.workspace_id} -> ${displayName} (enabled: ${workspace.enable})`);
       }
     });
     console.log("Final display names map:", Array.from(displayNamesMap.entries()));
@@ -3726,6 +3729,14 @@ var useLineWorkspaceMetrics = (lineId, options) => {
         queryShiftId,
         metricsTable
       });
+      const workspaces2 = await workspaceService.getWorkspaces(lineId);
+      const enabledWorkspaceIds = workspaces2.filter((ws) => ws.enable === true).map((ws) => ws.id);
+      if (enabledWorkspaceIds.length === 0) {
+        setWorkspaces([]);
+        setInitialized(true);
+        setLoading(false);
+        return;
+      }
       const { data, error: fetchError } = await supabase.from(metricsTable).select(`
           workspace_name,
           total_output,
@@ -3737,7 +3748,7 @@ var useLineWorkspaceMetrics = (lineId, options) => {
           trend_score,
           line_id,
           total_day_output
-        `).eq("date", queryDate).eq("shift_id", queryShiftId).eq("line_id", lineId).order("workspace_name", { ascending: true });
+        `).eq("date", queryDate).eq("shift_id", queryShiftId).eq("line_id", lineId).in("workspace_id", enabledWorkspaceIds).order("workspace_name", { ascending: true });
       if (fetchError) throw fetchError;
       const transformedData = (data || []).map((item) => ({
         company_id: entityConfig.companyId || "unknown",
@@ -4049,7 +4060,14 @@ var useLeaderboardMetrics = (lineId, topCount = 10) => {
     try {
       const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
       const operationalDate = getOperationalDate(defaultTimezone, new Date(currentShiftDetails.date));
-      const { data, error: fetchError } = await supabase.from(companySpecificMetricsTable).select(`workspace_name,total_output,avg_pph,efficiency,workspace_id`).eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId).eq("line_id", lineId).gt("efficiency", 0).order("efficiency", { ascending: false }).limit(topCount);
+      const workspaces = await workspaceService.getWorkspaces(lineId);
+      const enabledWorkspaceIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+      if (enabledWorkspaceIds.length === 0) {
+        setTopPerformers([]);
+        setIsLoading(false);
+        return;
+      }
+      const { data, error: fetchError } = await supabase.from(companySpecificMetricsTable).select(`workspace_name,total_output,avg_pph,efficiency,workspace_id`).eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId).eq("line_id", lineId).in("workspace_id", enabledWorkspaceIds).gt("efficiency", 0).order("efficiency", { ascending: false }).limit(topCount);
       if (fetchError) throw fetchError;
       const rankedData = (data || []).map((entry, index) => ({
         workspace_name: entry.workspace_name,
@@ -4191,7 +4209,22 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId }) => {
         throw new Error("No target line IDs available for fetching metrics.");
       }
       const isFactoryView = currentLineIdToUse === (entityConfig.factoryViewId || "factory");
-      let workspaceQuery = supabase.from(companySpecificMetricsTable).select("company_id,line_id,shift_id,date,workspace_id,workspace_name,total_output,avg_pph,performance_score,avg_cycle_time,trend_score,ideal_output,efficiency,total_day_output").eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId);
+      let enabledWorkspaceIds = [];
+      for (const targetLineId of targetLineIds) {
+        const workspaces = await workspaceService.getWorkspaces(targetLineId);
+        const enabledIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+        enabledWorkspaceIds.push(...enabledIds);
+      }
+      if (enabledWorkspaceIds.length === 0) {
+        const newMetricsState2 = {
+          workspaceMetrics: [],
+          lineMetrics: []
+        };
+        setMetrics(newMetricsState2);
+        setCache(currentLineIdToUse, newMetricsState2);
+        return;
+      }
+      let workspaceQuery = supabase.from(companySpecificMetricsTable).select("company_id,line_id,shift_id,date,workspace_id,workspace_name,total_output,avg_pph,performance_score,avg_cycle_time,trend_score,ideal_output,efficiency,total_day_output").eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId).in("workspace_id", enabledWorkspaceIds);
       if (!isFactoryView) {
         workspaceQuery = workspaceQuery.in("line_id", targetLineIds);
       }
@@ -4587,14 +4620,20 @@ var useRealtimeLineMetrics = ({
         const companyId = entityConfig.companyId;
         const metricsTablePrefix = getMetricsTablePrefix(companyId || "");
         const metricsTable = `${metricsTablePrefix}_${(companyId || "").replace(/-/g, "_")}`;
-        const { data: workspaceData, error: workspaceError } = await supabase.from(metricsTable).select(`
-            line_id,
-            workspace_id,
-            workspace_name,
-            efficiency,
-            total_output,
-            total_day_output
-          `).in("line_id", targetLineIds).eq("shift_id", shiftId).eq("date", date);
+        let enabledWorkspaceIds = [];
+        for (const lineId2 of targetLineIds) {
+          const workspaces = await workspaceService.getWorkspaces(lineId2);
+          const enabledIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+          enabledWorkspaceIds.push(...enabledIds);
+        }
+        const { data: workspaceData, error: workspaceError } = enabledWorkspaceIds.length > 0 ? await supabase.from(metricsTable).select(`
+                line_id,
+                workspace_id,
+                workspace_name,
+                efficiency,
+                total_output,
+                total_day_output
+              `).in("line_id", targetLineIds).in("workspace_id", enabledWorkspaceIds).eq("shift_id", shiftId).eq("date", date) : { data: [], error: null };
         if (workspaceError) {
           console.error("Error fetching workspace metrics for factory view:", workspaceError);
         }
@@ -4646,13 +4685,15 @@ var useRealtimeLineMetrics = ({
         const companyId = entityConfig.companyId;
         const metricsTablePrefix = getMetricsTablePrefix(companyId || "");
         const metricsTable = `${metricsTablePrefix}_${(companyId || "").replace(/-/g, "_")}`;
-        const { data: workspaceData, error: workspaceError } = await supabase.from(metricsTable).select(`
-            workspace_id,
-            workspace_name,
-            efficiency,
-            total_output,
-            total_day_output
-          `).eq("line_id", lineIdRef.current).eq("shift_id", shiftId).eq("date", date);
+        const workspaces = await workspaceService.getWorkspaces(lineIdRef.current);
+        const enabledWorkspaceIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+        const { data: workspaceData, error: workspaceError } = enabledWorkspaceIds.length > 0 ? await supabase.from(metricsTable).select(`
+                workspace_id,
+                workspace_name,
+                efficiency,
+                total_output,
+                total_day_output
+              `).eq("line_id", lineIdRef.current).in("workspace_id", enabledWorkspaceIds).eq("shift_id", shiftId).eq("date", date) : { data: [], error: null };
         if (workspaceError) {
           console.error("Error fetching workspace metrics:", workspaceError);
         }
@@ -6101,6 +6142,19 @@ var useAllWorkspaceMetrics = (options) => {
         queryShiftId,
         metricsTable
       });
+      const configuredLineIds = getConfiguredLineIds(entityConfig);
+      let enabledWorkspaceIds = [];
+      for (const lineId of configuredLineIds) {
+        const workspaces2 = await workspaceService.getWorkspaces(lineId);
+        const enabledIds = workspaces2.filter((ws) => ws.enable === true).map((ws) => ws.id);
+        enabledWorkspaceIds.push(...enabledIds);
+      }
+      if (enabledWorkspaceIds.length === 0) {
+        setWorkspaces([]);
+        setInitialized(true);
+        setLoading(false);
+        return;
+      }
       const { data, error: fetchError } = await supabase.from(metricsTable).select(`
           workspace_name,
           total_output,
@@ -6112,7 +6166,7 @@ var useAllWorkspaceMetrics = (options) => {
           trend_score,
           line_id,
           total_day_output
-        `).eq("date", queryDate).eq("shift_id", queryShiftId).order("efficiency", { ascending: false });
+        `).eq("date", queryDate).eq("shift_id", queryShiftId).in("workspace_id", enabledWorkspaceIds).order("efficiency", { ascending: false });
       if (fetchError) throw fetchError;
       const transformedData = (data || []).map((item) => ({
         company_id: entityConfig.companyId || "unknown",
@@ -30220,15 +30274,22 @@ var LeaderboardDetailView = React19.memo(({
   className = ""
 }) => {
   const navigation = useNavigation();
+  const entityConfig = useEntityConfig();
   const [sortAscending, setSortAscending] = React19.useState(false);
+  const configuredLineNames = React19.useMemo(() => {
+    return getAllLineDisplayNames(entityConfig);
+  }, [entityConfig]);
   const getLineName = React19.useCallback((lineId2) => {
+    if (configuredLineNames[lineId2]) {
+      return configuredLineNames[lineId2];
+    }
     if (lineNames[lineId2]) {
       return lineNames[lineId2];
     }
     if (lineId2 === line1Id) return "Line 1";
     if (lineId2 === line2Id) return "Line 2";
-    return lineId2;
-  }, [lineNames, line1Id, line2Id]);
+    return `Line ${lineId2.substring(0, 8)}`;
+  }, [configuredLineNames, lineNames, line1Id, line2Id]);
   const handleSortToggle = React19.useCallback(() => {
     setSortAscending(!sortAscending);
   }, [sortAscending]);
@@ -32656,12 +32717,13 @@ var TargetsView = ({
           }
           try {
             const workspacesData = await workspaceService.getWorkspaces(lineId);
+            const enabledWorkspaces = workspacesData.filter((ws) => ws.enable === true);
             const actionThresholds = await workspaceService.getActionThresholds(
               lineId,
               currentDate,
               selectedShift
             );
-            const mappedWorkspaces = workspacesData.map((ws) => {
+            const mappedWorkspaces = enabledWorkspaces.map((ws) => {
               const threshold = actionThresholds.find((t) => t.workspace_id === ws.id);
               return {
                 id: ws.id,

package/dist/index.mjs

@@ -919,8 +919,9 @@ var dashboardService = {
           factory_id,
           factories!lines_factory_id_fkey(factory_name),
           company_id,
-          companies!lines_company_id_fkey(company_name:name)
-        `);
+          companies!lines_company_id_fkey(company_name:name),
+          enable
+        `).eq("enable", true);
       if (companyId) {
         query = query.eq("company_id", companyId);
       }
@@ -936,7 +937,9 @@ var dashboardService = {
         factory_id: line.factory_id,
         factory_name: line.factories?.factory_name ?? "N/A",
         company_id: line.company_id,
-        company_name: line.companies?.company_name ?? "N/A"
+        company_name: line.companies?.company_name ?? "N/A",
+        enable: line.enable ?? true
+        // Default to true if not specified
       }));
       return transformedLines;
     } catch (err) {
@@ -1518,7 +1521,7 @@ var workspaceService = {
     const config = _getDashboardConfigInstance();
     const dbConfig = config?.databaseConfig;
     const workspacesTable = getTable3(dbConfig, "workspaces");
-    const { data, error } = await supabase.from(workspacesTable).select("id, line_id, workspace_id, action_id, action_pph_threshold, action_cycle_time, action_total_day_output").eq("line_id", lineId).order("workspace_id", { ascending: true });
+    const { data, error } = await supabase.from(workspacesTable).select("id, line_id, workspace_id, action_id, action_pph_threshold, action_cycle_time, action_total_day_output, enable").eq("line_id", lineId).order("workspace_id", { ascending: true });
     if (error) {
       console.error(`Error fetching workspaces from ${workspacesTable}:`, error);
       throw error;
@@ -1539,7 +1542,7 @@ var workspaceService = {
     const dbConfig = config?.databaseConfig;
     const workspacesTable = getTable3(dbConfig, "workspaces");
     console.log("\u{1F504} Using workspaces table:", workspacesTable);
-    let query = supabase.from(workspacesTable).select("workspace_id, display_name, line_id");
+    let query = supabase.from(workspacesTable).select("workspace_id, display_name, line_id, enable");
     console.log("\u{1F504} Supabase query created, about to add filters...");
     if (lineId) {
       query = query.eq("line_id", lineId);
@@ -1558,10 +1561,10 @@ var workspaceService = {
     console.log("Raw workspace data from Supabase:", data);
     const displayNamesMap = /* @__PURE__ */ new Map();
     (data || []).forEach((workspace) => {
-      if (workspace.workspace_id && workspace.display_name) {
+      if (workspace.workspace_id && workspace.display_name && workspace.enable === true) {
         const displayName = workspace.display_name.trim();
         displayNamesMap.set(workspace.workspace_id, displayName);
-        console.log(`\u2705 Mapped: ${workspace.workspace_id} -> ${displayName}`);
+        console.log(`\u2705 Mapped: ${workspace.workspace_id} -> ${displayName} (enabled: ${workspace.enable})`);
       }
     });
     console.log("Final display names map:", Array.from(displayNamesMap.entries()));
@@ -3697,6 +3700,14 @@ var useLineWorkspaceMetrics = (lineId, options) => {
         queryShiftId,
         metricsTable
       });
+      const workspaces2 = await workspaceService.getWorkspaces(lineId);
+      const enabledWorkspaceIds = workspaces2.filter((ws) => ws.enable === true).map((ws) => ws.id);
+      if (enabledWorkspaceIds.length === 0) {
+        setWorkspaces([]);
+        setInitialized(true);
+        setLoading(false);
+        return;
+      }
       const { data, error: fetchError } = await supabase.from(metricsTable).select(`
           workspace_name,
           total_output,
@@ -3708,7 +3719,7 @@ var useLineWorkspaceMetrics = (lineId, options) => {
           trend_score,
           line_id,
           total_day_output
-        `).eq("date", queryDate).eq("shift_id", queryShiftId).eq("line_id", lineId).order("workspace_name", { ascending: true });
+        `).eq("date", queryDate).eq("shift_id", queryShiftId).eq("line_id", lineId).in("workspace_id", enabledWorkspaceIds).order("workspace_name", { ascending: true });
       if (fetchError) throw fetchError;
       const transformedData = (data || []).map((item) => ({
         company_id: entityConfig.companyId || "unknown",
@@ -4020,7 +4031,14 @@ var useLeaderboardMetrics = (lineId, topCount = 10) => {
     try {
       const currentShiftDetails = getCurrentShift(defaultTimezone, shiftConfig);
       const operationalDate = getOperationalDate(defaultTimezone, new Date(currentShiftDetails.date));
-      const { data, error: fetchError } = await supabase.from(companySpecificMetricsTable).select(`workspace_name,total_output,avg_pph,efficiency,workspace_id`).eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId).eq("line_id", lineId).gt("efficiency", 0).order("efficiency", { ascending: false }).limit(topCount);
+      const workspaces = await workspaceService.getWorkspaces(lineId);
+      const enabledWorkspaceIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+      if (enabledWorkspaceIds.length === 0) {
+        setTopPerformers([]);
+        setIsLoading(false);
+        return;
+      }
+      const { data, error: fetchError } = await supabase.from(companySpecificMetricsTable).select(`workspace_name,total_output,avg_pph,efficiency,workspace_id`).eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId).eq("line_id", lineId).in("workspace_id", enabledWorkspaceIds).gt("efficiency", 0).order("efficiency", { ascending: false }).limit(topCount);
       if (fetchError) throw fetchError;
       const rankedData = (data || []).map((entry, index) => ({
         workspace_name: entry.workspace_name,
@@ -4162,7 +4180,22 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId }) => {
         throw new Error("No target line IDs available for fetching metrics.");
       }
       const isFactoryView = currentLineIdToUse === (entityConfig.factoryViewId || "factory");
-      let workspaceQuery = supabase.from(companySpecificMetricsTable).select("company_id,line_id,shift_id,date,workspace_id,workspace_name,total_output,avg_pph,performance_score,avg_cycle_time,trend_score,ideal_output,efficiency,total_day_output").eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId);
+      let enabledWorkspaceIds = [];
+      for (const targetLineId of targetLineIds) {
+        const workspaces = await workspaceService.getWorkspaces(targetLineId);
+        const enabledIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+        enabledWorkspaceIds.push(...enabledIds);
+      }
+      if (enabledWorkspaceIds.length === 0) {
+        const newMetricsState2 = {
+          workspaceMetrics: [],
+          lineMetrics: []
+        };
+        setMetrics(newMetricsState2);
+        setCache(currentLineIdToUse, newMetricsState2);
+        return;
+      }
+      let workspaceQuery = supabase.from(companySpecificMetricsTable).select("company_id,line_id,shift_id,date,workspace_id,workspace_name,total_output,avg_pph,performance_score,avg_cycle_time,trend_score,ideal_output,efficiency,total_day_output").eq("date", operationalDate).eq("shift_id", currentShiftDetails.shiftId).in("workspace_id", enabledWorkspaceIds);
       if (!isFactoryView) {
         workspaceQuery = workspaceQuery.in("line_id", targetLineIds);
       }
@@ -4558,14 +4591,20 @@ var useRealtimeLineMetrics = ({
         const companyId = entityConfig.companyId;
         const metricsTablePrefix = getMetricsTablePrefix(companyId || "");
         const metricsTable = `${metricsTablePrefix}_${(companyId || "").replace(/-/g, "_")}`;
-        const { data: workspaceData, error: workspaceError } = await supabase.from(metricsTable).select(`
-            line_id,
-            workspace_id,
-            workspace_name,
-            efficiency,
-            total_output,
-            total_day_output
-          `).in("line_id", targetLineIds).eq("shift_id", shiftId).eq("date", date);
+        let enabledWorkspaceIds = [];
+        for (const lineId2 of targetLineIds) {
+          const workspaces = await workspaceService.getWorkspaces(lineId2);
+          const enabledIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+          enabledWorkspaceIds.push(...enabledIds);
+        }
+        const { data: workspaceData, error: workspaceError } = enabledWorkspaceIds.length > 0 ? await supabase.from(metricsTable).select(`
+                line_id,
+                workspace_id,
+                workspace_name,
+                efficiency,
+                total_output,
+                total_day_output
+              `).in("line_id", targetLineIds).in("workspace_id", enabledWorkspaceIds).eq("shift_id", shiftId).eq("date", date) : { data: [], error: null };
         if (workspaceError) {
           console.error("Error fetching workspace metrics for factory view:", workspaceError);
         }
@@ -4617,13 +4656,15 @@ var useRealtimeLineMetrics = ({
         const companyId = entityConfig.companyId;
         const metricsTablePrefix = getMetricsTablePrefix(companyId || "");
         const metricsTable = `${metricsTablePrefix}_${(companyId || "").replace(/-/g, "_")}`;
-        const { data: workspaceData, error: workspaceError } = await supabase.from(metricsTable).select(`
-            workspace_id,
-            workspace_name,
-            efficiency,
-            total_output,
-            total_day_output
-          `).eq("line_id", lineIdRef.current).eq("shift_id", shiftId).eq("date", date);
+        const workspaces = await workspaceService.getWorkspaces(lineIdRef.current);
+        const enabledWorkspaceIds = workspaces.filter((ws) => ws.enable === true).map((ws) => ws.id);
+        const { data: workspaceData, error: workspaceError } = enabledWorkspaceIds.length > 0 ? await supabase.from(metricsTable).select(`
+                workspace_id,
+                workspace_name,
+                efficiency,
+                total_output,
+                total_day_output
+              `).eq("line_id", lineIdRef.current).in("workspace_id", enabledWorkspaceIds).eq("shift_id", shiftId).eq("date", date) : { data: [], error: null };
         if (workspaceError) {
           console.error("Error fetching workspace metrics:", workspaceError);
         }
@@ -6072,6 +6113,19 @@ var useAllWorkspaceMetrics = (options) => {
         queryShiftId,
         metricsTable
       });
+      const configuredLineIds = getConfiguredLineIds(entityConfig);
+      let enabledWorkspaceIds = [];
+      for (const lineId of configuredLineIds) {
+        const workspaces2 = await workspaceService.getWorkspaces(lineId);
+        const enabledIds = workspaces2.filter((ws) => ws.enable === true).map((ws) => ws.id);
+        enabledWorkspaceIds.push(...enabledIds);
+      }
+      if (enabledWorkspaceIds.length === 0) {
+        setWorkspaces([]);
+        setInitialized(true);
+        setLoading(false);
+        return;
+      }
       const { data, error: fetchError } = await supabase.from(metricsTable).select(`
           workspace_name,
           total_output,
@@ -6083,7 +6137,7 @@ var useAllWorkspaceMetrics = (options) => {
           trend_score,
           line_id,
           total_day_output
-        `).eq("date", queryDate).eq("shift_id", queryShiftId).order("efficiency", { ascending: false });
+        `).eq("date", queryDate).eq("shift_id", queryShiftId).in("workspace_id", enabledWorkspaceIds).order("efficiency", { ascending: false });
       if (fetchError) throw fetchError;
       const transformedData = (data || []).map((item) => ({
         company_id: entityConfig.companyId || "unknown",
@@ -30191,15 +30245,22 @@ var LeaderboardDetailView = memo(({
   className = ""
 }) => {
   const navigation = useNavigation();
+  const entityConfig = useEntityConfig();
   const [sortAscending, setSortAscending] = useState(false);
+  const configuredLineNames = useMemo(() => {
+    return getAllLineDisplayNames(entityConfig);
+  }, [entityConfig]);
   const getLineName = useCallback((lineId2) => {
+    if (configuredLineNames[lineId2]) {
+      return configuredLineNames[lineId2];
+    }
     if (lineNames[lineId2]) {
       return lineNames[lineId2];
     }
     if (lineId2 === line1Id) return "Line 1";
     if (lineId2 === line2Id) return "Line 2";
-    return lineId2;
-  }, [lineNames, line1Id, line2Id]);
+    return `Line ${lineId2.substring(0, 8)}`;
+  }, [configuredLineNames, lineNames, line1Id, line2Id]);
   const handleSortToggle = useCallback(() => {
     setSortAscending(!sortAscending);
   }, [sortAscending]);
@@ -32627,12 +32688,13 @@ var TargetsView = ({
           }
           try {
             const workspacesData = await workspaceService.getWorkspaces(lineId);
+            const enabledWorkspaces = workspacesData.filter((ws) => ws.enable === true);
             const actionThresholds = await workspaceService.getActionThresholds(
               lineId,
               currentDate,
               selectedShift
             );
-            const mappedWorkspaces = workspacesData.map((ws) => {
+            const mappedWorkspaces = enabledWorkspaces.map((ws) => {
               const threshold = actionThresholds.find((t) => t.workspace_id === ws.id);
               return {
                 id: ws.id,

package/package.json

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