[CMG-726]

ui/src/components/AdvancePropertise/index.tsx

@@ -316,8 +316,6 @@ const AdvancePropertise = (props: SchemaProps) => {
     });
   };
 
-
-
   const handleDrop = (index: number) => {
     if (draggedIndex === null) return;
 
@@ -576,7 +574,11 @@ const AdvancePropertise = (props: SchemaProps) => {
                   );
                 }}
                 options={
-                  option}
+                  (Array.isArray(props?.data?.referenceTo) && props?.data?.referenceTo?.length) ? [props.data.referenceTo.map((item: any) => ({
+                    label: item,
+                    value: item
+                  })), ...option]
+                    : option ?? []}
                 placeholder="Add Content Type(s)"
                 version="v2"
                 isSearchable={true}

ui/src/components/ContentMapper/index.scss

@@ -320,7 +320,7 @@ div .table-row {
   display: block;
 }
 .advanced-setting-button {
-  padding: 5px;
+  padding: 5px 10px;
 }
 .field-count {
   font-size: $size-font-large;

ui/src/components/ContentMapper/index.tsx

@@ -1340,14 +1340,14 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
               <Button
                 buttonType="light"
                 disabled={newMigrationData?.project_current_step > 4}
+                onClick={() =>
+                  handleAdvancedSetting(fieldLabel, data?.advanced || {}, data?.uid, data)
+                }
               >
                 <Icon
                   version="v2"
                   icon="Sliders"
                   size="small"
-                  onClick={() =>
-                    handleAdvancedSetting(fieldLabel, data?.advanced || {}, data?.uid, data)
-                  }
                   disabled={newMigrationData?.project_current_step > 4}
                 />
 
@@ -1836,14 +1836,14 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                 <Button
                   buttonType="light"
                   disabled={(contentTypeSchema && existingField[data?.backupFieldUid]) || newMigrationData?.project_current_step > 4}
+                  onClick={() => {
+                    handleAdvancedSetting(initialOption?.label, data?.advanced || {}, data?.uid, data);
+                  }}
                 >
                   <Icon
                     version={'v2'}
                     icon="Sliders"
                     size="small"
-                    onClick={() => {
-                      handleAdvancedSetting(initialOption?.label, data?.advanced || {}, data?.uid, data);
-                    }}
                   />
                 </Button>
               </Tooltip>

ui/src/components/LogScreen/MigrationLogViewer.tsx

@@ -12,15 +12,10 @@ import { updateNewMigrationData } from '../../store/slice/migrationDataSlice';
 // Utilities
 import { CS_URL } from '../../utilities/constants';
 
-// Service
-import { updateCurrentStepData } from '../../services/api/migration.service';
-
 // Interface
 import { INewMigration } from '../../context/app/app.interface';
-import { ModalObj } from '../Modal/modal.interface';
 
 // Components
-import MigrationCompletionModal from '../Common/MigrationCompletionModal';
 import useBlockNavigation from '../../hooks/userNavigation';
 
 // CSS

ui/src/components/Modal/index.tsx

@@ -100,12 +100,18 @@ const Modal = (props: ProjectModalProps) => {
                 if (result) {
                   Notification({
                     notificationContent: { text: result?.data?.message },
+                    notificationProps: {
+                      hideProgressBar: true
+                    },
                     type: 'success'
                   });
                   closeModal();
                 } else {
                   Notification({
                     notificationContent: { text: 'Error occurred while creating project.' },
+                    notificationProps: {
+                      hideProgressBar: true
+                    },
                     type: 'error'
                   });
                   closeModal();

ui/src/pages/Login/index.tsx

@@ -92,7 +92,10 @@ const Login: FC<IProps> = () => {
         if (res?.status === 200 && res?.data?.notice === TFA_VIA_SMS_MESSAGE) {
           Notification({
             notificationContent: { text: res?.data?.notice },
-            type: 'success'
+            type: 'success',
+            notificationProps: {
+              hideProgressBar: true
+            }
           });
         }
 
@@ -198,14 +201,6 @@ 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) {

ui/src/pages/Migration/index.tsx

@@ -736,7 +736,7 @@ const Migration = () => {
           notificationContent: { text: 'Migration Execution process started' },
           notificationProps: {
             position: 'bottom-center',
-            hideProgressBar: false
+            hideProgressBar: true
           },
           type: 'message'
         });