terms of service modal is not hidden by select project

CHANGELOG

+minerva-front (18.0.2) stable; urgency=medium
+  * Bug fix: Terms of Service modal is not hidden by Select project modal when
+    login via ORCID (#305)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 30 Oct 2024 13:00:00 +0200
+
 minerva-front (18.0.1) stable; urgency=medium
   * Bug fix: show cookie baner only when cookie baner link is provided (#304)
   * Bug fix: when link to submap is provided add submap name (#303)

src/components/FunctionalArea/Modal/ToSModal/ToSModal.component.tsx

@@ -3,7 +3,7 @@ import { useAppDispatch } from '@/redux/hooks/useAppDispatch';
 import { Button } from '@/shared/Button';
 
 import { getSessionValid, logout, updateUser } from '@/redux/user/user.thunks';
-import { closeModal } from '@/redux/modal/modal.slice';
+import { closeModal, openSelectProjectModal } from '@/redux/modal/modal.slice';
 import { userSelector } from '@/redux/user/user.selectors';
 import { useAppSelector } from '@/redux/hooks/useAppSelector';
 import { termsOfServiceValSelector } from '@/redux/configuration/configuration.selectors';
@@ -15,13 +15,14 @@ export const ToSModal: React.FC = () => {
   const termsOfService = useAppSelector(termsOfServiceValSelector);
 
   const updateUserTosHandler = async (): Promise<void> => {
-    // eslint-disable-next-line no-console
-    console.log('update');
     if (userData) {
       const user = { ...userData, termsOfUseConsent: true };
       await dispatch(updateUser(user));
       await dispatch(getSessionValid());
       dispatch(closeModal());
+      if (userData.orcidId && userData.orcidId !== '') {
+        dispatch(openSelectProjectModal());
+      }
     }
   };
 

src/redux/modal/modal.reducers.ts

@@ -3,6 +3,13 @@ import { PayloadAction } from '@reduxjs/toolkit';
 import { ErrorData } from '@/utils/error-report/ErrorData';
 import { ModalState, OpenEditOverlayModalAction } from './modal.types';
 
+const getOpenedModel = (state: ModalState): ModalName | null => {
+  if (state.isOpen) {
+    return state.modalName;
+  }
+  return null;
+};
+
 export const openModalReducer = (state: ModalState, action: PayloadAction<ModalName>): void => {
   state.isOpen = true;
   state.modalName = action.payload;
@@ -74,9 +81,11 @@ export const openAccessDeniedModalReducer = (state: ModalState): void => {
 };
 
 export const openSelectProjectModalReducer = (state: ModalState): void => {
-  state.isOpen = true;
-  state.modalName = 'select-project';
-  state.modalTitle = 'Select project!';
+  if (getOpenedModel(state) !== 'terms-of-service') {
+    state.isOpen = true;
+    state.modalName = 'select-project';
+    state.modalTitle = 'Select project!';
+  }
 };
 
 export const setOverviewImageIdReducer = (

src/redux/user/user.thunks.ts

@@ -138,7 +138,7 @@ export const updateUser = createAsyncThunk<undefined, User, ThunkConfig>(
         },
       );
 
-      validateDataUsingZodSchema(newUser, userSchema);
+      validateDataUsingZodSchema(newUser.data, userSchema);
 
       showToast({ type: 'success', message: 'ToS agreement registered' });
     } catch (error) {