From a75618c90e4acc0233a00f8c425c3da3abc84e87 Mon Sep 17 00:00:00 2001 From: Alice Dahan Date: Fri, 21 Feb 2025 17:50:45 +0100 Subject: [PATCH] =?UTF-8?q?refactor:=20d=C3=A9place=20tous=20les=20hooks?= =?UTF-8?q?=20dans=20le=20dossier=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/source/components/Assistant/AssistantGoal.tsx | 2 +- site/source/components/BarChart.tsx | 2 +- site/source/components/IframeResizer.ts | 2 +- site/source/components/SelectSimulationYear.tsx | 3 +-- site/source/components/SimulateurOrAssistantPage.tsx | 2 +- site/source/components/Simulation/SimulationGoal.tsx | 2 +- site/source/components/Simulation/SimulationGoals.tsx | 2 +- site/source/components/Simulation/SimulationValue.tsx | 2 +- site/source/components/StackedBarChart.tsx | 2 +- site/source/{components/utils => hooks}/useDate.tsx | 2 +- .../{components/utils => hooks}/useDisplayOnIntersecting.ts | 0 site/source/{components/utils => hooks}/useInitialRender.tsx | 0 site/source/hooks/useSearchParamsForCurrentSituation.tsx | 2 +- .../utils => hooks}/useSearchParamsSimulationSharing.ts | 0 site/source/{components/utils => hooks}/useYear.ts | 0 .../components/Formulaire.tsx | 2 +- .../components/ImpositionSection.tsx | 2 +- .../pages/simulateurs/cessation-activité/CessationActivité.tsx | 2 +- site/source/pages/simulateurs/impot-societe/index.tsx | 2 +- site/source/pages/simulateurs/indépendant/Indépendant.tsx | 2 +- .../pages/simulateurs/indépendant/IndépendantPLSimulation.tsx | 2 +- site/source/pages/simulateurs/lodeom/Goals.tsx | 2 +- .../simulateurs/lodeom/components/WarningSalaireTrans.tsx | 2 +- site/source/pages/simulateurs/reduction-generale/Goals.tsx | 2 +- .../reduction-generale/components/WarningSalaireTrans.tsx | 2 +- site/test/useSearchParamsSimulationSharing.test.js | 2 +- 26 files changed, 22 insertions(+), 23 deletions(-) rename site/source/{components/utils => hooks}/useDate.tsx (63%) rename site/source/{components/utils => hooks}/useDisplayOnIntersecting.ts (100%) rename site/source/{components/utils => hooks}/useInitialRender.tsx (100%) rename site/source/{components/utils => hooks}/useSearchParamsSimulationSharing.ts (100%) rename site/source/{components/utils => hooks}/useYear.ts (100%) diff --git a/site/source/components/Assistant/AssistantGoal.tsx b/site/source/components/Assistant/AssistantGoal.tsx index 3378e1280..872c9a8cf 100644 --- a/site/source/components/Assistant/AssistantGoal.tsx +++ b/site/source/components/Assistant/AssistantGoal.tsx @@ -8,6 +8,7 @@ import { ForceThemeProvider } from '@/components/utils/DarkModeContext' import { Grid } from '@/design-system/layout' import { Body } from '@/design-system/typography/paragraphs' import { SimpleRuleEvaluation } from '@/domaine/engine/SimpleRuleEvaluation' +import { useInitialRender } from '@/hooks/useInitialRender' import { ajusteLaSituation } from '@/store/actions/actions' import { ExplicableRule } from '../conversation/Explicable' @@ -16,7 +17,6 @@ import LectureGuide from '../LectureGuide' import { Appear } from '../ui/animate' import AnimatedTargetValue from '../ui/AnimatedTargetValue' import { useEngine } from '../utils/EngineContext' -import { useInitialRender } from '../utils/useInitialRender' type SimulationGoalProps = { dottedName: DottedName diff --git a/site/source/components/BarChart.tsx b/site/source/components/BarChart.tsx index 6b5a22554..49c58f0f3 100644 --- a/site/source/components/BarChart.tsx +++ b/site/source/components/BarChart.tsx @@ -4,10 +4,10 @@ import { useTranslation } from 'react-i18next' import { animated, config, useSpring } from 'react-spring' import { styled, useTheme } from 'styled-components' -import useDisplayOnIntersecting from '@/components/utils/useDisplayOnIntersecting' import { Emoji } from '@/design-system/emoji' import { Spacing } from '@/design-system/layout' import { Body, SmallBody } from '@/design-system/typography/paragraphs' +import useDisplayOnIntersecting from '@/hooks/useDisplayOnIntersecting' import { DisableAnimationContext } from './utils/DisableAnimationContext' diff --git a/site/source/components/IframeResizer.ts b/site/source/components/IframeResizer.ts index 5fe04ca3a..184d45435 100644 --- a/site/source/components/IframeResizer.ts +++ b/site/source/components/IframeResizer.ts @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { useIsEmbedded } from '../hooks/useIsEmbedded' +import { useIsEmbedded } from '@/hooks/useIsEmbedded' export function IframeResizer() { const isEmbedded = useIsEmbedded() diff --git a/site/source/components/SelectSimulationYear.tsx b/site/source/components/SelectSimulationYear.tsx index ab79c6764..601a6b5af 100644 --- a/site/source/components/SelectSimulationYear.tsx +++ b/site/source/components/SelectSimulationYear.tsx @@ -4,11 +4,10 @@ import { styled } from 'styled-components' import Banner from '@/components/Banner' import { Link } from '@/design-system/typography/link' +import useYear from '@/hooks/useYear' import { enregistreLaRéponse } from '@/store/actions/actions' import { getCurrentYear, getYearsBetween } from '@/utils/dates' -import useYear from './utils/useYear' - const Bold = styled.span<{ $bold: boolean }>` ${({ $bold }) => ($bold ? 'font-weight: bold;' : '')} ` diff --git a/site/source/components/SimulateurOrAssistantPage.tsx b/site/source/components/SimulateurOrAssistantPage.tsx index 1204bedda..898b322ee 100644 --- a/site/source/components/SimulateurOrAssistantPage.tsx +++ b/site/source/components/SimulateurOrAssistantPage.tsx @@ -4,7 +4,6 @@ import { useLocation } from 'react-router-dom' import { styled } from 'styled-components' import Meta from '@/components/utils/Meta' -import useSearchParamsSimulationSharing from '@/components/utils/useSearchParamsSimulationSharing' import { Chip } from '@/design-system' import { Emoji } from '@/design-system/emoji' import { H1 } from '@/design-system/typography/heading' @@ -14,6 +13,7 @@ import { useCurrentSimulatorData, } from '@/hooks/useCurrentSimulatorData' import { useIsEmbedded } from '@/hooks/useIsEmbedded' +import useSearchParamsSimulationSharing from '@/hooks/useSearchParamsSimulationSharing' import useSimulationConfig from '@/hooks/useSimulationConfig' import { Simulation } from '@/store/reducers/simulation.reducer' import { situationSelector } from '@/store/selectors/simulationSelectors' diff --git a/site/source/components/Simulation/SimulationGoal.tsx b/site/source/components/Simulation/SimulationGoal.tsx index ff90eacc8..9dde00a22 100644 --- a/site/source/components/Simulation/SimulationGoal.tsx +++ b/site/source/components/Simulation/SimulationGoal.tsx @@ -10,6 +10,7 @@ import { Grid } from '@/design-system/layout' import { Strong } from '@/design-system/typography' import { Body, SmallBody } from '@/design-system/typography/paragraphs' import { SimpleRuleEvaluation } from '@/domaine/engine/SimpleRuleEvaluation' +import { useInitialRender } from '@/hooks/useInitialRender' import { ajusteLaSituation } from '@/store/actions/actions' import { targetUnitSelector } from '@/store/selectors/simulationSelectors' @@ -20,7 +21,6 @@ import RuleLink from '../RuleLink' import { Appear } from '../ui/animate' import AnimatedTargetValue from '../ui/AnimatedTargetValue' import { useEngine } from '../utils/EngineContext' -import { useInitialRender } from '../utils/useInitialRender' type SimulationGoalProps = { dottedName: DottedName diff --git a/site/source/components/Simulation/SimulationGoals.tsx b/site/source/components/Simulation/SimulationGoals.tsx index fd42f501a..39c7a48bd 100644 --- a/site/source/components/Simulation/SimulationGoals.tsx +++ b/site/source/components/Simulation/SimulationGoals.tsx @@ -6,11 +6,11 @@ import { css, styled } from 'styled-components' import { ForceThemeProvider } from '@/components/utils/DarkModeContext' import { Grid } from '@/design-system/layout' import { SmallBody } from '@/design-system/typography/paragraphs' +import { WatchInitialRender } from '@/hooks/useInitialRender' import { useIsEmbedded } from '@/hooks/useIsEmbedded' import { firstStepCompletedSelector } from '@/store/selectors/simulationSelectors' import { LogoWithLink } from '../Logo' -import { WatchInitialRender } from '../utils/useInitialRender' type SimulationGoalsProps = { legend: string diff --git a/site/source/components/Simulation/SimulationValue.tsx b/site/source/components/Simulation/SimulationValue.tsx index 8f6ff02f1..6b3a6ea13 100644 --- a/site/source/components/Simulation/SimulationValue.tsx +++ b/site/source/components/Simulation/SimulationValue.tsx @@ -8,6 +8,7 @@ import { styled } from 'styled-components' import { Grid } from '@/design-system/layout' import { Body } from '@/design-system/typography/paragraphs' import { Contexte } from '@/domaine/Contexte' +import { useInitialRender } from '@/hooks/useInitialRender' import { targetUnitSelector } from '@/store/selectors/simulationSelectors' import LectureGuide from '../LectureGuide' @@ -15,7 +16,6 @@ import RuleLink from '../RuleLink' import { Appear } from '../ui/animate' import AnimatedTargetValue from '../ui/AnimatedTargetValue' import { useEngine } from '../utils/EngineContext' -import { useInitialRender } from '../utils/useInitialRender' type SimulationValueProps = { dottedName: DottedName diff --git a/site/source/components/StackedBarChart.tsx b/site/source/components/StackedBarChart.tsx index 0bb2d6a02..61f01995f 100755 --- a/site/source/components/StackedBarChart.tsx +++ b/site/source/components/StackedBarChart.tsx @@ -7,7 +7,7 @@ import { animated, useSpring } from 'react-spring' import { styled } from 'styled-components' import RuleLink from '@/components/RuleLink' -import useDisplayOnIntersecting from '@/components/utils/useDisplayOnIntersecting' +import useDisplayOnIntersecting from '@/hooks/useDisplayOnIntersecting' import { targetUnitSelector } from '@/store/selectors/simulationSelectors' import { DisableAnimationContext } from './utils/DisableAnimationContext' diff --git a/site/source/components/utils/useDate.tsx b/site/source/hooks/useDate.tsx similarity index 63% rename from site/source/components/utils/useDate.tsx rename to site/source/hooks/useDate.tsx index 9c5a5785a..9f7900f3e 100644 --- a/site/source/components/utils/useDate.tsx +++ b/site/source/hooks/useDate.tsx @@ -1,4 +1,4 @@ -import { useEngine } from './EngineContext' +import { useEngine } from '../components/utils/EngineContext' export default function useDate() { const date = useEngine().evaluate('date') diff --git a/site/source/components/utils/useDisplayOnIntersecting.ts b/site/source/hooks/useDisplayOnIntersecting.ts similarity index 100% rename from site/source/components/utils/useDisplayOnIntersecting.ts rename to site/source/hooks/useDisplayOnIntersecting.ts diff --git a/site/source/components/utils/useInitialRender.tsx b/site/source/hooks/useInitialRender.tsx similarity index 100% rename from site/source/components/utils/useInitialRender.tsx rename to site/source/hooks/useInitialRender.tsx diff --git a/site/source/hooks/useSearchParamsForCurrentSituation.tsx b/site/source/hooks/useSearchParamsForCurrentSituation.tsx index ddc62db32..b8187ce6e 100644 --- a/site/source/hooks/useSearchParamsForCurrentSituation.tsx +++ b/site/source/hooks/useSearchParamsForCurrentSituation.tsx @@ -1,6 +1,6 @@ import { useSelector } from 'react-redux' -import { useParamsFromSituation } from '@/components/utils/useSearchParamsSimulationSharing' +import { useParamsFromSituation } from '@/hooks/useSearchParamsSimulationSharing' import { companySituationSelector, situationSelector, diff --git a/site/source/components/utils/useSearchParamsSimulationSharing.ts b/site/source/hooks/useSearchParamsSimulationSharing.ts similarity index 100% rename from site/source/components/utils/useSearchParamsSimulationSharing.ts rename to site/source/hooks/useSearchParamsSimulationSharing.ts diff --git a/site/source/components/utils/useYear.ts b/site/source/hooks/useYear.ts similarity index 100% rename from site/source/components/utils/useYear.ts rename to site/source/hooks/useYear.ts diff --git a/site/source/pages/assistants/declaration-charges-sociales-independant/components/Formulaire.tsx b/site/source/pages/assistants/declaration-charges-sociales-independant/components/Formulaire.tsx index f0ac26da6..606cde442 100644 --- a/site/source/pages/assistants/declaration-charges-sociales-independant/components/Formulaire.tsx +++ b/site/source/pages/assistants/declaration-charges-sociales-independant/components/Formulaire.tsx @@ -2,10 +2,10 @@ import { Trans } from 'react-i18next' import { styled } from 'styled-components' import { Condition } from '@/components/EngineValue/Condition' -import useYear from '@/components/utils/useYear' import { Grid } from '@/design-system/layout' import { H2 } from '@/design-system/typography/heading' import { SmallBody } from '@/design-system/typography/paragraphs' +import useYear from '@/hooks/useYear' import { SimpleField, SubSection } from '../../components/Fields' diff --git a/site/source/pages/assistants/declaration-charges-sociales-independant/components/ImpositionSection.tsx b/site/source/pages/assistants/declaration-charges-sociales-independant/components/ImpositionSection.tsx index 3426afd12..af88d3168 100644 --- a/site/source/pages/assistants/declaration-charges-sociales-independant/components/ImpositionSection.tsx +++ b/site/source/pages/assistants/declaration-charges-sociales-independant/components/ImpositionSection.tsx @@ -9,9 +9,9 @@ import RuleInput from '@/components/conversation/RuleInput' import { Condition } from '@/components/EngineValue/Condition' import { WhenAlreadyDefined } from '@/components/EngineValue/WhenAlreadyDefined' import { FromTop } from '@/components/ui/animate' -import useYear from '@/components/utils/useYear' import { H2 } from '@/design-system/typography/heading' import { SmallBody } from '@/design-system/typography/paragraphs' +import useYear from '@/hooks/useYear' import { enregistreLaRéponse } from '@/store/actions/actions' import { SimpleField } from '../../components/Fields' diff --git a/site/source/pages/simulateurs/cessation-activité/CessationActivité.tsx b/site/source/pages/simulateurs/cessation-activité/CessationActivité.tsx index 8a93c33b7..9c5841601 100644 --- a/site/source/pages/simulateurs/cessation-activité/CessationActivité.tsx +++ b/site/source/pages/simulateurs/cessation-activité/CessationActivité.tsx @@ -3,8 +3,8 @@ import { useSelector } from 'react-redux' import SimulateurWarning from '@/components/SimulateurWarning' import Simulation from '@/components/Simulation' -import { useParamsFromSituation } from '@/components/utils/useSearchParamsSimulationSharing' import { Body } from '@/design-system/typography/paragraphs' +import { useParamsFromSituation } from '@/hooks/useSearchParamsSimulationSharing' import useSimulatorsData from '@/hooks/useSimulatorsData' import { useSiteUrl } from '@/hooks/useSiteUrl' import { CessationActivitéGoals } from '@/pages/simulateurs/cessation-activité/Goals' diff --git a/site/source/pages/simulateurs/impot-societe/index.tsx b/site/source/pages/simulateurs/impot-societe/index.tsx index ea23c5bae..7d37de9f6 100644 --- a/site/source/pages/simulateurs/impot-societe/index.tsx +++ b/site/source/pages/simulateurs/impot-societe/index.tsx @@ -15,10 +15,10 @@ import { SimulationGoals, } from '@/components/Simulation' import { FromTop } from '@/components/ui/animate' -import useYear from '@/components/utils/useYear' import { H2 } from '@/design-system/typography/heading' import { Link } from '@/design-system/typography/link' import { Body, Intro } from '@/design-system/typography/paragraphs' +import useYear from '@/hooks/useYear' import { batchUpdateSituation, enregistreLaRéponse, diff --git a/site/source/pages/simulateurs/indépendant/Indépendant.tsx b/site/source/pages/simulateurs/indépendant/Indépendant.tsx index 1bc7825c5..e183e8db1 100644 --- a/site/source/pages/simulateurs/indépendant/Indépendant.tsx +++ b/site/source/pages/simulateurs/indépendant/Indépendant.tsx @@ -8,9 +8,9 @@ import { SelectSimulationYear } from '@/components/SelectSimulationYear' import SimulateurWarning from '@/components/SimulateurWarning' import Simulation from '@/components/Simulation' import IndépendantExplanation from '@/components/simulationExplanation/IndépendantExplanation' -import useYear from '@/components/utils/useYear' import { Body } from '@/design-system/typography/paragraphs' import { SimpleRuleEvaluation } from '@/domaine/engine/SimpleRuleEvaluation' +import useYear from '@/hooks/useYear' import { IndépendantSimulationGoals } from '@/pages/simulateurs/indépendant/Goals' import { ajusteLaSituation } from '@/store/actions/actions' diff --git a/site/source/pages/simulateurs/indépendant/IndépendantPLSimulation.tsx b/site/source/pages/simulateurs/indépendant/IndépendantPLSimulation.tsx index 636d2dc9d..95f573ea5 100644 --- a/site/source/pages/simulateurs/indépendant/IndépendantPLSimulation.tsx +++ b/site/source/pages/simulateurs/indépendant/IndépendantPLSimulation.tsx @@ -4,8 +4,8 @@ import { SelectSimulationYear } from '@/components/SelectSimulationYear' import SimulateurWarning from '@/components/SimulateurWarning' import Simulation from '@/components/Simulation' import IndépendantExplanation from '@/components/simulationExplanation/IndépendantExplanation' -import useYear from '@/components/utils/useYear' import { DarkLi, Ul } from '@/design-system/typography/list' +import useYear from '@/hooks/useYear' import { IndépendantSimulationGoals } from '@/pages/simulateurs/indépendant/Goals' export const IndépendantPLSimulation = () => { diff --git a/site/source/pages/simulateurs/lodeom/Goals.tsx b/site/source/pages/simulateurs/lodeom/Goals.tsx index b2f26d9b7..0f21d1172 100644 --- a/site/source/pages/simulateurs/lodeom/Goals.tsx +++ b/site/source/pages/simulateurs/lodeom/Goals.tsx @@ -7,10 +7,10 @@ import RéductionBasique from '@/components/RéductionDeCotisations/RéductionBa import RéductionMoisParMois from '@/components/RéductionDeCotisations/RéductionMoisParMois' import { SimulationGoals } from '@/components/Simulation' import { useEngine } from '@/components/utils/EngineContext' -import useYear from '@/components/utils/useYear' import { Message } from '@/design-system' import { Body } from '@/design-system/typography/paragraphs' import { useBarèmeLodeom } from '@/hooks/useBarèmeLodeom' +import useYear from '@/hooks/useYear' import { useZoneLodeom } from '@/hooks/useZoneLodeom' import { situationSelector, diff --git a/site/source/pages/simulateurs/lodeom/components/WarningSalaireTrans.tsx b/site/source/pages/simulateurs/lodeom/components/WarningSalaireTrans.tsx index 5c76bb319..22a413e77 100644 --- a/site/source/pages/simulateurs/lodeom/components/WarningSalaireTrans.tsx +++ b/site/source/pages/simulateurs/lodeom/components/WarningSalaireTrans.tsx @@ -3,8 +3,8 @@ import { formatValue } from 'publicodes' import { Trans } from 'react-i18next' import { useEngine } from '@/components/utils/EngineContext' -import useYear from '@/components/utils/useYear' import { useBarèmeLodeom } from '@/hooks/useBarèmeLodeom' +import useYear from '@/hooks/useYear' import { useZoneLodeom } from '@/hooks/useZoneLodeom' export default function WarningSalaireTrans() { diff --git a/site/source/pages/simulateurs/reduction-generale/Goals.tsx b/site/source/pages/simulateurs/reduction-generale/Goals.tsx index 09bdac5ef..c2e6f49f1 100644 --- a/site/source/pages/simulateurs/reduction-generale/Goals.tsx +++ b/site/source/pages/simulateurs/reduction-generale/Goals.tsx @@ -6,7 +6,7 @@ import RéductionBasique from '@/components/RéductionDeCotisations/RéductionBa import RéductionMoisParMois from '@/components/RéductionDeCotisations/RéductionMoisParMois' import { SimulationGoals } from '@/components/Simulation' import { useEngine } from '@/components/utils/EngineContext' -import useYear from '@/components/utils/useYear' +import useYear from '@/hooks/useYear' import { situationSelector, targetUnitSelector, diff --git a/site/source/pages/simulateurs/reduction-generale/components/WarningSalaireTrans.tsx b/site/source/pages/simulateurs/reduction-generale/components/WarningSalaireTrans.tsx index 03046fcbe..c87f718f8 100644 --- a/site/source/pages/simulateurs/reduction-generale/components/WarningSalaireTrans.tsx +++ b/site/source/pages/simulateurs/reduction-generale/components/WarningSalaireTrans.tsx @@ -2,7 +2,7 @@ import { formatValue } from 'publicodes' import { Trans } from 'react-i18next' import { useEngine } from '@/components/utils/EngineContext' -import useYear from '@/components/utils/useYear' +import useYear from '@/hooks/useYear' export default function WarningSalaireTrans() { const year = useYear() diff --git a/site/test/useSearchParamsSimulationSharing.test.js b/site/test/useSearchParamsSimulationSharing.test.js index 86be55666..bd9533bbe 100644 --- a/site/test/useSearchParamsSimulationSharing.test.js +++ b/site/test/useSearchParamsSimulationSharing.test.js @@ -8,7 +8,7 @@ import { getRulesParamNames, getSearchParams, getSituationFromSearchParams, -} from '../source/components/utils/useSearchParamsSimulationSharing' +} from '../source/hooks/useSearchParamsSimulationSharing' describe('identifiant court', () => { const questions = Object.entries(parsePublicodes(rules).parsedRules)