Skip to content

Commit

Permalink
Merge pull request #87 from DNUM-SocialGouv/fix-onglet-oc-welcome
Browse files Browse the repository at this point in the history
fix: fixing oc welcome after renaming OcLoginContext
  • Loading branch information
SamiTliliDNUM authored Sep 23, 2024
2 parents ed8aed7 + 27883f7 commit 2bd24f6
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/components/ocAccueil/OcAccueil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { OcAccueilHeader } from './ocAccueilHeader/OcAccueilHeader';
import './OcAccueil.css';
import { Separator } from '../common/svg/Seperator';
import { OcAccueilLinks } from './ocAccueilLinks/OcAccueilLinks';
import { useContext, useEffect, useState } from 'react';
import { useContext, useEffect } from 'react';
import { axiosInstance } from '@/RequestInterceptor';
import { OcWelcomePageContext } from '@/contexts/OcWelcomeContext';
import { ocWelcomeMessageMapper } from '@/utils/ocWelcomeMessage.mapper';
Expand All @@ -13,8 +13,6 @@ import { LoginContext } from '@/contexts/LoginContext';
import { Loader } from '../common/loader/Loader';

export const OcAccueil = () => {
const [isLoading, setIsloading] = useState<boolean>(true);

const context = useContext(OcWelcomePageContext);
const { isLogged } = useContext(LoginContext);

Expand All @@ -24,16 +22,20 @@ export const OcAccueil = () => {
.get<WelcomeAPIResponse>('/partenaire/welcome')
.then((response) => {
const message = ocWelcomeMessageMapper(response.data.messageAccueil);
context!.setMessage(message);
context.setMessage(message);
context.setLinks(response.data.ressourceFiles);
})
.then(() => setIsloading(false));
});
}
}, [isLoading, isLogged, context]);
// Suite au renommage de OcLoginContext en LoginContext,
// inclure le context dans le tableau de dépendances du useEffect,
// Entraine une boucle infinie/erreur.
// Afin de corriger cela, il est nécessaire de supprimer le context du tableau de dépendances.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isLogged]);

return (
<>
{!isLogged && isLoading ? (
{!isLogged ? (
<Loader />
) : (
<div className="fr-container--fluid" data-testid="ocAccueil">
Expand Down

0 comments on commit 2bd24f6

Please sign in to comment.