{errorMessage}
} diff --git a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx index d626a06b1..502728e03 100644 --- a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx +++ b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx @@ -154,7 +154,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => { setIsDisabled(true); if ( - !isEmptyString(newMigrationData?.legacy_cms?.affix) && !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) ) { @@ -358,7 +357,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => { setShowMessage(true); setValidationMessage('File validated successfully.'); setIsDisabled(true); - !isEmptyString(newMigrationData?.legacy_cms?.affix) || !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) || (!isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) && props.handleStepChange(props?.currentStep, true)); @@ -366,7 +364,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => { if (newMigrationData?.legacy_cms?.uploadedFile?.reValidate) { setValidationMessage(''); } - if(!isEmptyString(newMigrationData?.legacy_cms?.affix) && !newMigrationData?.legacy_cms?.uploadedFile?.isValidated && !newMigrationData?.legacy_cms?.uploadedFile?.reValidate){ + if(!newMigrationData?.legacy_cms?.uploadedFile?.isValidated && !newMigrationData?.legacy_cms?.uploadedFile?.reValidate){ setIsDisabled(false); } setReValidate(newMigrationData?.legacy_cms?.uploadedFile?.reValidate || false); @@ -376,6 +374,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => { // } }, [isValidated, newMigrationData]); + useEffect(() => { if (newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) { setFileFormat(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id); @@ -448,7 +447,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => { isLoading={isLoading} loadingColor="#6c5ce7" version="v2" - disabled={!(reValidate || (!isDisabled && !isEmptyString(newMigrationData?.legacy_cms?.affix)))} + disabled={!(reValidate || (!isDisabled))} > Validate File diff --git a/ui/src/components/LegacyCms/index.tsx b/ui/src/components/LegacyCms/index.tsx index ef300b931..448fab6b1 100644 --- a/ui/src/components/LegacyCms/index.tsx +++ b/ui/src/components/LegacyCms/index.tsx @@ -142,7 +142,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll } //Make Step 2 complete - if (!isEmptyString(selectedCmsData?.cms_id) && (!isEmptyString(legacyCMSData?.affix) || !isEmptyString(newMigrationData?.legacy_cms?.affix))) { + if (!isEmptyString(selectedCmsData?.cms_id) && (!isEmptyString(legacyCMSData?.affix) )) { setInternalActiveStepIndex(1); } @@ -197,13 +197,12 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll //Make Step 2 complete if ( - !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && - !isEmptyString(newMigrationData?.legacy_cms?.affix) + !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) ) { setInternalActiveStepIndex(1); } - if(!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && !isEmptyString(newMigrationData?.legacy_cms?.affix) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){ + if(!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){ setInternalActiveStepIndex(3); } setisProjectMapped(newMigrationData?.isprojectMapped) @@ -211,8 +210,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll },[newMigrationData]); useEffect(()=>{ - if(! isEmptyString(newMigrationData?.legacy_cms?.affix) - && !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.title) && + if( !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.title) && ! isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.title) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){ setIsAllStepsCompleted(true); diff --git a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx index 78db8e418..de67b07ab 100644 --- a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx +++ b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx @@ -163,7 +163,7 @@ const HorizontalStepper = forwardRef( -1 < newMigrationData?.legacy_cms?.currentStep && newMigrationData?.legacy_cms?.currentStep < 2 ) { - showNotification(newMigrationData?.legacy_cms?.currentStep + 1); + // showNotification(newMigrationData?.legacy_cms?.currentStep + 1); } else if ( newMigrationData?.destination_stack?.selectedStack === undefined || newMigrationData?.destination_stack?.selectedStack === null || diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx index 6706bac6a..d9de0f8b1 100644 --- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx +++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx @@ -93,7 +93,12 @@ const AutoVerticalStepper = React.forwardRef< ) : null} */} - {data.description &&