Merge branch 'pre-stage' of github.com:contentstack/migration-v2 into dev

Author: AishDani

.talismanrc

@@ -61,6 +61,10 @@ fileignoreconfig:
 
   - filename: ui/src/components/Common/Card/card.tsx
     checksum: 6c6194f6b8f470ad107e59f2c4247647bdaa804e458c06b007cf9e074aabac69
+  - filename: upload-api/migration-sitecore/libs/contenttypes.js
+    checksum: b30d7792e245cbf979d151677af4454b327271  cc46ee3058f54ee6192d433638
+  - filename: ui/src/components/ContentMapper/index.tsx
+    checksum: b2f520ab58cd790b204f7dcc26f84606185ca0abd96162e2672d3497643e18e7
 
   - filename: upload-api/src/config/index.ts
     checksum: bd1465785804b3e3942d79f4424498bec838e5aba431c715eb419f3d39cf8d30

ui/src/components/ContentMapper/index.tsx

@@ -293,7 +293,8 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
   const [isCsCTypeUpdated, setsCsCTypeUpdated] = useState<boolean>(false);
   const [isLoadingSaveButton, setisLoadingSaveButton] = useState<boolean>(false);
   const [activeFilter, setActiveFilter] = useState<string>('');
-  const [isAllCheck, setIsAllCheck] = useState<boolean>(false);
+   const [isAllCheck, setIsAllCheck] = useState<boolean>(false);
+
 
   /** ALL HOOKS Here */
   const { projectId = '' } = useParams();
