Contantstack logo and favicon updated according to new branding

.talismanrc

@@ -91,5 +91,11 @@ fileignoreconfig:
     checksum: 38d2188de3b4df88ed5e195c13b77ad7c469fe5c4d1265f1ffb868dbe3844ae1
   - filename: api/package-lock.json
     checksum: 09b36877f7e86bb806a9657f852a448dc32fa1dfb350d0fde5fd843c54a27bf0
+  - filename: ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
+    checksum: 4e9bd6dcdb08fab85a3d8200e0dffa0d003743ebbb42d5043228cfd46f7e91da
+  - filename: ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
+    checksum: 4e9bd6dcdb08fab85a3d8200e0dffa0d003743ebbb42d5043228cfd46f7e91da
+  - filename: ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
+    checksum: dde885393dfdd813f1dace88ce8ce79e3fb438801ee5e7bf19855fe1394cb78c
 
 version: "1.0"

api/package.json

@@ -29,7 +29,7 @@
     "@contentstack/cli-utilities": "^1.12.0",
     "@contentstack/json-rte-serializer": "^2.0.7",
     "@contentstack/marketplace-sdk": "^1.2.4",
-    "axios": "^1.8.2",
+    "axios": "^1.12.0",
     "chokidar": "^3.6.0",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",

ui/package.json

@@ -12,7 +12,7 @@
     "@types/react": "^18.3.21",
     "@types/react-dom": "^18.2.13",
     "@types/react-redux": "^7.1.33",
-    "axios": "^1.8.3",
+    "axios": "^1.12.0",
     "bootstrap": "^5.3.6",
     "chokidar": "^3.6.0",
     "final-form": "^4.20.10",

ui/src/cmsData/main_header.json

@@ -21,13 +21,13 @@
       "content_type": "image/svg+xml",
       "file_size": "10160",
       "tags": [],
-      "filename": "icon-cs-mobile.svg",
-      "url": "https://images.contentstack.io/v3/assets/blt7359e2a55efae483/blt0b9a8281aeac3ec0/664c27d3c9024c35b5ad593a/CS_logo.png",
+      "filename": "contentstack-logo.svg",
+      "url": "https://images.contentstack.io/v3/assets/blt77d44a06c81b1730/blt2e24a315fedaeaf7/68bc10f25f14881bc908b6c2/CS_OnlyLogo.webp",
       "ACL": [],
       "is_dir": false,
       "parent_uid": "blt8e7f7872baa3a09e",
       "_version": 1,
-      "title": "icon-cs-mobile.svg"
+      "title": "Contentstack"
     },
     "url": "/projects"
   }

ui/src/components/AdvancePropertise/index.scss

@@ -105,11 +105,6 @@
     position: relative;
     z-index: 10000;
   }
-  .Select__control--menu-is-open {
-    position: relative;
-    border: 2px solid red;
-    z-index: 10000;
-  }
 }
 .Radio-class {
   display: flex;

ui/src/components/ContentMapper/index.scss

@@ -317,4 +317,8 @@ div .table-row {
 .filterButton-color{
   color: $color-brand-primary-base;
   font-weight: $font-weight-bold;
+}
+.icon-padding{
+  padding: 10px 10px;
+  margin-left: 6px;
 }

ui/src/components/ContentMapper/index.tsx

@@ -2470,17 +2470,17 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                               />
                             </div>
 
-                            <Tooltip content={'Fetch content types from destination stack'} position="left">
-                              <Button buttonType="light" icon={onlyIcon ? "v2-FetchTemplate" : ''}
+                            <Tooltip content={'Fetch content types from destination stack'} position="top">
+                              <Button className='icon-padding' buttonType="light" icon={onlyIcon ? "v2-FetchTemplate" : ''}
                                 version="v2" onlyIcon={true} onlyIconHoverColor={'primary'}
                                 size='small' onClick={handleFetchContentType}>
                               </Button>
                             </Tooltip>
                           </>
                         )}
 
-                        <Tooltip content={'Reset to system mapping'} position="left">
-                          <Button buttonType="light" icon={onlyIcon ? "v2-ResetReverse" : ''}
+                        <Tooltip content={'Reset to system mapping'} position="top">
+                          <Button className='icon-padding' buttonType="light" icon={onlyIcon ? "v2-ResetReverse" : ''}
                             version="v2" onlyIcon={true} onlyIconHoverColor={'primary'}
                             size='small' onClick={handleResetContentType}></Button>
                         </Tooltip>

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

@@ -163,6 +163,13 @@ const Mapper = ({
           setSelectedMappings(updatedSelectedMappings);
 
         }
+        else if ( !isLabelMismatch && !isStackChanged ) {
+          const key = `${locale?.label}-master_locale`
+            updatedSelectedMappings = {
+            [key]: updatedSelectedMappings?.[`${locale?.label}-master_locale`] ? updatedSelectedMappings?.[`${locale?.label}-master_locale`] : '',
+          };
+          setSelectedMappings(updatedSelectedMappings);
+        }
       }        
     })
 
