Bugfix/legacy cms

ui/src/components/ContentMapper/index.tsx

@@ -85,7 +85,8 @@ const dummy_obj:MappingFields = {
   'json':{
     label:'JSON Rich Text Editor',
     options : {
-      'JSON Rich Text Editor':'json'
+      'JSON Rich Text Editor':'json',
+      'HTML Rich text Editor': 'html'
     }
   },
   'html':{

ui/src/components/DestinationStack/index.tsx

@@ -39,7 +39,7 @@ const DestinationStackComponent = ({
   const [isLoading, setIsLoading] = useState<boolean>(true);
   // const [isCompleted, setIsCompleted] = useState<boolean>(false);
   const [isMigrationLocked, setIsMigrationLocked] = useState<boolean>(false);
-  const [stepperKey, setStepperKey] = useState<string>('v-mig-destination-step');
+  const [stepperKey, setStepperKey] = useState<string>('destination-Vertical-stepper');
   const [internalActiveStepIndex, setInternalActiveStepIndex] = useState<number>(-1);
 
   const autoVerticalStepperComponent = useRef<any>(null);
@@ -182,9 +182,6 @@ const DestinationStackComponent = ({
     fetchCMSData();
   }, []);
 
-  useEffect(() => {
-    setStepperKey('destination-Vertical-stepper');
-  }, [isLoading]);
 
   useEffect(() => {
     updateDestinationStackData();

ui/src/components/LegacyCms/index.tsx

@@ -1,4 +1,4 @@
-import { forwardRef, useEffect, useRef, useState , useImperativeHandle} from 'react';
+import { forwardRef, useEffect, useRef, useState , useImperativeHandle, useMemo} from 'react';
 import { useDispatch,useSelector } from 'react-redux';
 import AutoVerticalStepper from '../Stepper/VerticalStepper/AutoVerticalStepper';
 import { getLegacyCMSSteps } from './StepperSteps';
@@ -45,7 +45,8 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, projectData, isCompleted
   const [isMigrationLocked, setIsMigrationLocked] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [internalActiveStepIndex, setInternalActiveStepIndex] = useState<number>(-1);
-  const [stepperKey, setStepperKey] = useState<string>('v-mig-step');
+  const [stepperKey, setStepperKey] = useState<string>('legacy-Vertical-stepper');
+
   const { projectId = '' } = useParams();
   const [isValidated, setisValidated] = useState<boolean>(
     newMigrationData?.legacy_cms?.uploadedFile?.isValidated || false
@@ -202,7 +203,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, projectData, isCompleted
   }, []);
 
   useEffect(() => {
-    setStepperKey('legacy-Vertical-stepper');
+
     setisValidated(newMigrationData?.legacy_cms?.uploadedFile?.isValidated || false);
   }, [isLoading]);
 
@@ -219,9 +220,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, projectData, isCompleted
         autoVerticalStepper.current.handleDynamicStepChange(internalActiveStepIndex, true);
       }
     }
-  }, [internalActiveStepIndex]);  
 
-  useEffect(()=>{
     dispatch(updateNewMigrationData(
       {
       ...newMigrationData,
@@ -232,7 +231,9 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, projectData, isCompleted
 
       }));
 
-  },[internalActiveStepIndex]);
+
+  }, [internalActiveStepIndex]);  
+
 
   useEffect(()=>{
     if (!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id)) {    

ui/src/pages/Home/index.tsx

@@ -12,9 +12,11 @@ import { CS_ENTRIES } from '../../utilities/constants';
 
 // Interface
 import { HomepageType } from './home.interface';
+import useBlockNavigation from '../../hooks/userNavigation';
 
 const Home = () => {
   const [data, setData] = useState<HomepageType>({});
+  useBlockNavigation(true);
 
   const fetchData = async () => {
     //check if offline CMS data field is set to true, if then read data from cms data file.

ui/src/pages/Login/index.tsx

@@ -1,5 +1,5 @@
 // Libraries
-import { FC,useEffect, useState } from 'react';
+import { FC,useEffect, useRef, useState } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
@@ -66,6 +66,7 @@ const Login: FC<IProps> = () => {
   // ************* ALL States Here ************
   const [loginStates, setLoginStates] = useState<IStates>(defaultStates);
   const [isLoading, setIsLoading] = useState<boolean>(false)
+  const [isBlock, setIsBlock] = useState(false);
 
   const navigate = useNavigate();
   const location = useLocation();
@@ -177,6 +178,14 @@ const Login: FC<IProps> = () => {
     }
   };
 
+  useEffect(()=>{
+    if(region && loginStates?.tfa){
+      setIsBlock(true);
+
+    }
+
+  },[loginStates]);
+
   // Function for TFA validation
   const TFAValidation = (value: string): string | undefined => {
     if (value?.length) {
@@ -186,6 +195,26 @@ const Login: FC<IProps> = () => {
     }
   };
 
+
+  useEffect(()=>{ 
+    const handlePopState = (event: PopStateEvent) => {
+      event.preventDefault();
+      window.history.pushState(null, '', window.location.href);
+
+    };
+    if(isBlock){
+      window.history.pushState(null, '', window.location.href);
+
+    }
+    window.history.pushState(null, '', window.location.href);
+    window.addEventListener('popstate',handlePopState);
+
+
+    return () => {
+      window.removeEventListener('popstate', handlePopState);
+    };
+
+  },[isBlock]);
   return (
     <AccountPage data={accountData}>
       {loginStates?.tfa ? (

ui/src/pages/Projects/index.tsx

@@ -133,7 +133,8 @@ const Projects = () => {
   const onClose = () => {
     fetchProjects();
   };
-  useBlockNavigation(isModalOpen)
+  useBlockNavigation(isModalOpen || true);
+
   // Function for open modal
   const openModal = () => {
     setIsModalOpen(true);