fix

Author: lucasgoral

src/components/ComponentsSelection/ComponentsSelectionContainer.tsx

@@ -18,6 +18,7 @@ export interface ComponentsSelectionProps {
   managedControlPlaneTemplate?: ManagedControlPlaneTemplate;
   initialSelection?: Record<string, { isSelected: boolean; version: string }>;
   isOnMcpPage?: boolean;
+  initializedComponents: React.RefObject<boolean>;
 }
 
 /**
@@ -46,14 +47,15 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
   initialSelection,
   isOnMcpPage,
   setInitialComponentsList,
+  initializedComponents,
 }) => {
   const {
     data: availableManagedComponentsListData,
     error,
     isLoading,
   } = useApiResource(ListManagedComponents(), undefined, !!isOnMcpPage);
   const { t } = useTranslation();
-  const initialized = useRef(false);
+
   const [templateDefaultsError, setTemplateDefaultsError] = useState<string | null>(null);
   const defaultComponents = useMemo<TemplateDefaultComponent[]>(
     () => managedControlPlaneTemplate?.spec?.spec?.components?.defaultComponents ?? [],
@@ -62,7 +64,7 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
 
   useEffect(() => {
     if (
-      initialized.current ||
+      initializedComponents.current ||
       !availableManagedComponentsListData?.items ||
       availableManagedComponentsListData.items.length === 0
     ) {
@@ -98,7 +100,7 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
       .filter((component) => !removeComponents.find((item) => item === component.name));
     setInitialComponentsList(newComponentsList);
     setComponentsList(newComponentsList);
-    initialized.current = true;
+    initializedComponents.current = true;
   }, [setComponentsList, defaultComponents, initialSelection, availableManagedComponentsListData?.items]);
 
   useEffect(() => {
@@ -126,7 +128,7 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
   }, [availableManagedComponentsListData, defaultComponents]);
 
   useEffect(() => {
-    if (!initialized.current) return;
+    if (!initializedComponents.current) return;
     if (!defaultComponents?.length) return;
     if (!componentsList?.length) return;
     // If initialSelection is provided, do not auto-apply template defaults

src/components/Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx

@@ -124,7 +124,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
   }, [isOpen, initialTemplateName]);
 
   const validationSchemaCreateManagedControlPlane = useMemo(() => createManagedControlPlaneSchema(t), [t]);
-
+  const initializedComponents = useRef(false);
   const {
     register,
     handleSubmit,
@@ -406,8 +406,8 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
         namespace: s.namespace,
       })),
     );
-    const labels = (initialData?.metadata.labels as unknown as Record<string, string>) ?? {};
-    const annotations = (initialData?.metadata.annotations as unknown as Record<string, string>) ?? {};
+    const labels = (initialData?.metadata?.labels as unknown as Record<string, string>) ?? {};
+    const annotations = (initialData?.metadata?.annotations as unknown as Record<string, string>) ?? {};
     const data = {
       name: initialData?.metadata.name ?? '',
       displayName: annotations?.[DISPLAY_NAME_ANNOTATION] ?? '',
@@ -609,6 +609,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
                 managedControlPlaneTemplate={selectedTemplate}
                 isOnMcpPage={isOnMcpPage}
                 setInitialComponentsList={setInitialComponentsListHandler}
+                initializedComponents={initializedComponents}
               />
             )}
           </WizardStep>