@optifye/dashboard-core 6.1.6 → 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;

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;

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) {
@@ -4057,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,
@@ -4610,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);
         }
@@ -4669,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);
         }
@@ -6124,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,
@@ -6135,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",
@@ -30243,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]);

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) {
@@ -4028,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,
@@ -4581,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);
         }
@@ -4640,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);
         }
@@ -6095,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,
@@ -6106,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",
@@ -30214,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]);

package/package.json

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