@optifye/dashboard-core 6.10.47 → 6.10.48

package/dist/index.mjs

@@ -3918,6 +3918,10 @@ var AuthService = class {
       email: enrichedUser.email,
       role: enrichedUser.role,
       role_level: enrichedUser.role,
+      scope_mode: enrichedUser.scope_mode,
+      scope_generated_at: enrichedUser.scope_generated_at,
+      scope_ttl_seconds: enrichedUser.scope_ttl_seconds,
+      access_scope: enrichedUser.access_scope,
       company_id: enrichedUser.company_id,
       first_login_completed: enrichedUser.profile.first_login_completed,
       properties: {
@@ -8124,6 +8128,8 @@ var AuthProvider = ({ children }) => {
   const isFetchingRef = useRef(false);
   const lastProcessedSessionRef = useRef(null);
   const hasAuthenticatedRef = useRef(false);
+  const scopeFetchedAtRef = useRef(0);
+  const scopeTtlSecondsRef = useRef(300);
   const fetchSession = useCallback(async (supabaseSession, isReauth = false, allowRetry = true) => {
     if (isFetchingRef.current) {
       console.log("[AuthContext] Already fetching, skipping duplicate request");
@@ -8136,6 +8142,9 @@ var AuthProvider = ({ children }) => {
     }
     try {
       const enrichedUser = await AuthService.getSession(supabaseSession.access_token);
+      const parsedScopeGeneratedAt = enrichedUser.scope_generated_at ? Date.parse(enrichedUser.scope_generated_at) : NaN;
+      scopeFetchedAtRef.current = Number.isFinite(parsedScopeGeneratedAt) ? parsedScopeGeneratedAt : Date.now();
+      scopeTtlSecondsRef.current = enrichedUser.scope_ttl_seconds || 300;
       const authUser = AuthService.toAuthUser(enrichedUser);
       setUser(authUser);
       setSession(supabaseSession);
@@ -8225,6 +8234,8 @@ var AuthProvider = ({ children }) => {
       setError(null);
       setShowOnboarding(false);
       hasAuthenticatedRef.current = false;
+      scopeFetchedAtRef.current = 0;
+      scopeTtlSecondsRef.current = 300;
       router.push("/login");
     } catch (err) {
       console.error("[AuthContext] Sign out error:", err);
@@ -8287,6 +8298,44 @@ var AuthProvider = ({ children }) => {
       clearInterval(intervalId);
     };
   }, [session, supabase]);
+  useEffect(() => {
+    if (!session || !user) {
+      return;
+    }
+    const refreshScopeIfExpired = async () => {
+      if (!session || isFetchingRef.current) {
+        return;
+      }
+      const ttlSeconds = user.scope_ttl_seconds || scopeTtlSecondsRef.current || 300;
+      const fetchedAt = scopeFetchedAtRef.current || 0;
+      const shouldRefresh = fetchedAt === 0 || Date.now() - fetchedAt >= ttlSeconds * 1e3;
+      if (!shouldRefresh) {
+        return;
+      }
+      try {
+        console.log("[AuthContext] Scope TTL expired, refreshing session scope");
+        await fetchSession(session, true);
+      } catch (err) {
+        console.error("[AuthContext] Scope refresh failed:", err);
+      }
+    };
+    refreshScopeIfExpired();
+    const intervalId = setInterval(refreshScopeIfExpired, 6e4);
+    return () => clearInterval(intervalId);
+  }, [session, user?.id, user?.scope_ttl_seconds, fetchSession]);
+  useEffect(() => {
+    if (typeof window === "undefined") {
+      return;
+    }
+    const handleScopeRefresh = () => {
+      if (!session) {
+        return;
+      }
+      void fetchSession(session, true);
+    };
+    window.addEventListener("rbac:refresh-scope", handleScopeRefresh);
+    return () => window.removeEventListener("rbac:refresh-scope", handleScopeRefresh);
+  }, [session, fetchSession]);
   useEffect(() => {
     if (!supabase) {
       console.log("[AuthContext] No Supabase client, skipping auth initialization");
@@ -8355,7 +8404,8 @@ var AuthProvider = ({ children }) => {
       } else if (event === "TOKEN_REFRESHED") {
         console.log("[AuthContext] Token refreshed automatically");
         if (currentSession) {
-          setSession(currentSession);
+          const isReauth = hasAuthenticatedRef.current;
+          await fetchSession(currentSession, isReauth);
           const expiresAt = currentSession.expires_at;
           if (expiresAt) {
             const minutesUntilExpiry = Math.floor((expiresAt * 1e3 - Date.now()) / 6e4);
@@ -10503,12 +10553,16 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
   const configuredLineIds = useMemo(() => {
     return getConfiguredLineIds(entityConfig);
   }, [entityConfig]);
+  const targetFactoryLineIds = useMemo(() => {
+    const sourceLineIds = userAccessibleLineIds !== void 0 ? userAccessibleLineIds : configuredLineIds;
+    return Array.from(new Set((sourceLineIds || []).filter(Boolean)));
+  }, [userAccessibleLineIds, configuredLineIds]);
   const { shiftConfig: staticShiftConfig } = useDashboardConfig();
   const {
     shiftConfigMap: multiLineShiftConfigMap,
     isLoading: isMultiLineShiftConfigLoading
   } = useMultiLineShiftConfigs(
-    isFactoryView ? configuredLineIds : [],
+    isFactoryView ? targetFactoryLineIds : [],
     staticShiftConfig
   );
   const {
@@ -10603,7 +10657,7 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
       return;
     }
     const isFactory = currentLineIdToUse === factoryViewId;
-    const targetLineIds = isFactory ? userAccessibleLineIds || configuredLineIds : [currentLineIdToUse];
+    const targetLineIds = isFactory ? targetFactoryLineIds : [currentLineIdToUse];
     const targetLineIdsKey = targetLineIds.slice().sort().join(",");
     const usesShiftGroups = isFactory && shiftGroups.length > 0;
     const singleShiftDetails = usesShiftGroups ? null : shiftConfig ? getCurrentShift(defaultTimezone, shiftConfig) : shiftGroups.length === 1 ? { date: shiftGroups[0].date, shiftId: shiftGroups[0].shiftId } : getCurrentShift(defaultTimezone, staticShiftConfig);
@@ -10652,7 +10706,16 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
         throw new Error("Backend URL is not configured. Please set NEXT_PUBLIC_BACKEND_URL in your environment.");
       }
       if (targetLineIds.length === 0) {
-        throw new Error("No target line IDs available for fetching metrics.");
+        logDebug("[useDashboardMetrics] Skipping fetch: no target line IDs after scope filtering");
+        setMetrics({
+          workspaceMetrics: [],
+          lineMetrics: [],
+          metadata: void 0,
+          efficiencyLegend: DEFAULT_EFFICIENCY_LEGEND
+        });
+        setMetricsLineId(requestLineId);
+        lastFetchKeyRef.current = inFlightFetchKeyRef.current;
+        return;
       }
       let allWorkspaceMetrics = [];
       let allLineMetrics = [];
@@ -10670,11 +10733,16 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
             lineCount: group.lineIds.length
           }))
         });
+        const targetLineIdSet = new Set(targetLineIds);
         const metricsPromises = shiftGroups.map(async (group) => {
-          const lineIdsParam = `line_ids=${group.lineIds.join(",")}`;
+          const groupLineIds = group.lineIds.filter((lineGroupId) => targetLineIdSet.has(lineGroupId));
+          if (groupLineIds.length === 0) {
+            return null;
+          }
+          const lineIdsParam = `line_ids=${groupLineIds.join(",")}`;
           const url = `${apiUrl}/api/dashboard/metrics?${lineIdsParam}&date=${group.date}&shift_id=${group.shiftId}&company_id=${companyId}${forceParam}`;
           logDebug(`[useDashboardMetrics] \u{1F4CA} Fetching for shift ${group.shiftId} (${group.shiftName}):`, {
-            lineIds: group.lineIds,
+            lineIds: groupLineIds,
             date: group.date
           });
           const response = await fetch(url, {
@@ -10698,7 +10766,7 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
             throw new Error(`Invalid JSON response from backend`);
           }
         });
-        const results = await Promise.all(metricsPromises);
+        const results = (await Promise.all(metricsPromises)).filter((result) => !!result);
         hasFlowBuffers = results.some((result) => result?.metadata?.has_flow_buffers);
         results.forEach((result) => {
           const idleMap = result?.metadata?.idle_time_vlm_by_line;
@@ -10876,6 +10944,7 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
     shiftGroups,
     shiftGroupsKey,
     configuredLineIds,
+    targetFactoryLineIds,
     isFactoryView,
     multiLineShiftConfigMap,
     staticShiftConfig,
@@ -10968,8 +11037,14 @@ var useDashboardMetrics = ({ onLineMetricsUpdate, lineId, userAccessibleLineIds
       logDebug("[useDashboardMetrics] Setting up group subscriptions:", {
         groupCount: currentShiftGroups.length
       });
+      const targetFactoryLineIdsForSubscriptions = currentUserAccessibleLineIds !== void 0 ? currentUserAccessibleLineIds : currentConfiguredLineIds;
+      const targetFactoryLineIdSet = new Set(
+        (targetFactoryLineIdsForSubscriptions || []).filter(Boolean)
+      );
       currentShiftGroups.forEach((group, index) => {
-        const groupLineIds = group.lineIds.filter((id3) => id3 && id3 !== factoryViewIdentifier);
+        const groupLineIds = group.lineIds.filter(
+          (id3) => id3 && id3 !== factoryViewIdentifier && targetFactoryLineIdSet.has(id3)
+        );
         if (groupLineIds.length === 0) {
           logDebug("[useDashboardMetrics] Skipping group subscription: no line IDs after filtering", {
             groupIndex: index,
@@ -16148,6 +16223,7 @@ function useAccessControl() {
 function useTeamManagementPermissions() {
   const { user } = useAuth();
   const currentRole = user?.role_level;
+  const isSuperAdminOptifye = currentRole === "optifye" && (user?.scope_mode === "SUPER_ADMIN" || !!user?.access_scope?.is_super_admin);
   return {
     /**
      * Can the current user assign lines to this user?
@@ -16203,7 +16279,10 @@ function useTeamManagementPermissions() {
     availableRolesToAssign: () => {
       if (!currentRole) return [];
       if (currentRole === "optifye") {
-        return ["owner", "it", "plant_head", "supervisor"];
+        if (isSuperAdminOptifye) {
+          return ["owner", "it", "plant_head", "supervisor"];
+        }
+        return ["it", "plant_head", "supervisor"];
       }
       if (currentRole === "owner") {
         return ["it", "plant_head", "supervisor"];
@@ -16221,7 +16300,12 @@ function useTeamManagementPermissions() {
      */
     canInviteRole: (role) => {
       if (!currentRole) return false;
-      if (currentRole === "optifye") return true;
+      if (currentRole === "optifye") {
+        if (role === "owner") {
+          return isSuperAdminOptifye;
+        }
+        return true;
+      }
       if (currentRole === "owner") {
         return ["it", "plant_head", "supervisor"].includes(role);
       }
@@ -16255,40 +16339,133 @@ function useTeamManagementPermissions() {
 }
 function useUserLineAccess(configLineIds) {
   const { user } = useAuth();
+  const { lines: dbLines } = useLines();
   const { accessibleLineIds, defaultLineId } = useMemo(() => {
+    const dbLineIds = dbLines.map((line) => line.id);
+    const dbLineIdSet = new Set(dbLineIds);
+    const fallbackAllLineIds = configLineIds && configLineIds.length > 0 ? configLineIds : dbLineIds;
+    const normalizeIds = (value) => {
+      if (Array.isArray(value)) {
+        return value.filter((id3) => typeof id3 === "string" && !!id3);
+      }
+      if (typeof value === "string" && value) {
+        return [value];
+      }
+      return [];
+    };
+    const uniqueIds = (ids) => Array.from(new Set(ids.filter(Boolean)));
+    const filterToEnabledDb = (lineIds, options = {}) => {
+      const deduped = uniqueIds(lineIds);
+      if (dbLineIdSet.size === 0) {
+        return options.allowWhenDbUnavailable ? deduped : [];
+      }
+      return deduped.filter((lineId) => dbLineIdSet.has(lineId));
+    };
     if (!user) {
-      return { accessibleLineIds: configLineIds || [], defaultLineId: configLineIds?.[0] };
-    }
-    if (user.role_level === "supervisor") {
-      const assignedLineIds = user.properties?.line_id || user.properties?.line_ids || [];
-      if (Array.isArray(assignedLineIds) && assignedLineIds.length > 0) {
-        console.log("[useUserLineAccess] Supervisor has assigned lines:", assignedLineIds);
-        return {
-          accessibleLineIds: assignedLineIds,
-          defaultLineId: assignedLineIds[0]
-        };
+      const fallback = filterToEnabledDb(fallbackAllLineIds, { allowWhenDbUnavailable: true });
+      return { accessibleLineIds: fallback, defaultLineId: fallback[0] };
+    }
+    const configSet = new Set(configLineIds || []);
+    const hasScopePayload = !!user.access_scope || !!user.scope_mode;
+    const role = user.role_level || user.role;
+    const scopedLineIds = normalizeIds(user.access_scope?.line_ids);
+    const scopedFactoryIds = normalizeIds(user.access_scope?.factory_ids);
+    const properties = user.properties || {};
+    const propertyLineIds = normalizeIds(properties?.line_ids || properties?.line_id);
+    const propertyFactoryIds = normalizeIds(properties?.factory_ids || properties?.factory_id);
+    const propertyCompanyId = typeof properties?.company_id === "string" ? properties.company_id : user.company_id;
+    const scopedCompanyId = user.access_scope?.company_id || propertyCompanyId;
+    const isExplicitSuperAdmin = user.scope_mode === "SUPER_ADMIN" || !!user.access_scope?.is_super_admin;
+    const isLegacyOptifyeGlobal = !hasScopePayload && role === "optifye" && propertyLineIds.length === 0 && propertyFactoryIds.length === 0 && !propertyCompanyId;
+    const lineFactoryMap = /* @__PURE__ */ new Map();
+    dbLines.forEach((line) => {
+      lineFactoryMap.set(line.id, line.factory_id);
+    });
+    const applyConfigFilter = (lineIds) => {
+      const dedupedLineIds = uniqueIds(lineIds);
+      if (!configLineIds || configLineIds.length === 0) {
+        return dedupedLineIds;
       }
-      console.warn("[useUserLineAccess] Supervisor has NO assigned lines!", {
-        properties: user.properties,
-        hasLineId: !!user.properties?.line_id,
-        hasLineIds: !!user.properties?.line_ids
+      const filtered = dedupedLineIds.filter((id3) => configSet.has(id3));
+      return filtered.length > 0 ? filtered : dedupedLineIds;
+    };
+    const resolveFactoryScopedLines = (factoryIds) => {
+      const factorySet = new Set(factoryIds);
+      const baseLineIds = configLineIds && configLineIds.length > 0 ? configLineIds : dbLineIds;
+      const filtered = baseLineIds.filter((lineId) => {
+        const factoryId = lineFactoryMap.get(lineId);
+        return !!factoryId && factorySet.has(factoryId);
       });
+      if (filtered.length > 0) {
+        return uniqueIds(filtered);
+      }
+      const fromDb = dbLines.filter((line) => !!line.factory_id && factorySet.has(line.factory_id)).map((line) => line.id);
+      if (fromDb.length > 0) {
+        return uniqueIds(fromDb);
+      }
+      return [];
+    };
+    if (isExplicitSuperAdmin || isLegacyOptifyeGlobal) {
+      const all = filterToEnabledDb(fallbackAllLineIds, { allowWhenDbUnavailable: true });
       return {
-        accessibleLineIds: [],
-        defaultLineId: void 0
+        accessibleLineIds: all,
+        defaultLineId: all[0]
       };
     }
-    if (user.role_level === "plant_head") {
+    if (scopedLineIds.length > 0) {
+      const filtered = applyConfigFilter(scopedLineIds);
+      const scoped = filterToEnabledDb(filtered.length > 0 ? filtered : uniqueIds(scopedLineIds));
       return {
-        accessibleLineIds: configLineIds || [],
-        defaultLineId: configLineIds?.[0]
+        accessibleLineIds: scoped,
+        defaultLineId: scoped[0]
       };
     }
-    return {
-      accessibleLineIds: configLineIds || [],
-      defaultLineId: configLineIds?.[0]
-    };
-  }, [user, configLineIds]);
+    if (scopedFactoryIds.length > 0) {
+      const scoped = filterToEnabledDb(resolveFactoryScopedLines(scopedFactoryIds));
+      return {
+        accessibleLineIds: scoped,
+        defaultLineId: scoped[0]
+      };
+    }
+    if (scopedCompanyId) {
+      const dbCompanyLineIds = dbLines.filter((line) => !line.company_id || line.company_id === scopedCompanyId).map((line) => line.id);
+      const companyScopedLines = configLineIds && configLineIds.length > 0 ? (() => {
+        const dbCompanySet = new Set(dbCompanyLineIds);
+        const filtered = configLineIds.filter((lineId) => dbCompanySet.has(lineId));
+        if (filtered.length > 0) return filtered;
+        return dbCompanyLineIds;
+      })() : dbCompanyLineIds;
+      const scoped = filterToEnabledDb(companyScopedLines);
+      return {
+        accessibleLineIds: scoped,
+        defaultLineId: scoped[0]
+      };
+    }
+    if (propertyLineIds.length > 0) {
+      const filtered = applyConfigFilter(propertyLineIds);
+      const scoped = filterToEnabledDb(filtered);
+      return {
+        accessibleLineIds: scoped,
+        defaultLineId: scoped[0]
+      };
+    }
+    if (propertyFactoryIds.length > 0) {
+      const scoped = filterToEnabledDb(resolveFactoryScopedLines(propertyFactoryIds));
+      return {
+        accessibleLineIds: scoped,
+        defaultLineId: scoped[0]
+      };
+    }
+    if (role === "owner" || role === "it" || role === "optifye") {
+      const companyScopedLines = scopedCompanyId ? dbLines.filter((line) => !line.company_id || line.company_id === scopedCompanyId).map((line) => line.id) : [];
+      const scoped = filterToEnabledDb(companyScopedLines);
+      return {
+        accessibleLineIds: scoped,
+        defaultLineId: scoped[0]
+      };
+    }
+    return { accessibleLineIds: [], defaultLineId: void 0 };
+  }, [user, configLineIds, dbLines]);
   return { accessibleLineIds, defaultLineId, user };
 }
 function useActiveLineId(queryLineId, configLineIds) {
@@ -16480,12 +16657,7 @@ var useSupervisorsByLineIds = (lineIds, options) => {
       const nextSupervisorsByLineId = /* @__PURE__ */ new Map();
       const nextAllSupervisorsMap = /* @__PURE__ */ new Map();
       if (useBackend && resolvedCompanyId) {
-        const searchParams = new URLSearchParams({
-          company_id: resolvedCompanyId
-        });
-        if (lineIdsKey) {
-          searchParams.set("line_ids", lineIdsKey);
-        }
+        const searchParams = new URLSearchParams({ company_id: resolvedCompanyId });
         const data = await fetchBackendJson(supabase, `/api/dashboard/line-supervisors?${searchParams.toString()}`);
         (data?.supervisors || []).forEach((row) => {
           const assignedLineIds = Array.isArray(row.line_ids) ? row.line_ids : [];
@@ -28305,8 +28477,52 @@ function withAccessControl(WrappedComponent2, options = {}) {
   const WithAccessControlComponent = (props) => {
     const router = useRouter();
     const { user, loading: authLoading } = useAuth();
-    const { canAccessPage, userRole } = useAccessControl();
-    requiredPath || router.pathname;
+    const role = user?.role_level;
+    const scope = user?.access_scope;
+    const isSuperAdmin = !!scope?.is_super_admin || user?.scope_mode === "SUPER_ADMIN";
+    const getBasePath = (path) => {
+      const firstSegment = path.split("?")[0].split("/").filter(Boolean)[0];
+      return firstSegment ? `/${firstSegment}` : "/";
+    };
+    const getIdFromPath = (path, key) => {
+      const queryValue = router.query[key];
+      if (typeof queryValue === "string") return queryValue;
+      if (Array.isArray(queryValue) && queryValue.length > 0) return queryValue[0];
+      const segments = path.split("?")[0].split("/").filter(Boolean);
+      const keyIndex = segments.findIndex((segment) => segment.toLowerCase() === key.toLowerCase());
+      if (keyIndex >= 0 && keyIndex < segments.length - 1) return segments[keyIndex + 1];
+      return null;
+    };
+    const roleAccessMap = {
+      optifye: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/improvement-center", "/tickets"],
+      owner: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/improvement-center", "/tickets"],
+      it: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/improvement-center", "/tickets"],
+      plant_head: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/improvement-center", "/tickets"],
+      supervisor: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/skus", "/help", "/health", "/profile", "/workspace", "/improvement-center", "/tickets"]
+    };
+    const canAccessPath = (path) => {
+      if (!user || !role) return false;
+      if (isSuperAdmin) return true;
+      const basePath = getBasePath(path);
+      const allowed = roleAccessMap[role] || [];
+      if (!allowed.includes(basePath)) {
+        return false;
+      }
+      const workspaceId = getIdFromPath(path, "workspace");
+      if (workspaceId && scope?.workspace_ids?.length) {
+        return scope.workspace_ids.includes(workspaceId);
+      }
+      const lineId = getIdFromPath(path, "kpis") || getIdFromPath(path, "line");
+      if (lineId && scope?.line_ids?.length) {
+        return scope.line_ids.includes(lineId);
+      }
+      const factoryId = getIdFromPath(path, "factory");
+      if (factoryId && scope?.factory_ids?.length) {
+        return scope.factory_ids.includes(factoryId);
+      }
+      return true;
+    };
+    const pathToCheck = requiredPath || router.asPath || router.pathname;
     if (authLoading) {
       return /* @__PURE__ */ jsx("div", { className: "flex h-screen w-full items-center justify-center", children: /* @__PURE__ */ jsxs("div", { className: "text-center", children: [
         /* @__PURE__ */ jsx("div", { className: "animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600 mx-auto mb-4" }),
@@ -28316,6 +28532,24 @@ function withAccessControl(WrappedComponent2, options = {}) {
     if (!user) {
       return /* @__PURE__ */ jsx("div", { className: "flex h-screen w-full items-center justify-center", children: /* @__PURE__ */ jsx("div", { className: "text-center", children: /* @__PURE__ */ jsx("p", { className: "text-gray-600 mb-4", children: "Please log in to continue" }) }) });
     }
+    const hasAccess = canAccessPath(pathToCheck);
+    if (!hasAccess) {
+      if (UnauthorizedComponent) {
+        return /* @__PURE__ */ jsx(UnauthorizedComponent, {});
+      }
+      if (typeof window !== "undefined") {
+        router.replace(redirectTo);
+      }
+      return /* @__PURE__ */ jsx("div", { className: "flex h-screen w-full items-center justify-center", children: /* @__PURE__ */ jsxs("div", { className: "text-center", children: [
+        /* @__PURE__ */ jsx("h2", { className: "text-2xl font-bold text-gray-900 mb-2", children: "Access Denied" }),
+        /* @__PURE__ */ jsx("p", { className: "text-gray-600 mb-4", children: "You don't have permission to access this page." }),
+        /* @__PURE__ */ jsxs("p", { className: "text-sm text-gray-500", children: [
+          "Your role: ",
+          /* @__PURE__ */ jsx("span", { className: "font-medium", children: role || "Unknown" })
+        ] }),
+        /* @__PURE__ */ jsx("p", { className: "text-sm text-gray-500 mt-2", children: "Redirecting to home page..." })
+      ] }) });
+    }
     return /* @__PURE__ */ jsx(WrappedComponent2, { ...props });
   };
   WithAccessControlComponent.displayName = `withAccessControl(${WrappedComponent2.displayName || WrappedComponent2.name || "Component"})`;
@@ -48629,9 +48863,29 @@ var SideNavBar = memo$1(({
 }) => {
   const router = useRouter();
   const { navigate } = useNavigation();
-  const { signOut } = useAuth();
+  const { signOut, user } = useAuth();
   const entityConfig = useEntityConfig();
   const dashboardConfig = useDashboardConfig();
+  const isSuperAdmin = user?.scope_mode === "SUPER_ADMIN" || !!user?.access_scope?.is_super_admin;
+  const role = user?.role_level;
+  const roleAccessMap = {
+    optifye: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/tickets", "/improvement-center"],
+    owner: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/tickets", "/improvement-center"],
+    it: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/tickets", "/improvement-center"],
+    plant_head: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/supervisor-management", "/skus", "/help", "/health", "/profile", "/workspace", "/factory-view", "/team-management", "/tickets", "/improvement-center"],
+    supervisor: ["/", "/leaderboard", "/kpis", "/targets", "/shifts", "/skus", "/help", "/health", "/profile", "/workspace", "/tickets", "/improvement-center"]
+  };
+  const getBasePath = useCallback((path) => {
+    const firstSegment = path.split("?")[0].split("/").filter(Boolean)[0];
+    return firstSegment ? `/${firstSegment}` : "/";
+  }, []);
+  const canAccessPath = useCallback((path) => {
+    if (!role) return false;
+    if (isSuperAdmin) return true;
+    const basePath = getBasePath(path);
+    const allowedPaths = roleAccessMap[role] || [];
+    return allowedPaths.includes(basePath);
+  }, [role, isSuperAdmin, getBasePath]);
   const lineId = entityConfig.defaultLineId || LINE_1_UUID;
   const skuEnabled = dashboardConfig?.skuConfig?.enabled || false;
   dashboardConfig?.supervisorConfig?.enabled || false;
@@ -48797,7 +49051,7 @@ var SideNavBar = memo$1(({
   const settingsTriggerRef = useRef(null);
   const settingsItems = useMemo(() => {
     const items = [
-      {
+      ...canAccessPath("/targets") ? [{
         key: "targets",
         label: "Targets",
         icon: AdjustmentsHorizontalIcon,
@@ -48806,8 +49060,8 @@ var SideNavBar = memo$1(({
           setIsSettingsOpen(false);
         },
         isActive: pathname === "/targets" || pathname.startsWith("/targets/")
-      },
-      {
+      }] : [],
+      ...canAccessPath("/shifts") ? [{
         key: "shifts",
         label: "Shifts",
         icon: ClockIcon,
@@ -48816,8 +49070,8 @@ var SideNavBar = memo$1(({
           setIsSettingsOpen(false);
         },
         isActive: pathname === "/shifts" || pathname.startsWith("/shifts/")
-      },
-      {
+      }] : [],
+      ...canAccessPath("/team-management") ? [{
         key: "teams",
         label: "Teams",
         icon: UsersIcon,
@@ -48826,8 +49080,8 @@ var SideNavBar = memo$1(({
           setIsSettingsOpen(false);
         },
         isActive: pathname === "/team-management" || pathname.startsWith("/team-management/")
-      },
-      {
+      }] : [],
+      ...canAccessPath("/profile") ? [{
         key: "profile",
         label: "Profile",
         icon: UserCircleIcon,
@@ -48836,9 +49090,9 @@ var SideNavBar = memo$1(({
           setIsSettingsOpen(false);
         },
         isActive: pathname === "/profile" || pathname.startsWith("/profile/")
-      }
+      }] : []
     ];
-    if (ticketsEnabled) {
+    if (ticketsEnabled && canAccessPath("/tickets")) {
       items.push({
         key: "tickets",
         label: "Tickets",
@@ -48850,18 +49104,20 @@ var SideNavBar = memo$1(({
         isActive: pathname === "/tickets" || pathname.startsWith("/tickets/")
       });
     }
-    items.push({
-      key: "help",
-      label: "Help",
-      icon: QuestionMarkCircleIcon,
-      onClick: () => {
-        handleHelpClick();
-        setIsSettingsOpen(false);
-      },
-      isActive: pathname === "/help" || pathname.startsWith("/help/")
-    });
+    if (canAccessPath("/help")) {
+      items.push({
+        key: "help",
+        label: "Help",
+        icon: QuestionMarkCircleIcon,
+        onClick: () => {
+          handleHelpClick();
+          setIsSettingsOpen(false);
+        },
+        isActive: pathname === "/help" || pathname.startsWith("/help/")
+      });
+    }
     return items;
-  }, [handleTargetsClick, handleShiftsClick, handleTeamManagementClick, handleProfileClick, handleTicketsClick, handleHelpClick, pathname, ticketsEnabled]);
+  }, [handleTargetsClick, handleShiftsClick, handleTeamManagementClick, handleProfileClick, handleTicketsClick, handleHelpClick, pathname, ticketsEnabled, canAccessPath]);
   const handleLogout = useCallback(async () => {
     setIsSettingsOpen(false);
     try {
@@ -48899,7 +49155,7 @@ var SideNavBar = memo$1(({
       }
     ) }),
     /* @__PURE__ */ jsxs("div", { className: "flex-1 w-full py-6 px-4 overflow-y-auto", children: [
-      /* @__PURE__ */ jsx("div", { className: "mb-6", children: /* @__PURE__ */ jsxs(
+      /* @__PURE__ */ jsx("div", { className: "mb-6", children: canAccessPath("/") && /* @__PURE__ */ jsxs(
         "button",
         {
           onClick: handleHomeClick,
@@ -48915,7 +49171,7 @@ var SideNavBar = memo$1(({
         }
       ) }),
       /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/leaderboard") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleLeaderboardClick,
@@ -48930,7 +49186,7 @@ var SideNavBar = memo$1(({
             ]
           }
         ),
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/kpis") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleKPIsClick,
@@ -48945,7 +49201,7 @@ var SideNavBar = memo$1(({
             ]
           }
         ),
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/improvement-center") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleImprovementClick,
@@ -48961,7 +49217,7 @@ var SideNavBar = memo$1(({
           }
         ),
         showSupervisorManagement,
-        skuEnabled && true && /* @__PURE__ */ jsxs(
+        skuEnabled && canAccessPath("/skus") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleSKUsClick,
@@ -48976,7 +49232,7 @@ var SideNavBar = memo$1(({
             ]
           }
         ),
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/health") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleHealthClick,
@@ -48993,7 +49249,7 @@ var SideNavBar = memo$1(({
         )
       ] })
     ] }),
-    /* @__PURE__ */ jsx("div", { className: "w-full py-5 px-4 border-t border-gray-100 flex-shrink-0", children: /* @__PURE__ */ jsxs(
+    settingsItems.length > 0 && /* @__PURE__ */ jsx("div", { className: "w-full py-5 px-4 border-t border-gray-100 flex-shrink-0", children: /* @__PURE__ */ jsxs(
       "button",
       {
         ref: settingsTriggerRef,
@@ -49031,7 +49287,7 @@ var SideNavBar = memo$1(({
       };
     };
     return /* @__PURE__ */ jsxs("nav", { className: "px-5 py-6", children: [
-      /* @__PURE__ */ jsxs(
+      canAccessPath("/") && /* @__PURE__ */ jsxs(
         "button",
         {
           onClick: handleMobileNavClick(handleHomeClick),
@@ -49044,7 +49300,7 @@ var SideNavBar = memo$1(({
         }
       ),
       /* @__PURE__ */ jsxs("div", { className: "mt-6 space-y-2", children: [
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/leaderboard") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleMobileNavClick(handleLeaderboardClick),
@@ -49056,7 +49312,7 @@ var SideNavBar = memo$1(({
             ]
           }
         ),
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/kpis") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleMobileNavClick(handleKPIsClick),
@@ -49068,7 +49324,7 @@ var SideNavBar = memo$1(({
             ]
           }
         ),
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/improvement-center") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleMobileNavClick(handleImprovementClick),
@@ -49081,7 +49337,7 @@ var SideNavBar = memo$1(({
           }
         ),
         showSupervisorManagement,
-        skuEnabled && true && /* @__PURE__ */ jsxs(
+        skuEnabled && canAccessPath("/skus") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleMobileNavClick(handleSKUsClick),
@@ -49093,7 +49349,7 @@ var SideNavBar = memo$1(({
             ]
           }
         ),
-        /* @__PURE__ */ jsxs(
+        canAccessPath("/health") && /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: handleMobileNavClick(handleHealthClick),
@@ -49106,10 +49362,10 @@ var SideNavBar = memo$1(({
           }
         )
       ] }),
-      /* @__PURE__ */ jsxs("div", { className: "mt-8 pt-6 border-t border-gray-100", children: [
+      settingsItems.length > 0 && /* @__PURE__ */ jsxs("div", { className: "mt-8 pt-6 border-t border-gray-100", children: [
         /* @__PURE__ */ jsx("h3", { className: "px-5 mb-3 text-[10px] font-bold text-gray-400 uppercase tracking-widest", children: "Settings & Support" }),
         /* @__PURE__ */ jsxs("div", { className: "space-y-1", children: [
-          /* @__PURE__ */ jsxs(
+          canAccessPath("/targets") && /* @__PURE__ */ jsxs(
             "button",
             {
               onClick: handleMobileNavClick(handleTargetsClick),
@@ -49121,7 +49377,7 @@ var SideNavBar = memo$1(({
               ]
             }
           ),
-          /* @__PURE__ */ jsxs(
+          canAccessPath("/shifts") && /* @__PURE__ */ jsxs(
             "button",
             {
               onClick: handleMobileNavClick(handleShiftsClick),
@@ -49133,7 +49389,7 @@ var SideNavBar = memo$1(({
               ]
             }
           ),
-          /* @__PURE__ */ jsxs(
+          canAccessPath("/team-management") && /* @__PURE__ */ jsxs(
             "button",
             {
               onClick: handleMobileNavClick(handleTeamManagementClick),
@@ -49145,7 +49401,7 @@ var SideNavBar = memo$1(({
               ]
             }
           ),
-          /* @__PURE__ */ jsxs(
+          canAccessPath("/profile") && /* @__PURE__ */ jsxs(
             "button",
             {
               onClick: handleMobileNavClick(handleProfileClick),
@@ -49157,7 +49413,7 @@ var SideNavBar = memo$1(({
               ]
             }
           ),
-          ticketsEnabled && /* @__PURE__ */ jsxs(
+          ticketsEnabled && canAccessPath("/tickets") && /* @__PURE__ */ jsxs(
             "button",
             {
               onClick: handleMobileNavClick(handleTicketsClick),
@@ -49169,7 +49425,7 @@ var SideNavBar = memo$1(({
               ]
             }
           ),
-          /* @__PURE__ */ jsxs(
+          canAccessPath("/help") && /* @__PURE__ */ jsxs(
             "button",
             {
               onClick: handleMobileNavClick(handleHelpClick),
@@ -51429,9 +51685,19 @@ var InviteUserDialog = ({
   const [factorySearch, setFactorySearch] = useState("");
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [error, setError] = useState(null);
+  const isSuperAdminOptifye = user?.role_level === "optifye" && (user?.scope_mode === "SUPER_ADMIN" || !!user?.access_scope?.is_super_admin);
+  const canInviteOwner = isSuperAdminOptifye;
   const canInviteIT = user?.role_level === "owner" || user?.role_level === "optifye";
   const canInvitePlantHead = user?.role_level === "owner" || user?.role_level === "it" || user?.role_level === "optifye";
   const canInviteSupervisor = ["owner", "it", "plant_head", "optifye"].includes(user?.role_level || "");
+  const invitableRoles = useMemo(() => {
+    const roles = [];
+    if (canInviteOwner) roles.push("owner");
+    if (canInviteIT) roles.push("it");
+    if (canInvitePlantHead) roles.push("plant_head");
+    if (canInviteSupervisor) roles.push("supervisor");
+    return roles;
+  }, [canInviteOwner, canInviteIT, canInvitePlantHead, canInviteSupervisor]);
   const filteredLines = useMemo(() => {
     const search = lineSearch.trim().toLowerCase();
     if (!search) return availableLines;
@@ -51463,6 +51729,14 @@ var InviteUserDialog = ({
       setError(null);
     }
   }, [isOpen]);
+  useEffect(() => {
+    if (!isOpen || invitableRoles.length === 0) {
+      return;
+    }
+    if (!invitableRoles.includes(selectedRole)) {
+      setSelectedRole(invitableRoles[0]);
+    }
+  }, [isOpen, invitableRoles, selectedRole]);
   const validateEmail = (email2) => {
     const emailRegex = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}$/;
     return emailRegex.test(email2);
@@ -51492,6 +51766,14 @@ var InviteUserDialog = ({
       setError("Please enter a valid email address");
       return;
     }
+    if (!invitableRoles.includes(selectedRole)) {
+      setError("You do not have permission to assign this role.");
+      return;
+    }
+    if (selectedRole === "owner" && !canInviteOwner) {
+      setError("Only super-admin Optifye users can create owner users.");
+      return;
+    }
     const companyId = entityConfig?.companyId || user?.properties?.company_id;
     if (!companyId) {
       setError("Company ID not found. Please refresh and try again.");
@@ -51672,6 +51954,33 @@ var InviteUserDialog = ({
                     /* @__PURE__ */ jsx("span", { className: "text-red-500", children: "*" })
                   ] }),
                   /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
+                    canInviteOwner && /* @__PURE__ */ jsxs(
+                      "label",
+                      {
+                        className: cn(
+                          "flex items-start gap-3 p-4 border-2 rounded-lg cursor-pointer transition-all duration-200",
+                          selectedRole === "owner" ? "border-amber-500 bg-amber-50" : "border-gray-200 hover:border-gray-300 hover:bg-gray-50"
+                        ),
+                        children: [
+                          /* @__PURE__ */ jsx(
+                            "input",
+                            {
+                              type: "radio",
+                              name: "role",
+                              value: "owner",
+                              checked: selectedRole === "owner",
+                              onChange: (e) => setSelectedRole(e.target.value),
+                              className: "mt-1",
+                              disabled: isSubmitting
+                            }
+                          ),
+                          /* @__PURE__ */ jsxs("div", { className: "flex-1", children: [
+                            /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2 mb-1", children: /* @__PURE__ */ jsx(RoleBadge_default, { role: "owner", size: "sm" }) }),
+                            /* @__PURE__ */ jsx("p", { className: "text-sm text-gray-600", children: "Company owner access. Full management permissions for the selected company dashboard." })
+                          ] })
+                        ]
+                      }
+                    ),
                     canInviteIT && /* @__PURE__ */ jsxs(
                       "label",
                       {
@@ -53543,11 +53852,32 @@ var UserManagementTable = ({
       setSortDirection("asc");
     }
   };
+  const getFactoryIdsFromUser = (user) => {
+    const properties = user.properties || {};
+    const rawFactoryIds = properties.factory_ids ?? properties.factory_id;
+    if (Array.isArray(rawFactoryIds)) {
+      return rawFactoryIds.filter((factoryId) => typeof factoryId === "string" && factoryId.length > 0);
+    }
+    if (typeof rawFactoryIds === "string" && rawFactoryIds.length > 0) {
+      return [rawFactoryIds];
+    }
+    return [];
+  };
   const formatAssignments = (user) => {
     if (user.role_level === "owner" || user.role_level === "it") return "Company-wide";
     if (user.role_level === "optifye") return "All companies";
-    if (user.role_level === "plant_head" && user.assigned_factories) {
-      return user.assigned_factories.join(", ") || "No factories assigned";
+    if (user.role_level === "plant_head") {
+      if (user.assigned_factories && user.assigned_factories.length > 0) {
+        return user.assigned_factories.join(", ");
+      }
+      const assignedFactoryIds = getFactoryIdsFromUser(user);
+      if (assignedFactoryIds.length === 1) {
+        return "1 factory assigned";
+      }
+      if (assignedFactoryIds.length > 1) {
+        return `${assignedFactoryIds.length} factories assigned`;
+      }
+      return "No factories assigned";
     }
     if (user.role_level === "supervisor" && user.assigned_lines) {
       return user.assigned_lines.join(", ") || "No lines assigned";
@@ -53739,22 +54069,28 @@ var UserManagementTable = ({
                     onUpdate: onLineAssignmentUpdate || (async () => {
                     })
                   }
-                ) : user.role_level === "plant_head" ? /* @__PURE__ */ jsx(
-                  FactoryAssignmentDropdown,
-                  {
-                    userId: user.user_id,
-                    currentFactoryIds: user.properties?.factory_ids || [],
-                    availableFactories: (
-                      // Filter factories to only show those from the target user's company
-                      user.properties?.company_id ? availableFactories.filter(
-                        (factory) => factory.company_id === user.properties?.company_id
-                      ) : availableFactories
-                    ),
-                    canEdit: permissions.canAssignFactories(user) && !!onFactoryAssignmentUpdate,
-                    onUpdate: onFactoryAssignmentUpdate || (async () => {
-                    })
+                ) : user.role_level === "plant_head" ? (() => {
+                  const canEditFactoryAssignments = permissions.canAssignFactories(user) && !!onFactoryAssignmentUpdate;
+                  if (!canEditFactoryAssignments) {
+                    return /* @__PURE__ */ jsx("p", { className: "text-sm text-gray-900", children: formatAssignments(user) });
                   }
-                ) : /* @__PURE__ */ jsx("p", { className: "text-sm text-gray-900", children: formatAssignments(user) }) }),
+                  return /* @__PURE__ */ jsx(
+                    FactoryAssignmentDropdown,
+                    {
+                      userId: user.user_id,
+                      currentFactoryIds: getFactoryIdsFromUser(user),
+                      availableFactories: (
+                        // Filter factories to only show those from the target user's company
+                        user.properties?.company_id ? availableFactories.filter(
+                          (factory) => factory.company_id === user.properties?.company_id
+                        ) : availableFactories
+                      ),
+                      canEdit: canEditFactoryAssignments,
+                      onUpdate: onFactoryAssignmentUpdate || (async () => {
+                      })
+                    }
+                  );
+                })() : /* @__PURE__ */ jsx("p", { className: "text-sm text-gray-900", children: formatAssignments(user) }) }),
                 showUsageStats && /* @__PURE__ */ jsx("td", { className: "px-6 py-4", children: user.role_level === "plant_head" || user.role_level === "supervisor" ? /* @__PURE__ */ jsx(
                   "button",
                   {
@@ -54919,52 +55255,18 @@ function HomeView({
     });
     return merged;
   }, [lineNames, dbLines]);
-  const isOwner = user?.role_level === "owner";
-  const isPlantHead = user?.role_level === "plant_head";
+  const enabledLineIdSet = useMemo(
+    () => new Set(dbLines.filter((line) => line.enable).map((line) => line.id)),
+    [dbLines]
+  );
   const isSupervisor = user?.role_level === "supervisor";
-  const assignedLineIds = useMemo(() => {
-    const rawLineIds = user?.properties?.line_id || user?.properties?.line_ids || [];
-    return Array.isArray(rawLineIds) ? rawLineIds : [];
-  }, [user]);
-  const assignedLineIdsInConfig = useMemo(() => {
-    if (assignedLineIds.length === 0) {
-      return [];
-    }
-    return assignedLineIds.filter((id3) => allLineIds.includes(id3));
-  }, [assignedLineIds, allLineIds]);
-  const assignedFactoryIds = useMemo(() => {
-    const rawFactoryIds = user?.properties?.factory_id || user?.properties?.factory_ids || [];
-    return Array.isArray(rawFactoryIds) ? rawFactoryIds : [];
-  }, [user]);
-  const lineFactoryMap = useMemo(() => {
-    const map = /* @__PURE__ */ new Map();
-    dbLines.forEach((line) => {
-      map.set(line.id, line.factory_id);
-    });
-    return map;
-  }, [dbLines]);
-  const plantHeadLineIds = useMemo(() => {
-    if (!isPlantHead || assignedFactoryIds.length === 0) {
-      return [];
-    }
-    const assignedFactoryIdSet = new Set(assignedFactoryIds);
-    return allLineIds.filter((lineId) => assignedFactoryIdSet.has(lineFactoryMap.get(lineId) || ""));
-  }, [isPlantHead, assignedFactoryIds, allLineIds, lineFactoryMap]);
   const visibleLineIds = useMemo(() => {
-    if (isOwner) {
-      return allLineIds;
+    const scoped = Array.from(new Set(allLineIds.filter(Boolean)));
+    if (enabledLineIdSet.size === 0) {
+      return scoped;
     }
-    if (isPlantHead) {
-      const combinedLineIds = /* @__PURE__ */ new Set();
-      plantHeadLineIds.forEach((lineId) => combinedLineIds.add(lineId));
-      assignedLineIdsInConfig.forEach((lineId) => combinedLineIds.add(lineId));
-      return Array.from(combinedLineIds);
-    }
-    if (isSupervisor) {
-      return assignedLineIdsInConfig;
-    }
-    return allLineIds;
-  }, [isOwner, isPlantHead, isSupervisor, allLineIds, plantHeadLineIds, assignedLineIdsInConfig]);
+    return scoped.filter((lineId) => enabledLineIdSet.has(lineId));
+  }, [allLineIds, enabledLineIdSet]);
   const fallbackLineId = visibleLineIds[0] || defaultLineId;
   const defaultHomeLineId = fallbackLineId;
   const availableLineIds = useMemo(() => {
@@ -54991,7 +55293,7 @@ function HomeView({
     return defaultHomeLineId;
   });
   useEffect(() => {
-    if (!user || !isSupervisor && !isPlantHead || availableLineIds.length === 0) {
+    if (!user || availableLineIds.length === 0) {
       return;
     }
     try {
@@ -55005,13 +55307,14 @@ function HomeView({
     } catch (error) {
       console.warn("Failed to read line filter from sessionStorage:", error);
     }
+    if (availableLineIds.includes(selectedLineId)) {
+      return;
+    }
     if (defaultHomeLineId !== selectedLineId) {
       setSelectedLineId(defaultHomeLineId);
     }
   }, [
     user,
-    isSupervisor,
-    isPlantHead,
     availableLineIds,
     defaultHomeLineId,
     selectedLineId,
@@ -55030,14 +55333,14 @@ function HomeView({
   const [diagnoses, setDiagnoses] = useState([]);
   const timezone = useAppTimezone();
   const { shiftConfigMap: lineShiftConfigs } = useMultiLineShiftConfigs(
-    allLineIds,
+    visibleLineIds,
     dashboardConfig?.shiftConfig
   );
   useEffect(() => {
     const initDisplayNames = async () => {
       try {
         if (selectedLineId === factoryViewId) {
-          for (const lineId of allLineIds) {
+          for (const lineId of visibleLineIds) {
             await preInitializeWorkspaceDisplayNames(lineId);
           }
         } else {
@@ -55050,7 +55353,7 @@ function HomeView({
       }
     };
     initDisplayNames();
-  }, [selectedLineId, factoryViewId, allLineIds]);
+  }, [selectedLineId, factoryViewId, visibleLineIds]);
   const displayNameLineId = selectedLineId === factoryViewId ? void 0 : selectedLineId;
   const {
     displayNames: workspaceDisplayNames,
@@ -58801,8 +59104,32 @@ var KPIsOverviewView = ({
   const dbTimezone = useAppTimezone();
   const configuredTimezone = dbTimezone || dateTimeConfig.defaultTimezone || "UTC";
   const { startDate: monthStartDate, endDate: monthEndDateKey, monthEndDate } = getMonthDateInfo(configuredTimezone);
-  const isSupervisor = user?.role_level === "supervisor";
-  const assignedLineIdsForLeaderboard = isSupervisor ? lineIds : void 0;
+  const isSuperAdmin = user?.scope_mode === "SUPER_ADMIN" || !!user?.access_scope?.is_super_admin;
+  const scopedLineIds = React26__default.useMemo(
+    () => Array.isArray(user?.access_scope?.line_ids) ? user.access_scope.line_ids.filter((lineId) => typeof lineId === "string" && lineId.length > 0) : [],
+    [user?.access_scope?.line_ids]
+  );
+  const hasCanonicalScope = !!user?.scope_mode || !!user?.access_scope;
+  const scopeRole = (user?.role_level || user?.role || "").toLowerCase();
+  const isStrictLineScopedRole = scopeRole === "supervisor" || scopeRole === "plant_head";
+  const resolvedAssignedLineIds = React26__default.useMemo(() => {
+    if (isSuperAdmin) return [];
+    if (scopedLineIds.length > 0) return scopedLineIds;
+    if (lineIds && lineIds.length > 0) return lineIds;
+    if (isStrictLineScopedRole && hasCanonicalScope) return [];
+    return [];
+  }, [isSuperAdmin, scopedLineIds, lineIds, isStrictLineScopedRole, hasCanonicalScope]);
+  const assignedLineIdSet = React26__default.useMemo(
+    () => new Set(resolvedAssignedLineIds),
+    [resolvedAssignedLineIds]
+  );
+  const metricsLineIds = React26__default.useMemo(() => {
+    if (isSuperAdmin) {
+      return lineIds ?? [];
+    }
+    return resolvedAssignedLineIds;
+  }, [isSuperAdmin, lineIds, resolvedAssignedLineIds]);
+  const assignedLineIdsForLeaderboard = isSuperAdmin ? void 0 : resolvedAssignedLineIds;
   const leaderboardLinesForView = React26__default.useMemo(() => {
     const targetMode = viewType === "machine" ? "uptime" : "output";
     return leaderboardLines.filter((line) => (line.monitoring_mode ?? "output") === targetMode);
@@ -58854,7 +59181,7 @@ var KPIsOverviewView = ({
     error: metricsError
   } = useDashboardMetrics({
     lineId: factoryViewId,
-    userAccessibleLineIds: lineIds
+    userAccessibleLineIds: metricsLineIds
   });
   const defaultKPIs = React26__default.useMemo(() => createDefaultKPIs(), []);
   const kpisByLineId = React26__default.useMemo(() => {
@@ -58908,16 +59235,16 @@ var KPIsOverviewView = ({
         console.log("[KPIsOverviewView] Fetching lines with lineIds filter:", lineIds);
         const allLines = await dashboardService.getAllLines();
         let filteredLines = allLines;
-        if (lineIds && lineIds.length > 0) {
-          filteredLines = allLines.filter((line) => lineIds.includes(line.id));
-          console.log("[KPIsOverviewView] Filtered lines:", {
+        if (!isSuperAdmin) {
+          filteredLines = allLines.filter((line) => assignedLineIdSet.has(line.id));
+          console.log("[KPIsOverviewView] Applied scoped line filter:", {
             total: allLines.length,
             filtered: filteredLines.length,
-            lineIds,
+            allowedLineIds: resolvedAssignedLineIds,
             filteredLineIds: filteredLines.map((l) => l.id)
           });
         } else {
-          console.log("[KPIsOverviewView] No lineIds filter, showing all lines:", allLines.length);
+          console.log("[KPIsOverviewView] Super admin view, showing all lines:", allLines.length);
         }
         setLines(filteredLines);
       } catch (err) {
@@ -58928,34 +59255,36 @@ var KPIsOverviewView = ({
       }
     };
     fetchLines();
-  }, [supabase, dashboardConfig, lineIds]);
+  }, [supabase, dashboardConfig, lineIds, isSuperAdmin, assignedLineIdSet, resolvedAssignedLineIds]);
   useEffect(() => {
     let isMounted = true;
     const fetchLeaderboardLines = async () => {
       if (!supabase || !resolvedCompanyId) {
-        setLeaderboardLines(lines);
+        setLeaderboardLines(lines.filter((line) => line.enable !== false));
         return;
       }
       setLeaderboardLinesLoading(true);
       try {
-        const linesService2 = new LinesService(supabase);
-        const companyLines = await linesService2.getLinesByCompanyId(resolvedCompanyId);
+        const data = await fetchBackendJson(
+          supabase,
+          `/api/dashboard/leaderboard-lines?company_id=${encodeURIComponent(resolvedCompanyId)}`
+        );
         if (!isMounted) return;
-        const transformed = companyLines.map((line) => ({
+        const transformed = (data.lines || []).filter((line) => line.enable !== false).map((line) => ({
           id: line.id,
-          line_name: line.name,
-          factory_id: line.factoryId || "",
+          line_name: line.line_name,
+          factory_id: line.factory_id || "",
           factory_name: "N/A",
-          company_id: line.companyId,
+          company_id: line.company_id,
           company_name: "",
-          enable: line.isActive ?? true,
-          monitoring_mode: line.monitoringMode ?? "output"
+          enable: line.enable ?? true,
+          monitoring_mode: line.monitoring_mode ?? "output"
         }));
         setLeaderboardLines(transformed);
       } catch (err) {
         console.error("[KPIsOverviewView] Failed to load leaderboard lines:", err);
         if (!isMounted) return;
-        setLeaderboardLines(lines);
+        setLeaderboardLines(lines.filter((line) => line.enable !== false));
       } finally {
         if (isMounted) setLeaderboardLinesLoading(false);
       }
@@ -59036,11 +59365,10 @@ var KPIsOverviewView = ({
         lineMode: viewType === "machine" ? "uptime" : "output"
       });
       const nextMap = /* @__PURE__ */ new Map();
+      targetLineIds.forEach((lineId) => nextMap.set(lineId, 0));
       entries.forEach((entry) => {
         const value = Number(entry.avg_efficiency);
-        if (Number.isFinite(value)) {
-          nextMap.set(entry.line_id, value);
-        }
+        nextMap.set(entry.line_id, Number.isFinite(value) ? value : 0);
       });
       setTodayEfficiencyByLineId(nextMap);
     } catch (err) {
@@ -59123,6 +59451,9 @@ var KPIsOverviewView = ({
     };
   };
   const handleLineClick = (line, kpis) => {
+    if (!isSuperAdmin && !assignedLineIdSet.has(line.id)) {
+      return;
+    }
     const trackProps = {
       line_id: line.id,
       line_name: line.line_name,
@@ -59635,6 +59966,7 @@ var MobileWorkspaceCard = memo$1(({
   workspace,
   rank,
   cardClass,
+  isClickable,
   onWorkspaceClick,
   getMedalIcon,
   efficiencyLabel
@@ -59647,8 +59979,8 @@ var MobileWorkspaceCard = memo$1(({
     transition: {
       layout: { duration: 0.3, ease: "easeInOut" }
     },
-    onClick: () => onWorkspaceClick(workspace, rank),
-    className: `${cardClass} p-3 rounded-lg border shadow-sm active:scale-[0.98] cursor-pointer`,
+    onClick: isClickable ? () => onWorkspaceClick(workspace, rank) : void 0,
+    className: `${cardClass} p-3 rounded-lg border shadow-sm active:scale-[0.98] ${isClickable ? "cursor-pointer" : "cursor-not-allowed opacity-75"}`,
     children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between mb-2", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
         /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
@@ -59670,13 +60002,14 @@ var MobileWorkspaceCard = memo$1(({
     ] })
   }
 ), (prevProps, nextProps) => {
-  return prevProps.efficiencyLabel === nextProps.efficiencyLabel && prevProps.rank === nextProps.rank && prevProps.cardClass === nextProps.cardClass && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.action_count === nextProps.workspace.action_count && prevProps.workspace.action_threshold === nextProps.workspace.action_threshold && prevProps.workspace.avg_cycle_time === nextProps.workspace.avg_cycle_time && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
+  return prevProps.efficiencyLabel === nextProps.efficiencyLabel && prevProps.rank === nextProps.rank && prevProps.cardClass === nextProps.cardClass && prevProps.isClickable === nextProps.isClickable && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.action_count === nextProps.workspace.action_count && prevProps.workspace.action_threshold === nextProps.workspace.action_threshold && prevProps.workspace.avg_cycle_time === nextProps.workspace.avg_cycle_time && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
 });
 MobileWorkspaceCard.displayName = "MobileWorkspaceCard";
 var DesktopWorkspaceRow = memo$1(({
   workspace,
   index,
   rowClass,
+  isClickable,
   onWorkspaceClick,
   getMedalIcon
 }) => /* @__PURE__ */ jsxs(
@@ -59686,8 +60019,8 @@ var DesktopWorkspaceRow = memo$1(({
     layoutId: `row-${workspace.workspace_uuid}`,
     initial: false,
     transition: { layout: { duration: 0.3, ease: "easeInOut" } },
-    onClick: () => onWorkspaceClick(workspace, index + 1),
-    className: `${rowClass} hover:bg-gray-50/90 transition-colors duration-150 cursor-pointer group`,
+    onClick: isClickable ? () => onWorkspaceClick(workspace, index + 1) : void 0,
+    className: `${rowClass} transition-colors duration-150 ${isClickable ? "hover:bg-gray-50/90 cursor-pointer group" : "cursor-not-allowed opacity-75"}`,
     children: [
       /* @__PURE__ */ jsx("td", { className: "px-3 py-2.5 sm:p-4 text-sm sm:text-base whitespace-nowrap group-hover:font-medium", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
         /* @__PURE__ */ jsx("span", { children: index + 1 }),
@@ -59699,7 +60032,7 @@ var DesktopWorkspaceRow = memo$1(({
     ]
   }
 ), (prevProps, nextProps) => {
-  return prevProps.index === nextProps.index && prevProps.rowClass === nextProps.rowClass && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
+  return prevProps.index === nextProps.index && prevProps.rowClass === nextProps.rowClass && prevProps.isClickable === nextProps.isClickable && prevProps.workspace.workspace_uuid === nextProps.workspace.workspace_uuid && prevProps.workspace.efficiency === nextProps.workspace.efficiency && prevProps.workspace.displayName === nextProps.workspace.displayName && prevProps.workspace.lineName === nextProps.workspace.lineName;
 });
 DesktopWorkspaceRow.displayName = "DesktopWorkspaceRow";
 var LeaderboardDetailView = memo$1(({
@@ -59859,6 +60192,16 @@ var LeaderboardDetailView = memo$1(({
     }
     return allLineIds;
   }, [entityConfig, userAccessibleLineIds]);
+  const accessibleLineIdSet = useMemo(
+    () => new Set((userAccessibleLineIds || []).filter(Boolean)),
+    [userAccessibleLineIds]
+  );
+  const canOpenWorkspace = useCallback((workspaceLineId) => {
+    if (!workspaceLineId) return false;
+    if (!userAccessibleLineIds) return true;
+    if (accessibleLineIdSet.size === 0) return false;
+    return accessibleLineIdSet.has(workspaceLineId);
+  }, [accessibleLineIdSet, userAccessibleLineIds]);
   const { hasUptime: lineModeHasUptime, hasOutput: lineModeHasOutput } = useMemo(() => {
     if (!lines || lines.length === 0) {
       return { hasUptime: false, hasOutput: false };
@@ -60256,6 +60599,9 @@ var LeaderboardDetailView = memo$1(({
     return `${startDate.toLocaleDateString("en-US", { month: "short", day: "numeric" })} - ${endDate.toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" })}`;
   }, [normalizedRange]);
   const handleWorkspaceClick = useCallback((workspace, rank) => {
+    if (!canOpenWorkspace(workspace.line_id)) {
+      return;
+    }
     trackCoreEvent("Workspace from Leaderboard Clicked", {
       workspace_name: workspace.workspace_name,
       workspace_id: workspace.workspace_uuid,
@@ -60288,7 +60634,7 @@ var LeaderboardDetailView = memo$1(({
       const combinedParams = navParams ? `${navParams}&${contextParamString}` : `?${contextParamString}`;
       navigation.navigate(`/workspace/${workspace.workspace_uuid}${combinedParams}`);
     }
-  }, [onWorkspaceClick, navigation, date, shiftId]);
+  }, [canOpenWorkspace, onWorkspaceClick, navigation, date, shiftId]);
   useEffect(() => {
     workspacesLengthRef.current = activeEntries.length || 0;
   }, [activeEntries.length]);
@@ -60579,6 +60925,7 @@ var LeaderboardDetailView = memo$1(({
           workspace: ws,
           rank,
           cardClass,
+          isClickable: canOpenWorkspace(ws.line_id),
           onWorkspaceClick: stableHandleWorkspaceClick,
           getMedalIcon: stableGetMedalIcon,
           efficiencyLabel
@@ -60603,6 +60950,7 @@ var LeaderboardDetailView = memo$1(({
               workspace: ws,
               index,
               rowClass,
+              isClickable: canOpenWorkspace(ws.line_id),
               onWorkspaceClick: stableHandleWorkspaceClick,
               getMedalIcon: stableGetMedalIcon
             },
@@ -60613,7 +60961,7 @@ var LeaderboardDetailView = memo$1(({
     ) })
   ] });
 }, (prevProps, nextProps) => {
-  return prevProps.lineId === nextProps.lineId && prevProps.date === nextProps.date && prevProps.shift === nextProps.shift && prevProps.line1Id === nextProps.line1Id && prevProps.line2Id === nextProps.line2Id && JSON.stringify(prevProps.lineNames) === JSON.stringify(nextProps.lineNames) && prevProps.className === nextProps.className;
+  return prevProps.lineId === nextProps.lineId && prevProps.date === nextProps.date && prevProps.shift === nextProps.shift && prevProps.line1Id === nextProps.line1Id && prevProps.line2Id === nextProps.line2Id && JSON.stringify(prevProps.lineNames) === JSON.stringify(nextProps.lineNames) && JSON.stringify(prevProps.userAccessibleLineIds) === JSON.stringify(nextProps.userAccessibleLineIds) && prevProps.className === nextProps.className;
 });
 LeaderboardDetailView.displayName = "LeaderboardDetailView";
 var LeaderboardDetailViewWithDisplayNames = withAllWorkspaceDisplayNames(LeaderboardDetailView);
@@ -66374,9 +66722,38 @@ var TeamManagementView = ({
     optifye: 0
   });
   const [isAddUserDialogOpen, setIsAddUserDialogOpen] = useState(false);
+  const normalizeIds = useCallback((value) => {
+    if (Array.isArray(value)) {
+      return value.filter((id3) => typeof id3 === "string" && id3.length > 0);
+    }
+    if (typeof value === "string" && value.length > 0) {
+      return [value];
+    }
+    return [];
+  }, []);
+  const plantHeadFactoryIds = useMemo(() => {
+    if (user?.role_level !== "plant_head") return [];
+    const scopedFactoryIds = normalizeIds(user?.access_scope?.factory_ids);
+    if (scopedFactoryIds.length > 0) {
+      return Array.from(new Set(scopedFactoryIds));
+    }
+    const propertyFactoryIds = normalizeIds(
+      user?.properties?.factory_ids ?? user?.properties?.factory_id
+    );
+    if (propertyFactoryIds.length > 0) {
+      return Array.from(new Set(propertyFactoryIds));
+    }
+    return entityConfig?.factoryId ? [entityConfig.factoryId] : [];
+  }, [user, entityConfig?.factoryId, normalizeIds]);
+  const notifyScopeRefresh = useCallback(() => {
+    if (typeof window !== "undefined") {
+      window.dispatchEvent(new Event("rbac:refresh-scope"));
+    }
+  }, []);
   const canAddUsers = user?.role_level === "owner" || user?.role_level === "it" || user?.role_level === "plant_head" || user?.role_level === "optifye";
   const canViewUsageStats = user?.role_level === "owner" || user?.role_level === "it" || user?.role_level === "optifye";
-  const companyIdForUsage = entityConfig?.companyId || user?.properties?.company_id;
+  const pageCompanyId = entityConfig?.companyId || user?.properties?.company_id;
+  const companyIdForUsage = pageCompanyId;
   const usageDateRange = useMemo(() => {
     const today = /* @__PURE__ */ new Date();
     const dayOfWeek = today.getDay();
@@ -66407,8 +66784,8 @@ var TeamManagementView = ({
       return acc;
     }, {});
   }, [usageData, usageDateRange.daysElapsed]);
-  const pageTitle = user?.role_level === "optifye" ? "Platform Users" : "Team Management";
-  const pageDescription = user?.role_level === "optifye" ? "Manage users across all companies" : user?.role_level === "owner" || user?.role_level === "it" ? "Manage team members and view their daily usage" : "Manage supervisors in your factory";
+  const pageTitle = "Team Management";
+  const pageDescription = user?.role_level === "owner" || user?.role_level === "it" || user?.role_level === "optifye" ? "Manage team members and view their daily usage" : "Manage supervisors in your factory";
   const hasAccess = user ? user.role_level === void 0 || ["optifye", "owner", "it", "plant_head"].includes(user.role_level) : false;
   const loadData = useCallback(async () => {
     if (!supabase) {
@@ -66416,20 +66793,16 @@ var TeamManagementView = ({
       setIsLoading(false);
       return;
     }
-    const isOptifyeUser = user?.role_level === "optifye";
-    if (!isOptifyeUser) {
-      const companyId2 = entityConfig?.companyId || user?.properties?.company_id;
-      if (!companyId2) {
-        setError("Company not found. Please contact your administrator.");
-        setIsLoading(false);
-        return;
-      }
+    const companyId = pageCompanyId;
+    if (!companyId) {
+      setError("Company not found. Please contact your administrator.");
+      setIsLoading(false);
+      return;
     }
-    const companyId = entityConfig?.companyId || user?.properties?.company_id;
     console.log("[TeamManagementView] Loading data:", {
       role: user?.role_level,
-      isOptifye: isOptifyeUser,
-      companyId: isOptifyeUser ? "ALL" : companyId
+      isOptifye: user?.role_level === "optifye",
+      companyId
     });
     setIsLoading(true);
     setError(void 0);
@@ -66444,23 +66817,7 @@ var TeamManagementView = ({
       if (!backendUrl) {
         throw new Error("Backend URL is not configured. Please set NEXT_PUBLIC_BACKEND_URL in your environment.");
       }
-      if (isOptifyeUser) {
-        const { data: factories } = await supabase.from("factories").select("id, factory_name, company_id").order("factory_name");
-        const linesResponse = await fetch(`${backendUrl}/api/lines`, {
-          headers: {
-            "Authorization": `Bearer ${token}`,
-            "Content-Type": "application/json"
-          }
-        });
-        if (!linesResponse.ok) {
-          throw new Error(`Failed to fetch lines: ${linesResponse.statusText}`);
-        }
-        const linesData = await linesResponse.json();
-        const lines = linesData.lines || [];
-        setAvailableFactories(factories || []);
-        setAvailableLines(lines);
-        console.log("[TeamManagementView] Optifye - Loaded factories:", factories?.length, "lines:", lines?.length, "Sample lines:", lines?.slice(0, 3));
-      } else if ((user?.role_level === "owner" || user?.role_level === "it") && companyId) {
+      if ((user?.role_level === "optifye" || user?.role_level === "owner" || user?.role_level === "it") && companyId) {
         const { data: factories } = await supabase.from("factories").select("id, factory_name, company_id").eq("company_id", companyId).order("factory_name");
         const linesResponse = await fetch(`${backendUrl}/api/lines?company_id=${companyId}`, {
           headers: {
@@ -66475,9 +66832,8 @@ var TeamManagementView = ({
         const lines = linesData.lines || [];
         setAvailableFactories(factories || []);
         setAvailableLines(lines);
-        console.log("[TeamManagementView] Owner/IT - Company:", companyId, "Loaded factories:", factories?.length, "lines:", lines?.length);
+        console.log("[TeamManagementView] Company-scoped team view - Company:", companyId, "Loaded factories:", factories?.length, "lines:", lines?.length);
       } else if (user?.role_level === "plant_head") {
-        const plantHeadFactoryIds = user?.properties?.factory_ids || [];
         if (plantHeadFactoryIds.length > 0) {
           if (companyId) {
             const linesResponse = await fetch(`${backendUrl}/api/lines?company_id=${companyId}`, {
@@ -66530,35 +66886,46 @@ var TeamManagementView = ({
         setAvailableFactories([]);
         console.log("[TeamManagementView] Fallback - Company:", companyId, "Loaded lines:", lines?.length);
       }
-      if (isOptifyeUser) {
-        const [usersData, userStats] = await Promise.all([
-          userManagementService.getAllUsers(),
-          userManagementService.getAllUserStats()
-        ]);
-        setUsers(usersData);
-        setStats({
-          totalUsers: userStats.total,
-          owners: userStats.owners,
-          it: userStats.it,
-          plantHeads: userStats.plant_heads,
-          supervisors: userStats.supervisors,
-          optifye: userStats.optifye
-        });
-      } else {
-        const [usersData, userStats] = await Promise.all([
-          user?.role_level === "plant_head" && entityConfig?.factoryId ? userManagementService.getFactoryUsers(entityConfig.factoryId) : userManagementService.getCompanyUsers(companyId),
-          userManagementService.getUserStats(companyId)
-        ]);
-        setUsers(usersData);
-        setStats({
-          totalUsers: userStats.total,
-          owners: userStats.owners,
-          it: userStats.it,
-          plantHeads: userStats.plant_heads,
-          supervisors: userStats.supervisors,
-          optifye: 0
-        });
-      }
+      const usersPromise = user?.role_level === "plant_head" ? (async () => {
+        if (plantHeadFactoryIds.length === 0) {
+          return [];
+        }
+        const results = await Promise.allSettled(
+          plantHeadFactoryIds.map((factoryId) => userManagementService.getFactoryUsers(factoryId))
+        );
+        const successful = results.filter(
+          (result) => result.status === "fulfilled"
+        ).flatMap((result) => result.value || []);
+        if (successful.length > 0) {
+          const byUserId = /* @__PURE__ */ new Map();
+          successful.forEach((u) => {
+            if (u?.user_id) {
+              byUserId.set(u.user_id, u);
+            }
+          });
+          return Array.from(byUserId.values());
+        }
+        const firstRejected = results.find(
+          (result) => result.status === "rejected"
+        );
+        if (firstRejected) {
+          throw firstRejected.reason;
+        }
+        return [];
+      })() : userManagementService.getCompanyUsers(companyId);
+      const [usersData, userStats] = await Promise.all([
+        usersPromise,
+        userManagementService.getUserStats(companyId)
+      ]);
+      setUsers(usersData);
+      setStats({
+        totalUsers: userStats.total,
+        owners: userStats.owners,
+        it: userStats.it,
+        plantHeads: userStats.plant_heads,
+        supervisors: userStats.supervisors,
+        optifye: 0
+      });
     } catch (err) {
       console.error("Error loading team management data:", err);
       setError(err instanceof Error ? err.message : "Failed to load data");
@@ -66566,16 +66933,16 @@ var TeamManagementView = ({
     } finally {
       setIsLoading(false);
     }
-  }, [supabase, user, entityConfig]);
+  }, [supabase, user, pageCompanyId, entityConfig?.factoryId, plantHeadFactoryIds]);
   useEffect(() => {
-    const companyId = entityConfig?.companyId || user?.properties?.company_id;
-    const canLoad = hasAccess && user && (user.role_level === "optifye" || !!companyId);
+    const companyId = pageCompanyId;
+    const canLoad = hasAccess && user && !!companyId;
     if (canLoad) {
       loadData();
     } else if (!user) {
       setIsLoading(true);
     }
-  }, [hasAccess, loadData, user, entityConfig?.companyId]);
+  }, [hasAccess, loadData, user, pageCompanyId]);
   const handleUserAdded = useCallback(() => {
     loadData();
   }, [loadData]);
@@ -66589,12 +66956,13 @@ var TeamManagementView = ({
         updated_by: user.id
       });
       toast.success("User role updated successfully");
+      notifyScopeRefresh();
       loadData();
     } catch (err) {
       console.error("Error updating user role:", err);
       toast.error("Failed to update user role");
     }
-  }, [supabase, user, loadData]);
+  }, [supabase, user, loadData, notifyScopeRefresh]);
   const handleRemoveUser = useCallback(async (userId) => {
     if (!supabase || !user) return;
     try {
@@ -66617,12 +66985,13 @@ var TeamManagementView = ({
         assigned_by: user.id
       });
       toast.success("Line assignments updated successfully");
+      notifyScopeRefresh();
       loadData();
     } catch (err) {
       console.error("Error updating line assignments:", err);
       toast.error("Failed to update line assignments");
     }
-  }, [supabase, user, loadData]);
+  }, [supabase, user, loadData, notifyScopeRefresh]);
   const handleFactoryAssignmentUpdate = useCallback(async (userId, factoryIds) => {
     if (!supabase || !user) return;
     try {
@@ -66633,12 +67002,13 @@ var TeamManagementView = ({
         assigned_by: user.id
       });
       toast.success("Factory assignments updated successfully");
+      notifyScopeRefresh();
       loadData();
     } catch (err) {
       console.error("Error updating factory assignments:", err);
       toast.error("Failed to update factory assignments");
     }
-  }, [supabase, user, loadData]);
+  }, [supabase, user, loadData, notifyScopeRefresh]);
   const handleProfileUpdate = useCallback(async (userId, firstName, lastName, profilePhotoUrl) => {
     if (!supabase || !user) return;
     try {