diff --git a/managed/ui/src/redesign/features/universe/universe-form/form/fields/MasterPlacementField/MasterPlacementField.tsx b/managed/ui/src/redesign/features/universe/universe-form/form/fields/MasterPlacementField/MasterPlacementField.tsx index 8aa6820d425..53eb7f86fe5 100644 --- a/managed/ui/src/redesign/features/universe/universe-form/form/fields/MasterPlacementField/MasterPlacementField.tsx +++ b/managed/ui/src/redesign/features/universe/universe-form/form/fields/MasterPlacementField/MasterPlacementField.tsx @@ -15,6 +15,7 @@ interface MasterPlacementFieldProps { isPrimary: boolean; useK8CustomResources: boolean; disabled: boolean; + isEditMode: boolean; } const useStyles = makeStyles((theme) => ({ @@ -33,7 +34,8 @@ const useStyles = makeStyles((theme) => ({ export const MasterPlacementField = ({ isPrimary, useK8CustomResources, - disabled + disabled, + isEditMode }: MasterPlacementFieldProps): ReactElement => { const { control, setValue } = useFormContext(); const classes = useStyles(); @@ -47,21 +49,17 @@ export const MasterPlacementField = ({ const provider = useWatch({ name: PROVIDER_FIELD }); useEffect(() => { - if (!isPrimary) { - setValue(MASTER_PLACEMENT_FIELD, MasterPlacementMode.COLOCATED); - } - if (isPrimary) { - if (provider?.code === CloudType.kubernetes) { + // Master Placement field should not be changed in edit mode during onMount + if (!isEditMode) { + if (!isPrimary) { + setValue(MASTER_PLACEMENT_FIELD, MasterPlacementMode.COLOCATED); + } else if (provider?.code === CloudType.kubernetes) { setValue( MASTER_PLACEMENT_FIELD, useK8CustomResources ? MasterPlacementMode.DEDICATED : MasterPlacementMode.COLOCATED ); - } - else{ - setValue( - MASTER_PLACEMENT_FIELD, - MasterPlacementMode.COLOCATED - ); + } else { + setValue(MASTER_PLACEMENT_FIELD, MasterPlacementMode.COLOCATED); } } }, [isPrimary, provider]); diff --git a/managed/ui/src/redesign/features/universe/universe-form/form/sections/cloud/CloudConfiguration.tsx b/managed/ui/src/redesign/features/universe/universe-form/form/sections/cloud/CloudConfiguration.tsx index df2723d484b..d719181c535 100644 --- a/managed/ui/src/redesign/features/universe/universe-form/form/sections/cloud/CloudConfiguration.tsx +++ b/managed/ui/src/redesign/features/universe/universe-form/form/sections/cloud/CloudConfiguration.tsx @@ -102,6 +102,7 @@ export const CloudConfiguration = ({ runtimeConfigs }: UniverseFormConfiguration isPrimary={isPrimary} useK8CustomResources={useK8CustomResources} disabled={isViewMode} + isEditMode={isEditMode} /> )}