@@ -87,7 +87,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
8787 const { user } = useAuthOnboarding ( ) ;
8888 const errorDialogRef = useRef < ErrorDialogHandle > ( null ) ;
8989
90- const [ selectedStep , setSelectedStep ] = useState < WizardStepType > ( 'metadata ' ) ;
90+ const [ selectedStep , setSelectedStep ] = useState < WizardStepType > ( 'summarize ' ) ;
9191 const [ metadataFormKey , setMetadataFormKey ] = useState ( 0 ) ;
9292
9393 const normalizeChargingTargetType = useCallback ( ( val ?: string | null ) => ( val ?? '' ) . trim ( ) . toLowerCase ( ) , [ ] ) ;
@@ -342,16 +342,17 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
342342 case 'metadata' :
343343 return false ;
344344 case 'members' :
345- return selectedStep === 'metadata' || ! isValid ;
345+ return ( selectedStep === 'metadata' && ! isEditMode ) || ! isValid ;
346346 case 'componentSelection' :
347- return selectedStep === 'metadata' || selectedStep === 'members' || ! isValid ;
347+ return ( ( selectedStep === 'metadata' || selectedStep === 'members' ) && ! isEditMode ) || ! isValid ;
348348 case 'summarize' :
349349 return (
350- selectedStep === 'metadata' ||
351- selectedStep === 'members' ||
352- selectedStep === 'componentSelection' ||
353- ! isValid ||
354- hasMissingComponentVersions
350+ ( ( selectedStep === 'metadata' ||
351+ selectedStep === 'members' ||
352+ selectedStep === 'componentSelection' ||
353+ hasMissingComponentVersions ) &&
354+ ! isEditMode ) ||
355+ ! isValid
355356 ) ;
356357 case 'success' :
357358 return selectedStep !== 'success' ;
@@ -547,126 +548,127 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
547548 data-testid = "create-mcp-dialog"
548549 onClose = { resetFormAndClose }
549550 >
550- < ErrorDialog ref = { errorDialogRef } />
551- < Wizard contentLayout = "SingleStep" onStepChange = { handleStepChange } >
552- < WizardStep
553- icon = "create-form"
554- titleText = { t ( 'common.metadata' ) }
555- disabled = { isStepDisabled ( 'metadata' ) }
556- selected = { selectedStep === 'metadata' }
557- data-step = "metadata"
558- >
559- < MetadataForm
560- key = { metadataFormKey }
561- watch = { watch }
562- setValue = { setValue }
563- register = { register }
564- errors = { errors }
565- isEditMode = { isEditMode }
566- disableChargingFields = { ! ! selectedTemplate }
567- namePrefix = { templateAffixes . namePrefix }
568- displayNamePrefix = { templateAffixes . displayNamePrefix }
569- nameSuffix = { templateAffixes . nameSuffix }
570- displayNameSuffix = { templateAffixes . displayNameSuffix }
571- />
572- </ WizardStep >
573- < WizardStep
574- icon = "user-edit"
575- titleText = { t ( 'common.members' ) }
576- selected = { selectedStep === 'members' }
577- data-step = "members"
578- disabled = { isStepDisabled ( 'members' ) }
579- >
580- < Form >
581- < FormGroup headerText = { t ( 'CreateProjectWorkspaceDialog.membersHeader' ) } >
582- < EditMembers
583- members = { watch ( 'members' ) }
584- isValidationError = { ! ! errors . members }
585- requireAtLeastOneMember = { false }
586- workspaceName = { workspaceName }
587- projectName = { projectName }
588- type = { 'mcp' }
589- onMemberChanged = { setMembers }
590- />
591- </ FormGroup >
592- </ Form >
593- </ WizardStep >
594- < WizardStep
595- icon = "add-product"
596- titleText = { t ( 'common.componentSelection' ) }
597- selected = { selectedStep === 'componentSelection' }
598- data-step = "componentSelection"
599- disabled = { isStepDisabled ( 'componentSelection' ) }
600- >
601- { /* this condition is to remount the component from scratch to fix a bug with data loading */ }
602- { selectedStep === 'componentSelection' && (
603- < ComponentsSelectionProvider
604- componentsList = { componentsList ?? [ ] }
605- setComponentsList = { setComponentsList }
606- initialSelection = { initialSelection }
607- managedControlPlaneTemplate = { selectedTemplate }
608- isOnMcpPage = { isOnMcpPage }
609- setInitialComponentsList = { setInitialComponentsListHandler }
610- initializedComponents = { initializedComponents }
611- >
551+ { ' ' }
552+ < ComponentsSelectionProvider
553+ componentsList = { componentsList ?? [ ] }
554+ setComponentsList = { setComponentsList }
555+ initialSelection = { initialSelection }
556+ managedControlPlaneTemplate = { selectedTemplate }
557+ isOnMcpPage = { isOnMcpPage }
558+ setInitialComponentsList = { setInitialComponentsListHandler }
559+ initializedComponents = { initializedComponents }
560+ >
561+ < ErrorDialog ref = { errorDialogRef } />
562+ < Wizard contentLayout = "SingleStep" onStepChange = { handleStepChange } >
563+ < WizardStep
564+ icon = "create-form"
565+ titleText = { t ( 'common.metadata' ) }
566+ disabled = { isStepDisabled ( 'metadata' ) }
567+ selected = { selectedStep === 'metadata' }
568+ data-step = "metadata"
569+ >
570+ < MetadataForm
571+ key = { metadataFormKey }
572+ watch = { watch }
573+ setValue = { setValue }
574+ register = { register }
575+ errors = { errors }
576+ isEditMode = { isEditMode }
577+ disableChargingFields = { ! ! selectedTemplate }
578+ namePrefix = { templateAffixes . namePrefix }
579+ displayNamePrefix = { templateAffixes . displayNamePrefix }
580+ nameSuffix = { templateAffixes . nameSuffix }
581+ displayNameSuffix = { templateAffixes . displayNameSuffix }
582+ />
583+ </ WizardStep >
584+ < WizardStep
585+ icon = "user-edit"
586+ titleText = { t ( 'common.members' ) }
587+ selected = { selectedStep === 'members' }
588+ data-step = "members"
589+ disabled = { isStepDisabled ( 'members' ) }
590+ >
591+ < Form >
592+ < FormGroup headerText = { t ( 'CreateProjectWorkspaceDialog.membersHeader' ) } >
593+ < EditMembers
594+ members = { watch ( 'members' ) }
595+ isValidationError = { ! ! errors . members }
596+ requireAtLeastOneMember = { false }
597+ workspaceName = { workspaceName }
598+ projectName = { projectName }
599+ type = { 'mcp' }
600+ onMemberChanged = { setMembers }
601+ />
602+ </ FormGroup >
603+ </ Form >
604+ </ WizardStep >
605+ < WizardStep
606+ icon = "add-product"
607+ titleText = { t ( 'common.componentSelection' ) }
608+ selected = { selectedStep === 'componentSelection' }
609+ data-step = "componentSelection"
610+ disabled = { isStepDisabled ( 'componentSelection' ) }
611+ >
612+ { /* this condition is to remount the component from scratch to fix a bug with data loading */ }
613+ { selectedStep === 'componentSelection' && (
612614 < ComponentsSelectionContainer
613615 componentsList = { componentsList ?? [ ] }
614616 setComponentsList = { setComponentsList }
615617 />
616- </ ComponentsSelectionProvider >
617- ) }
618- </ WizardStep >
619- < WizardStep
620- icon = "activities"
621- titleText = { t ( 'common.summarize' ) }
622- disabled = { isStepDisabled ( 'summarize' ) }
623- selected = { selectedStep === 'summarize' }
624- data-step = "summarize"
625- >
626- < SummarizeStep
627- originalYamlString = { stringify (
628- CreateManagedControlPlane (
629- initialMcpDataWhenInEditMode . name ,
630- `${ projectName } --ws-${ workspaceName } ` ,
631- {
632- displayName : initialMcpDataWhenInEditMode . displayName ,
633- chargingTarget : initialMcpDataWhenInEditMode . chargingTarget ,
634- members : initialMcpDataWhenInEditMode . members ,
635- componentsList : initialMcpDataWhenInEditMode . componentsList ,
636- chargingTargetType : initialMcpDataWhenInEditMode . chargingTargetType ,
637- } ,
638- idpPrefix ,
639- ) ,
640618 ) }
641- watch = { watch }
642- workspaceName = { workspaceName }
643- projectName = { projectName }
644- componentsList = { componentsList }
645- isEditMode = { isEditMode }
646- />
647- </ WizardStep >
648- < WizardStep
649- icon = "activities"
650- titleText = { t ( 'common.success' ) }
651- disabled = { isStepDisabled ( 'success' ) }
652- selected = { selectedStep === 'success' }
653- data-step = "success"
654- >
655- { isEditMode ? (
656- < IllustratedBanner
657- illustrationName = { IllustrationMessageType . SuccessScreen }
658- title = { t ( 'editMCP.titleText' ) }
659- subtitle = { t ( 'editMCP.subtitleText' ) }
660- />
661- ) : (
662- < IllustratedBanner
663- illustrationName = { IllustrationMessageType . SuccessScreen }
664- title = { t ( 'createMCP.titleText' ) }
665- subtitle = { t ( 'createMCP.subtitleText' ) }
619+ </ WizardStep >
620+ < WizardStep
621+ icon = "activities"
622+ titleText = { t ( 'common.summarize' ) }
623+ disabled = { isStepDisabled ( 'summarize' ) }
624+ selected = { selectedStep === 'summarize' }
625+ data-step = "summarize"
626+ >
627+ < SummarizeStep
628+ originalYamlString = { stringify (
629+ CreateManagedControlPlane (
630+ initialMcpDataWhenInEditMode . name ,
631+ `${ projectName } --ws-${ workspaceName } ` ,
632+ {
633+ displayName : initialMcpDataWhenInEditMode . displayName ,
634+ chargingTarget : initialMcpDataWhenInEditMode . chargingTarget ,
635+ members : initialMcpDataWhenInEditMode . members ,
636+ componentsList : initialMcpDataWhenInEditMode . componentsList ,
637+ chargingTargetType : initialMcpDataWhenInEditMode . chargingTargetType ,
638+ } ,
639+ idpPrefix ,
640+ ) ,
641+ ) }
642+ watch = { watch }
643+ workspaceName = { workspaceName }
644+ projectName = { projectName }
645+ componentsList = { componentsList }
646+ isEditMode = { isEditMode }
666647 />
667- ) }
668- </ WizardStep >
669- </ Wizard >
648+ </ WizardStep >
649+ < WizardStep
650+ icon = "activities"
651+ titleText = { t ( 'common.success' ) }
652+ disabled = { isStepDisabled ( 'success' ) }
653+ selected = { selectedStep === 'success' }
654+ data-step = "success"
655+ >
656+ { isEditMode ? (
657+ < IllustratedBanner
658+ illustrationName = { IllustrationMessageType . SuccessScreen }
659+ title = { t ( 'editMCP.titleText' ) }
660+ subtitle = { t ( 'editMCP.subtitleText' ) }
661+ />
662+ ) : (
663+ < IllustratedBanner
664+ illustrationName = { IllustrationMessageType . SuccessScreen }
665+ title = { t ( 'createMCP.titleText' ) }
666+ subtitle = { t ( 'createMCP.subtitleText' ) }
667+ />
668+ ) }
669+ </ WizardStep >
670+ </ Wizard >
671+ </ ComponentsSelectionProvider >
670672 </ Dialog >
671673 </ >
672674 ) ;
0 commit comments