refactor

Author: lucasgoral

src/components/ControlPlane/ManagedResources.tsx

@@ -56,6 +56,19 @@ type ResourceRow = {
   conditionSyncedMessage: string;
 };
 
+/**
+ * Checks if a resource is managed by Flux based on the kustomize.toolkit.fluxcd.io/name label
+ */
+const isResourceFluxManaged = (item: ManagedResourceItem | undefined): boolean => {
+  if (!item) return false;
+
+  const fluxLabelValue = (item?.metadata?.labels as unknown as Record<string, unknown> | undefined)?.[
+    'kustomize.toolkit.fluxcd.io/name'
+  ];
+
+  return fluxLabelValue != null && (typeof fluxLabelValue !== 'string' || fluxLabelValue.trim() !== '');
+};
+
 export function ManagedResources() {
   const { t } = useTranslation();
   const toast = useToast();
@@ -169,11 +182,7 @@ export function ManagedResources() {
           disableFilters: true,
           Cell: ({ row }) => {
             const { original } = row;
-            const fluxLabelValue = (
-              original?.item?.metadata?.labels as unknown as Record<string, unknown> | undefined
-            )?.['kustomize.toolkit.fluxcd.io/name'];
-            const isFluxManaged =
-              typeof fluxLabelValue === 'string' ? fluxLabelValue.trim() !== '' : fluxLabelValue != null;
+            const isFluxManaged = isResourceFluxManaged(original?.item);
             return original?.item ? (
               <YamlViewButton
                 variant="resource"
@@ -207,11 +216,7 @@ export function ManagedResources() {
             const item = original?.item;
             if (!item) return undefined;
 
-            const fluxLabelValue = (item?.metadata?.labels as unknown as Record<string, unknown> | undefined)?.[
-              'kustomize.toolkit.fluxcd.io/name'
-            ];
-            const isFluxManaged =
-              typeof fluxLabelValue === 'string' ? fluxLabelValue.trim() !== '' : fluxLabelValue != null;
+            const isFluxManaged = isResourceFluxManaged(item);
 
             const actions: ActionItem<ManagedResourceItem>[] = [
               {

src/spaces/mcp/auth/AuthContextMcp.tsx

@@ -17,9 +17,14 @@ const AuthContextMcp = createContext<AuthContextMcpType | null>(null);
 
 export function AuthProviderMcp({ children, mcpUsers = [] }: { children: ReactNode; mcpUsers?: RoleBinding[] }) {
   const auth = useAuthOnboarding();
+
   const userEmail = auth.user?.email;
 
-  const matchingRoleBinding = mcpUsers.find((roleBinding) => roleBinding.subjects[0]?.name?.includes(userEmail ?? ''));
+  const matchingRoleBinding = mcpUsers.find(
+    (roleBinding) =>
+      Array.isArray(roleBinding.subjects) &&
+      roleBinding.subjects.some((subject) => subject?.name?.includes(userEmail ?? '')),
+  );
   const hasMCPAdminRights = matchingRoleBinding?.role === 'admin';
 
   const [isAuthenticated, setIsAuthenticated] = useState(false);