Merge pull request #773 from contentstack/bugfix/beta-release

Bugfix/beta release

Author: umeshmore45

.talismanrc

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

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);
+        }
       }        
     })
 
@@ -513,7 +520,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 +625,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 +636,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/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 } from '../../store/slice/authSlice';
 import {
   Button,
   Field,
@@ -157,6 +157,11 @@ const Login: FC<IProps> = () => {
     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/store/slice/authSlice.tsx

@@ -97,6 +97,10 @@ const authSlice = createSlice({
         },
         setSelectedOrganisation: (state, action) => {
             state.selectedOrganisation = action?.payload;
+        },
+        clearOrganisationData: (state) => {
+            state.organisationsList = [];
+            state.selectedOrganisation = DEFAULT_DROPDOWN;
         }
 
 
@@ -116,7 +120,7 @@ const authSlice = createSlice({
 
     },
 })
-export const { setAuthToken, reInitiliseState, setOrganisationsList, setSelectedOrganisation, setUser } = authSlice.actions;
+export const { setAuthToken, reInitiliseState, setOrganisationsList, setSelectedOrganisation, setUser, clearOrganisationData } = authSlice.actions;
 
 export {getUserDetails};
 export default authSlice.reducer;