From 023b46e16e8da56971a8c55c0930e6ab4fbf53ec Mon Sep 17 00:00:00 2001 From: N3WT DE COMPET Date: Sun, 9 Mar 2025 16:44:37 +0100 Subject: [PATCH] feat: Suppression des localStorage --- Front-End/src/app/[locale]/admin/layout.js | 10 ++---- Front-End/src/app/[locale]/parents/page.js | 8 ++--- .../src/app/actions/subscriptionAction.js | 2 +- Front-End/src/context/EstablishmentContext.js | 31 ++----------------- 4 files changed, 7 insertions(+), 44 deletions(-) diff --git a/Front-End/src/app/[locale]/admin/layout.js b/Front-End/src/app/[locale]/admin/layout.js index 0764980..07b1110 100644 --- a/Front-End/src/app/[locale]/admin/layout.js +++ b/Front-End/src/app/[locale]/admin/layout.js @@ -1,5 +1,4 @@ 'use client' -// src/components/Layout.js import React, { useState, useEffect } from 'react'; import Sidebar from '@/components/Sidebar'; import { usePathname } from 'next/navigation'; @@ -119,13 +118,8 @@ export default function Layout({ name: role.establishment__name, role_type: role.role_type }))); - // Sélectionner l'établissement depuis le localStorage ou le premier établissement par défaut - const storedEstablishmentId = localStorage.getItem('selectedEstablishmentId'); - if (storedEstablishmentId) { - setSelectedEstablishmentId(storedEstablishmentId); - const storedProfileRole = session.user.roles.find(role => role.establishment__id === parseInt(storedEstablishmentId))?.role_type; - setProfileRole(storedProfileRole); - } else if (session.user.roles.length > 0) { + // Sélectionner l'établissement depuis la session ou le premier établissement par défaut + if (!selectedEstablishmentId && session.user.roles.length > 0) { setSelectedEstablishmentId(session.user.roles[0].establishment__id); setProfileRole(session.user.roles[0].role_type); } diff --git a/Front-End/src/app/[locale]/parents/page.js b/Front-End/src/app/[locale]/parents/page.js index b0f3490..586b5f8 100644 --- a/Front-End/src/app/[locale]/parents/page.js +++ b/Front-End/src/app/[locale]/parents/page.js @@ -37,14 +37,11 @@ export default function ParentHomePage() { })); setEstablishments(userEstablishments); - const storedEstablishmentId = localStorage.getItem('selectedEstablishmentId'); - if (storedEstablishmentId) { - setSelectedEstablishmentId(storedEstablishmentId); - } else if (userEstablishments.length > 0) { + if (!selectedEstablishmentId && userEstablishments.length > 0) { setSelectedEstablishmentId(userEstablishments[0].id); } - fetchChildren(userIdFromSession, storedEstablishmentId).then(data => { + fetchChildren(userIdFromSession, selectedEstablishmentId).then(data => { setChildren(data); }); } @@ -53,7 +50,6 @@ export default function ParentHomePage() { const handleEstablishmentChange = (e) => { const establishmentId = parseInt(e.target.value, 10); setSelectedEstablishmentId(establishmentId); - localStorage.setItem('selectedEstablishmentId', establishmentId); }; function handleEdit(eleveId) { diff --git a/Front-End/src/app/actions/subscriptionAction.js b/Front-End/src/app/actions/subscriptionAction.js index b821fb7..47c7128 100644 --- a/Front-End/src/app/actions/subscriptionAction.js +++ b/Front-End/src/app/actions/subscriptionAction.js @@ -100,7 +100,7 @@ export const archiveRegisterForm = (id) => { } export const fetchStudents = (id=null, establishment) => { - const url = (id)?`${BE_SUBSCRIPTION_STUDENTS_URL}/${id}?establishment_id=${establishment}`:`${BE_SUBSCRIPTION_STUDENTS_URL}?establishment_id=${establishment}`; + const url = (id)?`${BE_SUBSCRIPTION_STUDENTS_URL}/${id}`:`${BE_SUBSCRIPTION_STUDENTS_URL}?establishment_id=${establishment}`; const request = new Request( url, { diff --git a/Front-End/src/context/EstablishmentContext.js b/Front-End/src/context/EstablishmentContext.js index bf17647..14708fc 100644 --- a/Front-End/src/context/EstablishmentContext.js +++ b/Front-End/src/context/EstablishmentContext.js @@ -3,35 +3,8 @@ import React, { createContext, useContext, useState, useEffect } from 'react'; const EstablishmentContext = createContext(); export const EstablishmentProvider = ({ children }) => { - const [selectedEstablishmentId, setSelectedEstablishmentId] = useState(() => { - // Récupérer l'ID de l'établissement depuis le localStorage - if (typeof window !== 'undefined') { - return localStorage.getItem('selectedEstablishmentId') || null; - } - return null; - }); - - const [profileRole, setProfileRole] = useState(() => { - // Récupérer le rôle du profil depuis le localStorage - if (typeof window !== 'undefined') { - return localStorage.getItem('profileRole') || null; - } - return null; - }); - - useEffect(() => { - // Sauvegarder l'ID de l'établissement dans le localStorage - if (selectedEstablishmentId) { - localStorage.setItem('selectedEstablishmentId', selectedEstablishmentId); - } - }, [selectedEstablishmentId]); - - useEffect(() => { - // Sauvegarder le rôle du profil dans le localStorage - if (profileRole) { - localStorage.setItem('profileRole', profileRole); - } - }, [profileRole]); + const [selectedEstablishmentId, setSelectedEstablishmentId] = useState(null); + const [profileRole, setProfileRole] = useState(null); return (