@@ -547,7 +548,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
   }, [contentTypeSchema]);
   useEffect(() => {
     if (existingField && isCsCTypeUpdated) {
-      setIsAllCheck(false);
       const matchedKeys = new Set<string>();
 
       contentTypeSchema?.forEach((item) => {
@@ -832,7 +832,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
 
   // add row ids with their data to rowHistoryObj
   useEffect(() => {
-    setIsAllCheck(false);
     Object.keys(rowHistoryObj)?.forEach(key => delete rowHistoryObj[key]);
     tableData?.forEach(item => {
       rowHistoryObj[item?.id] = [{ checked: true, at: Date.now(), ...modifiedObj(item) }]
@@ -1002,7 +1001,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
   const handleValueChange = (value: FieldTypes, rowIndex: string, rowContentstackFieldUid: string) => {
     setIsDropDownChanged(true);
     setFieldValue(value);
-    setIsAllCheck(false);
     const updatedRows: FieldMapType[] = selectedEntries?.map?.((row) => {
       if (row?.uid === rowIndex && row?.contentstackFieldUid === rowContentstackFieldUid) {
         return { ...row, contentstackFieldType: value?.value };
@@ -1641,7 +1639,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
 
   const handleSaveContentType = async () => {
     setisLoadingSaveButton(true);
-    setIsAllCheck(false);
     const orgId = selectedOrganisation?.uid;
     const projectID = projectId;
     if (

ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx

@@ -480,7 +480,7 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown, uid : string}) => {
   const [cmsLocaleOptions, setcmsLocaleOptions] = useState<{ label: string; value: string }[]>([]);
   const [sourceLocales, setsourceLocales] = useState<{ label: string; value: string }[]>([]);
   const [isLoading, setisLoading] = useState<boolean>(false);
-  const [currentStack, setCurrentStack] = useState<IDropDown>(stack);
+  const [currentStack, setCurrentStack] = useState<IDropDown>();
   const [previousStack, setPreviousStack] = useState<IDropDown>();
   const [isStackChanged, setisStackChanged] = useState<boolean>(false);
   const [stackValue, setStackValue] = useState<string>(stack?.value)

ui/src/components/DestinationStack/Actions/LoadStacks.tsx

@@ -86,7 +86,6 @@ const LoadStacks = (props: LoadFileFormatProps) => {
   const [placeholder] = useState<string>('Select a stack');
   const [localePlaceholder, setlocalePlaceholder ] = useState<string>('Master Locale will be set after stack selection');
   const newMigrationDataRef = useRef(newMigrationData);
-  const [isStackLoading, setIsStackLoading] = useState<boolean>(true);
 
   useEffect(() => {
     newMigrationDataRef.current = newMigrationData;
@@ -112,7 +111,6 @@ const LoadStacks = (props: LoadFileFormatProps) => {
   const handleOnSave = async (data: Stack) => {
     try {
       // Post data to backend
-      setIsStackLoading(true);
       const resp = await createStacksInOrg(selectedOrganisation?.value, {
         ...data,
         master_locale: data?.locale
@@ -155,7 +153,6 @@ const LoadStacks = (props: LoadFileFormatProps) => {
         };
 
         dispatch(updateNewMigrationData(newMigrationDataObj));
-        setIsStackLoading(false);
         // call for Step Change
         props.handleStepChange(props?.currentStep, true);
 
@@ -360,7 +357,7 @@ const LoadStacks = (props: LoadFileFormatProps) => {
         </div>
       </div>
 
-      {newMigrationData?.destination_stack?.selectedStack?.value && (!isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value) || !isStackLoading) &&(
+      {newMigrationData?.destination_stack?.selectedStack?.value && (
         <div className="language-mapper">
           <div className="info-lang">
             <div className="stackTitle language-title">Language Mapping</div>
@@ -379,7 +376,7 @@ const LoadStacks = (props: LoadFileFormatProps) => {
 
           <LanguageMapper
           uid={selectedStack?.uid ?? ''}
-          stack={newMigrationData?.destination_stack?.selectedStack ?? DEFAULT_DROPDOWN} />
+          stack={selectedStack ?? DEFAULT_DROPDOWN} />
         </div>
       )}
     </div>

ui/src/components/DestinationStack/index.tsx

@@ -101,7 +101,7 @@ const DestinationStackComponent = ({
   },[newMigrationData?.isprojectMapped]);
 
   useEffect(()=>{
-    if(!isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value ) 
+    if(! isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value ) 
       ){
       handleAllStepsComplete(true);
     }

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

@@ -26,7 +26,7 @@ interface UploadState {
   fileFormat?: string;
   isConfigLoading: boolean;
   isLoading: boolean;
-  isValidated?: boolean;
+  isValidated: boolean;
   isDisabled?: boolean;
   processing: string;
   progressPercentage: number;
@@ -193,7 +193,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
         {
           isLoading,
           isConfigLoading,
-          //isValidated,
+          isValidated,
           validationMessgae,
           isDisabled,
           cmsType,
@@ -294,7 +294,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
     if (savedState) {
       setIsLoading(savedState.isLoading);
       setIsConfigLoading(savedState.isConfigLoading);
-      //setIsValidated(savedState?.isValidated);
+      setIsValidated(savedState?.isValidated);
       setValidationMessage(savedState?.validationMessage);
       //setIsDisabled(savedState?.isDisabled);
       setCmsType(savedState.cmsType);
@@ -319,7 +319,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
       {
         isLoading,
         isConfigLoading,
-        //isValidated,
+        isValidated,
         validationMessgae,
         //isDisabled,
         cmsType,
@@ -335,7 +335,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
   }, [
     isLoading,
     isConfigLoading,
-    //isValidated,
+    isValidated,
     validationMessgae,
     //isDisabled,
     cmsType,

ui/src/pages/Migration/index.tsx

@@ -7,7 +7,6 @@ import { cbModal, Notification } from '@contentstack/venus-components';
 // Redux files
 import { RootState } from '../../store';
 import { updateMigrationData, updateNewMigrationData } from '../../store/slice/migrationDataSlice';
-import { useWarnOnRefresh } from '../../hooks/useWarnOnrefresh';
 
 // Services
 import {
@@ -106,38 +105,10 @@ const Migration = () => {
   const saveRef = useRef<ContentTypeSaveHandles>(null);
   const newMigrationDataRef = useRef(newMigrationData);
 
-  const [isSaved, setIsSaved] = useState<boolean>(false);
-
   useEffect(() => {
     fetchData();
   }, [params?.stepId, params?.projectId, selectedOrganisation?.value]);
 
-  useWarnOnRefresh(isSaved);
-
-  useEffect(()=>{
-    const hasNonEmptyMapping =
-    newMigrationData?.destination_stack?.localeMapping &&
-    Object.entries(newMigrationData?.destination_stack?.localeMapping || {})?.every(
-      ([label, value]: [string, string]) =>
-        Boolean(label?.trim()) &&
-        value !== '' &&
-        value !== null &&
-        value !== undefined
-    );
-    if(legacyCMSRef?.current && !isCompleted && newMigrationData?.project_current_step === 1){
-      setIsSaved(true);    
-    }
-    else if ((isCompleted && !isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value) && newMigrationData?.project_current_step === 2)){
-     setIsSaved(true);
-    }
-    else if(newMigrationData?.content_mapping?.isDropDownChanged){
-      setIsSaved(true);
-    }
-    else{
-      setIsSaved(false);
-    }
-  },[isCompleted, newMigrationData])
-
   /**
  * Dispatches the isprojectMapped key to redux
  */
@@ -255,7 +226,7 @@ const Migration = () => {
         ...newMigrationData?.legacy_cms?.uploadedFile,
           name: data?.localPath,
           url: data?.localPath,
-          isValidated: false,
+          isValidated: data?.localPath !== newMigrationData?.legacy_cms?.uploadedFile?.file_details?.localPath ? false : newMigrationData?.legacy_cms?.uploadedFile?.isValidated,
           file_details: {
             isLocalPath: data?.isLocalPath,
             cmsType: data?.cmsType,