@@ -227,9 +234,13 @@ const Mapper = ({
           updatedMappings[selectedLocaleKey] = existingLocale?.[index]?.label;
           delete updatedMappings?.[CS_ENTRIES?.UNMAPPED_LOCALE_KEY];  
         }else{
-        updatedMappings[selectedLocaleKey] = existingLocale?.[index]?.label
-          ? existingLocale?.[index]?.label
-          : '';
+           const oldlabel = Object?.keys?.(updatedMappings)?.[index - 1];
+
+           // Delete old key and assign to new key
+          delete updatedMappings?.[oldlabel];
+          updatedMappings[selectedLocaleKey] = existingLocale?.[index]?.label
+            ? existingLocale?.[index]?.label
+            : '';
         }
       }
 
@@ -288,7 +299,7 @@ const Mapper = ({
       }
       else if (selectedLocaleKey) {
 
-        updatedMappings[existingLabel?.value] = selectedValue?.label
+        updatedMappings[existingLabel?.value ?? index] = selectedValue?.label
           ? selectedValue?.label
           : '';
       }
@@ -513,7 +524,7 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown, uid : string}) => {
   const [options, setoptions] = useState<{ label: string; value: string }[]>([]);
   const [cmsLocaleOptions, setcmsLocaleOptions] = useState<{ label: string; value: string }[]>([]);
   const [sourceLocales, setsourceLocales] = useState<{ label: string; value: string }[]>([]);
-  const [isLoading, setisLoading] = useState<boolean>(false);
+  const [isLoading, setisLoading] = useState<boolean>(true);
   const [currentStack, setCurrentStack] = useState<IDropDown>(stack);
   const [previousStack, setPreviousStack] = useState<IDropDown>();
   const [isStackChanged, setisStackChanged] = useState<boolean>(false);
@@ -618,6 +629,7 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown, uid : string}) => {
   //     return await getStackLocales(newMigrationData?.destination_stack?.selectedOrg?.value);
   //   };
   const addRowComp = () => {
+    setisStackChanged(false);
     setcmsLocaleOptions((prevList: { label: string; value: string }[]) => [
       ...prevList, // Keep existing elements
       {
@@ -628,6 +640,7 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown, uid : string}) => {
   };
 
   const handleDeleteLocale = (id: number, locale: { label: string; value: string }) => {
+    setisStackChanged(false);
     setcmsLocaleOptions((prevList) => {
       return prevList?.filter(
         (item: { label: string; value: string }) => item?.label !== locale?.label

ui/src/components/MainHeader/index.scss

@@ -40,7 +40,6 @@
     a {
       align-items: center;
       display: flex;
-      height: 2.5rem;
       justify-content: center;
       padding: 0.5rem;
       text-decoration: none;

ui/src/components/MainHeader/index.tsx

@@ -169,7 +169,7 @@ const MainHeader = () => {
           <div className="logo" onClick={handleonClick}>
             <Tooltip position="right" content="Projects" wrapperElementType="div">
               <Link to={`${logo?.url}`} onClick={(e) => e.preventDefault()}>
-                <img src={logo?.image?.url} width={32} alt="Contentstack" />
+                <img src={logo?.image?.url} width={28} alt="Contentstack" />
               </Link>
             </Tooltip>
           </div>

ui/src/pages/Login/index.tsx

@@ -3,7 +3,7 @@ import { FC, useEffect, useState } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { getUserDetails, setAuthToken, setUser } from '../../store/slice/authSlice';
+import { clearOrganisationData, getUserDetails, setAuthToken, setUser, clearAuthToken } from '../../store/slice/authSlice';
 import {
   Button,
   Field,
@@ -22,7 +22,7 @@ import {
   TFA_VIA_SMS_MESSAGE,
   CS_ENTRIES
 } from '../../utilities/constants';
-import { failtureNotification, setDataInLocalStorage } from '../../utilities/functions';
+import { clearLocalStorage, failtureNotification, setDataInLocalStorage } from '../../utilities/functions';
 
 // API Service
 import { getCMSDataFromFile } from '../../cmsData/cmsSelector';
@@ -153,10 +153,16 @@ const Login: FC<IProps> = () => {
       setIsLoading(false);
       failtureNotification(response?.data?.error_message || response?.data?.error?.message);
     }
-
+    dispatch(clearAuthToken());
+    localStorage?.removeItem('app_token');
     if (response?.status === 200 && response?.data?.message === LOGIN_SUCCESSFUL_MESSAGE) {
       setIsLoading(false);
       setDataInLocalStorage('app_token', response?.data?.app_token);
+
+      // Clear any previous organization data to ensure fresh organization selection for new user
+      localStorage?.removeItem('organization');
+      dispatch(clearOrganisationData());
+
       const authenticationObj = {
         authToken: response?.data?.app_token,
         isAuthenticated: true

ui/src/pages/Migration/index.tsx

@@ -587,7 +587,8 @@ const Migration = () => {
           value !== '' &&
           value !== null &&
           value !== undefined && 
-          label !== 'undefined'
+          label !== 'undefined' &&
+          isNaN(Number(label))
       );
 
     const master_locale: LocalesType = {};