Revert "refactor:CMG-506:refactored user flow when content mapper not generated by enabling save and continue button"

This reverts commit 35356c2.

Author: AishDani

ui/src/components/ContentMapper/index.tsx

@@ -215,7 +215,7 @@ const Fields: MappingFields = {
 
 }
 type contentMapperProps  = {
-  handleStepChange: (step: number) => void;
+  handleStepChange: (currentStep: number) => void;
 }
 
 const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: React.ForwardedRef<ContentTypeSaveHandles>) => {
@@ -2410,8 +2410,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                   ...newMigrationData?.legacy_cms,
                   uploadedFile:{
                     ...newMigrationData?.legacy_cms?.uploadedFile,
-                    reValidate: true,
-                    file_revalidated: true
+                    reValidate: true
                   }
                 }
               }

ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx

@@ -137,8 +137,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
                 buketKey: data?.file_details?.awsData?.buketKey
               }
             },
-            cmsType: data?.cmsType,
-            file_revalidated: true
+            cmsType: data?.cmsType
 
           }
         }

ui/src/components/MigrationFlowHeader/index.tsx

@@ -36,7 +36,6 @@ const MigrationFlowHeader = ({
 }: MigrationFlowHeaderProps) => {
   const [projectName, setProjectName] = useState('');
   const [currentStep, setCurrentStep] = useState<number>(0);
-  const [contentMapperLength, setcontentMapperLength] = useState<number>();
 
   const navigate = useNavigate();
   const params: Params<string> = useParams();
@@ -57,7 +56,6 @@ const MigrationFlowHeader = ({
   const fetchProject = async () => {
     setProjectName(projectData?.name);
     setCurrentStep(projectData?.current_step);
-    setcontentMapperLength(projectData?.content_mapper?.length)
 
     //Navigate to lastest or active Step
     const url = `/projects/${params?.projectId}/migration/steps/${projectData?.current_step}`;
@@ -96,8 +94,6 @@ const MigrationFlowHeader = ({
       newMigrationData?.destination_stack?.selectedStack?.value
     );
 
-  const enableButton = contentMapperLength === 0 && newMigrationData?.project_current_step === 3 && params?.stepId === '1' && (!newMigrationData?.legacy_cms?.uploadedFile?.reValidate || newMigrationData?.legacy_cms?.uploadedFile?.reValidate) && newMigrationData?.legacy_cms?.uploadedFile?.file_revalidated
-
   return (
     <div className="d-flex align-items-center justify-content-between migration-flow-header">
       <div className="d-flex align-items-center">
@@ -116,7 +112,7 @@ const MigrationFlowHeader = ({
         aria-label="Save and Continue"
         isLoading={isLoading || newMigrationData?.isprojectMapped}
         disabled={
-          (isStep4AndNotMigrated || isStepInvalid || isExecutionStarted || destinationStackMigrated) && !enableButton
+          isStep4AndNotMigrated || isStepInvalid || isExecutionStarted || destinationStackMigrated
         }
       >
         {stepValue}

ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx

@@ -50,7 +50,7 @@ export type stepperProps = {
 };
 
 export type HorizontalStepperHandles = {
-  handleStepChange: (stepIndex: number) => void;
+  handleStepChange: (currentStep: number) => void;
 };
 
 const showNotification = (currentIndex: number) => {

ui/src/context/app/app.interface.ts

@@ -68,8 +68,7 @@ export interface IFile {
   file_details?: FileDetails;
   isValidated: boolean;
   reValidate: boolean;
-  cmsType: string;
-  file_revalidated: boolean;
+  cmsType: string
 }
 
 export interface ICMSType extends ICardType {
@@ -312,7 +311,6 @@ export const DEFAULT_FILE: IFile = {
   isValidated: false,
   reValidate: false,
   cmsType: '',
-  file_revalidated: false
 };
 
 export const DEFAULT_CMS_TYPE: ICMSType = {

ui/src/pages/Migration/index.tsx

@@ -324,8 +324,7 @@ const Migration = () => {
             isLocalPath: projectData?.legacy_cms?.is_localPath
           },
           isValidated: projectData?.legacy_cms?.is_fileValid,
-          reValidate: newMigrationData?.legacy_cms?.uploadedFile?.reValidate,
-          file_revalidated: newMigrationData?.legacy_cms?.uploadedFile?.file_revalidated
+          reValidate: newMigrationData?.legacy_cms?.uploadedFile?.reValidate
         } : uploadObj,
         isFileFormatCheckboxChecked: true,
         isRestictedKeywordCheckboxChecked: true,
@@ -374,7 +373,7 @@ const Migration = () => {
    */
   const createStepper = (
     projectData: MigrationResponse,
-    handleStepChange: (step: number) => void
+    handleStepChange: (currentStep: number) => void
   ) => {
     const steps = [
       {
@@ -451,7 +450,7 @@ const Migration = () => {
   const handleOnClickLegacyCms = async (event: MouseEvent) => {
     setIsLoading(true);
 
-    if (isCompleted && newMigrationData?.project_current_step === 1) {
+    if (isCompleted) {
       event.preventDefault();
 
       //Update Data in backend
@@ -494,26 +493,6 @@ const Migration = () => {
           type: 'error'
         });
       }
-    }
-    else if(newMigrationData?.project_current_step > 1 && (!newMigrationData?.legacy_cms?.uploadedFile?.reValidate || newMigrationData?.legacy_cms?.uploadedFile?.reValidate)){
-      if(!newMigrationData?.legacy_cms?.uploadedFile?.file_revalidated){
-        setIsLoading(false);
-        Notification({
-          notificationContent: {
-            text: 'Please reValidate the file to procced furthur'
-          },
-          type: 'warning'
-        });
-      }
-      else{
-        setIsLoading(false);
-        handleStepChange(2);
-        const url = `/projects/${projectId}/migration/steps/3`;
-        navigate(url, { replace: true });
-
-      }
-
-
     } else {
       setIsLoading(false);
 
@@ -644,21 +623,12 @@ const Migration = () => {
         }
       });
     } else {
+      event.preventDefault();
+      const url = `/projects/${projectId}/migration/steps/4`;
+      navigate(url, { replace: true });
 
-      const res = await updateCurrentStepData(selectedOrganisation.value, projectId);
-      if (res?.status === 200) {
-        setIsLoading(false);
-        event.preventDefault();
-        const url = `/projects/${projectId}/migration/steps/4`;
-        navigate(url, { replace: true });
-      } else {
-        setIsLoading(false);
-        Notification({
-          notificationContent: { text: res?.data?.error?.message },
-          type: 'error'
-        });
-      }
-     
+      await updateCurrentStepData(selectedOrganisation.value, projectId);
+      handleStepChange(3);
     }
   };
 
@@ -752,7 +722,7 @@ const Migration = () => {
       <div className="steps-wrapper">
         <HorizontalStepper
           ref={stepperRef}
-          steps={createStepper(projectData ?? defaultMigrationResponse, handleStepChange)}
+          steps={createStepper(projectData ?? defaultMigrationResponse, handleClick)}
           handleSaveCT={saveRef?.current?.handleSaveContentType}
           changeDropdownState={changeDropdownState}
           projectData={projectData || defaultMigrationResponse}

ui/src/services/api/service.interface.ts

@@ -37,7 +37,6 @@ export interface MigrationResponse {
   isMigrationStarted: boolean;
   isMigrationCompleted: boolean;
   migration_execution: boolean;
-  content_mapper: []
 }
 
 export interface LegacyCms {
@@ -66,8 +65,7 @@ export const defaultMigrationResponse: MigrationResponse = {
   current_step: 1,
   isMigrationStarted: false,
   isMigrationCompleted: false,
-  migration_execution: false,
-  content_mapper: []
+  migration_execution: false
 };
 interface data {
   file_details: FileDetails;