refactor: removed shared folder

src/api/01-integrations.ts

@@ -15,7 +15,7 @@ import type {
   IntegrateContextBody,
   IntegrateXmlContextBody,
   IntegrationResults,
-} from '../model/api'
+} from '../models/api'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/02-campaigns.ts

@@ -23,7 +23,7 @@ import type {
   CampaignCreationV2,
   CampaignSummary,
   DeleteCampaignByIdParams,
-} from '../model/api'
+} from '../models/api'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/03-questionnaires.ts

@@ -24,7 +24,7 @@ import type {
   QuestionnaireModelId,
   QuestionnaireModelValue,
   SurveyUnitsOkNok,
-} from '../model/api'
+} from '../models/api'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/04-nomenclatures.ts

@@ -18,8 +18,8 @@ import type {
   UseQueryResult,
 } from '@tanstack/react-query'
 import { useMutation, useQuery } from '@tanstack/react-query'
-import type { NomenclatureCreation } from '../model/api'
-import type { SchemaNomenclature } from '../model/api/schema.nomenclature'
+import type { NomenclatureCreation } from '../models/api'
+import type { SchemaNomenclature } from '../models/api/schema.nomenclature'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/05-metadata.ts

@@ -15,7 +15,7 @@ import type {
   UseQueryResult,
 } from '@tanstack/react-query'
 import { useQuery } from '@tanstack/react-query'
-import type { SchemaMetadata } from '../model/api/schema.metadata'
+import type { SchemaMetadata } from '../models/api/schema.metadata'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/06-survey-units.ts

@@ -30,9 +30,9 @@ import type {
   SurveyUnitSummary,
   SurveyUnitUpdate,
   SurveyUnitsOkNok,
-} from '../model/api'
-import type { SchemaData } from '../model/api/schema.data'
-import type { SchemaPersonalization } from '../model/api/schema.personalization'
+} from '../models/api'
+import type { SchemaData } from '../models/api/schema.data'
+import type { SchemaPersonalization } from '../models/api/schema.personalization'
 import { depositProofInstance, stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/07-paradata-events.ts

@@ -11,7 +11,7 @@ import type {
   UseMutationResult,
 } from '@tanstack/react-query'
 import { useMutation } from '@tanstack/react-query'
-import type { AddParadataBody } from '../model/api'
+import type { AddParadataBody } from '../models/api'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/api/08-survey-units-in-temp-zone.ts

@@ -18,8 +18,8 @@ import type {
   UseQueryResult,
 } from '@tanstack/react-query'
 import { useMutation, useQuery } from '@tanstack/react-query'
-import type { SurveyUnitTempZone } from '../model/api'
-import type { SchemaSurveyUnitTempZone } from '../model/api/schema.survey-unit-temp-zone'
+import type { SurveyUnitTempZone } from '../models/api'
+import type { SchemaSurveyUnitTempZone } from '../models/api/schema.survey-unit-temp-zone'
 import { stromaeInstance } from './axiosInstance'
 
 type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1]

src/shared/query/visualizeQueryOptions.ts → src/api/visualizeQueryOptions.ts

@@ -1,8 +1,8 @@
-import type { Metadata } from '@/model/Metadata'
-import type { SurveyUnitData } from '@/model/SurveyUnitData'
-import type { Nomenclature } from '@/shared/components/Orchestrator/utils/lunaticType'
-import { ZodErrorWithName } from '@/shared/error/ZodErrorWithName'
-import { surveyUnitMetadataSchema } from '@/shared/parser/metadata'
+import { ZodErrorWithName } from '@/components/error/ZodErrorWithName'
+import type { Nomenclature } from '@/components/orchestrator/utils/lunaticType'
+import type { Metadata } from '@/models/Metadata'
+import type { SurveyUnitData } from '@/models/SurveyUnitData'
+import { surveyUnitMetadataSchema } from '@/models/metadataSchema'
 import type { LunaticSource } from '@inseefr/lunatic'
 import { queryOptions } from '@tanstack/react-query'
 import axios, { type AxiosRequestConfig } from 'axios'

src/shared/components/Error/ErrorComponent.tsx → src/components/error/ErrorComponent.tsx

@@ -3,10 +3,10 @@ import Button from '@codegouvfr/react-dsfr/Button'
 import ArtWorkBackground from '@codegouvfr/react-dsfr/dsfr/artwork/background/ovoid.svg'
 import ArtWork from '@codegouvfr/react-dsfr/dsfr/artwork/system.svg'
 
+import { Container } from '@/components/Container'
+import { errorNormalizer } from '@/components/error/errorNormalizer'
+import { useDocumentTitle } from '@/hooks/useDocumentTitle'
 import { declareComponentKeys, useTranslation } from '@/i18n'
-import { Container } from '@/shared/components/Container'
-import { errorNormalizer } from '@/shared/error/errorNormalizer'
-import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle'
 import TechnicalError from '@codegouvfr/react-dsfr/dsfr/artwork/pictograms/system/technical-error.svg'
 import { useNavigate, useSearch } from '@tanstack/react-router'
 

src/shared/components/Layout/Footer.tsx → src/components/layout/Footer.tsx

@@ -1,14 +1,14 @@
 import { MODE_TYPE } from '@/constants/mode'
+import { useMode } from '@/hooks/useMode'
 import {
   declareComponentKeys,
   useResolveLocalizedString,
   useTranslation,
 } from '@/i18n'
-import type { Logo } from '@/model/Metadata'
-import { NavigationAssistancePage } from '@/pages/NavigationAssistance/NavigationAssistancePage'
-import { SecurityPage } from '@/pages/Security/SecurityPage'
-import { useMode } from '@/shared/hooks/useMode'
-import { useMetadataStore } from '@/shared/metadataStore/useMetadataStore'
+import type { Logo } from '@/models/Metadata'
+import { NavigationAssistancePage } from '@/pages/navigationAssistance/NavigationAssistancePage'
+import { SecurityPage } from '@/pages/security/SecurityPage'
+import { useMetadataStore } from '@/stores/useMetadataStore'
 import { fr } from '@codegouvfr/react-dsfr'
 import { Footer as DSFRFooter } from '@codegouvfr/react-dsfr/Footer'
 import { Header } from './Header'

src/shared/components/Layout/Header.test.tsx → src/components/layout/Header.test.tsx

@@ -1,15 +1,15 @@
 import { MODE_TYPE } from '@/constants/mode'
 import { TELEMETRY_EVENT_TYPE } from '@/constants/telemetry'
 import { TelemetryContext } from '@/contexts/TelemetryContext'
+import { useMode } from '@/hooks/useMode'
 import { OidcProvider } from '@/oidc'
-import { useMode } from '@/shared/hooks/useMode'
 import { renderWithRouter } from '@/utils/tests'
 import { waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { expect } from 'vitest'
 import { Header } from './Header'
 
-vi.mock('@/shared/hooks/useMode')
+vi.mock('@/hooks/useMode')
 
 describe('Header', () => {
   it('triggers telemetry contact support event', async () => {

src/shared/components/Layout/Header.tsx → src/components/layout/Header.tsx

@@ -1,16 +1,16 @@
 import { MODE_TYPE } from '@/constants/mode'
 import { TELEMETRY_EVENT_EXIT_SOURCE } from '@/constants/telemetry'
 import { useTelemetry } from '@/contexts/TelemetryContext'
+import { executePreLogoutActions } from '@/hooks/prelogout'
+import { useMode } from '@/hooks/useMode'
 import {
   declareComponentKeys,
   useResolveLocalizedString,
   useTranslation,
 } from '@/i18n'
 import { useOidc } from '@/oidc'
-import { collectPath } from '@/pages/Collect/route'
-import { executePreLogoutActions } from '@/shared/hooks/prelogout'
-import { useMode } from '@/shared/hooks/useMode'
-import { useMetadataStore } from '@/shared/metadataStore/useMetadataStore'
+import { collectPath } from '@/pages/collect/route'
+import { useMetadataStore } from '@/stores/useMetadataStore'
 import { computeContactSupportEvent, computeExitEvent } from '@/utils/telemetry'
 import { headerFooterDisplayItem } from '@codegouvfr/react-dsfr/Display'
 import { Header as DsfrHeader } from '@codegouvfr/react-dsfr/Header'

src/shared/components/Orchestrator/Orchestrator.tsx → src/components/orchestrator/Orchestrator.tsx

@@ -1,24 +1,18 @@
 import { MODE_TYPE } from '@/constants/mode'
 import { PAGE_TYPE } from '@/constants/page'
 import { useTelemetry } from '@/contexts/TelemetryContext'
-import type { Metadata } from '@/model/Metadata'
-import type { StateData } from '@/model/StateData'
-import type { SurveyUnitData } from '@/model/SurveyUnitData'
-import { usePushEventAfterInactivity } from '@/shared/components/Orchestrator/usePushEventAfterInactivity'
-import { useAddPreLogoutAction } from '@/shared/hooks/prelogout'
-import { usePrevious } from '@/shared/hooks/usePrevious'
-import { downloadAsJson } from '@/utils/downloadAsJson'
-import { isObjectEmpty } from '@/utils/isObjectEmpty'
-import { hasBeenSent, shouldDisplayWelcomeModal } from '@/utils/orchestrator'
+import { useAddPreLogoutAction } from '@/hooks/prelogout'
+import { usePrevious } from '@/hooks/usePrevious'
+import type { Metadata } from '@/models/Metadata'
+import type { StateData } from '@/models/StateData'
+import type { SurveyUnitData } from '@/models/SurveyUnitData'
 import {
   computeControlEvent,
   computeControlSkipEvent,
   computeInitEvent,
   computeInputEvent,
   computeNewPageEvent,
 } from '@/utils/telemetry'
-import { useRefSync } from '@/utils/useRefSync'
-import { useUpdateEffect } from '@/utils/useUpdateEffect'
 import { fr } from '@codegouvfr/react-dsfr'
 import {
   LunaticComponents,
@@ -30,22 +24,28 @@ import {
 } from '@inseefr/lunatic'
 import { useNavigate } from '@tanstack/react-router'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { EndPage } from './CustomPages/EndPage'
-import { ValidationModal } from './CustomPages/ValidationModal'
-import { ValidationPage } from './CustomPages/ValidationPage'
-import { WelcomeModal } from './CustomPages/WelcomeModal'
-import { WelcomePage } from './CustomPages/WelcomePage'
-import { SurveyContainer } from './SurveyContainer'
-import { VTLDevTools } from './VTLDevTools/VTLDevtools'
-import { createLunaticLogger } from './VTLDevTools/VTLErrorStore'
+import { EndPage } from './customPages/EndPage'
+import { ValidationModal } from './customPages/ValidationModal'
+import { ValidationPage } from './customPages/ValidationPage'
+import { WelcomeModal } from './customPages/WelcomeModal'
+import { WelcomePage } from './customPages/WelcomePage'
+import { usePushEventAfterInactivity } from './hooks/usePushEventAfterInactivity'
+import { useRefSync } from './hooks/useRefSync'
+import { useStromaeNavigation } from './hooks/useStromaeNavigation'
+import { useUpdateEffect } from './hooks/useUpdateEffect'
 import { slotComponents } from './slotComponents'
-import { useStromaeNavigation } from './useStromaeNavigation'
+import { SurveyContainer } from './SurveyContainer'
 import { computeLunaticComponents } from './utils/components'
 import { isBlockingError } from './utils/controls'
 import { trimCollectedData } from './utils/data'
+import { downloadAsJson } from './utils/downloadAsJson'
+import { isObjectEmpty } from './utils/isObjectEmpty'
 import type { LunaticGetReferentiel, LunaticPageTag } from './utils/lunaticType'
+import { hasBeenSent, shouldDisplayWelcomeModal } from './utils/orchestrator'
 import { scrollAndFocusToFirstError } from './utils/scrollAndFocusToFirstError'
 import { isSequencePage } from './utils/sequence'
+import { VTLDevTools } from './vtlDevTools/VTLDevtools'
+import { createLunaticLogger } from './vtlDevTools/VTLErrorStore'
 
 /**
  * Module augmentation to specify that Lunatic Component can have an additional props position

src/shared/components/Orchestrator/SequenceHeader.tsx → src/components/orchestrator/SequenceHeader.tsx

@@ -1,5 +1,5 @@
+import { useSequenceTitle } from '@/hooks/useDocumentTitle'
 import { declareComponentKeys, useTranslation } from '@/i18n'
-import { useSequenceTitle } from '@/shared/hooks/useDocumentTitle'
 import { fr } from '@codegouvfr/react-dsfr'
 import type { LunaticOverview } from './utils/lunaticType'
 

src/shared/components/Orchestrator/SurveyContainer.tsx → src/components/orchestrator/SurveyContainer.tsx

@@ -1,7 +1,7 @@
 import { MODE_TYPE } from '@/constants/mode'
 import { PAGE_TYPE } from '@/constants/page'
 import { declareComponentKeys, useTranslation } from '@/i18n'
-import type { InternalPageType } from '@/model/Page'
+import type { InternalPageType } from '@/models/Page'
 import { fr } from '@codegouvfr/react-dsfr'
 import Button from '@codegouvfr/react-dsfr/Button'
 import { useState, type PropsWithChildren, type ReactNode } from 'react'

src/shared/components/Orchestrator/CustomPages/EndPage.tsx → src/components/orchestrator/customPages/EndPage.tsx

@@ -1,6 +1,6 @@
+import { useDocumentTitle } from '@/hooks/useDocumentTitle'
 import { declareComponentKeys, useTranslation } from '@/i18n'
-import type { StateData } from '@/model/StateData'
-import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle'
+import type { StateData } from '@/models/StateData'
 import { fr } from '@codegouvfr/react-dsfr'
 
 /**

src/shared/components/Orchestrator/CustomPages/ValidationPage.tsx → src/components/orchestrator/customPages/ValidationPage.tsx

@@ -1,5 +1,5 @@
+import { useDocumentTitle } from '@/hooks/useDocumentTitle'
 import { declareComponentKeys, useTranslation } from '@/i18n'
-import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle'
 import { fr } from '@codegouvfr/react-dsfr'
 
 export function ValidationPage() {

src/shared/components/Orchestrator/CustomPages/WelcomePage.tsx → src/components/orchestrator/customPages/WelcomePage.tsx

@@ -1,10 +1,10 @@
+import { useDocumentTitle } from '@/hooks/useDocumentTitle'
 import {
   declareComponentKeys,
   useResolveLocalizedString,
   useTranslation,
 } from '@/i18n'
-import type { Contents, Metadata } from '@/model/Metadata'
-import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle'
+import type { Contents, Metadata } from '@/models/Metadata'
 import { fr } from '@codegouvfr/react-dsfr'
 import { Fragment } from 'react'
 

src/shared/components/Orchestrator/usePushEventAfterInactivity.ts → src/components/orchestrator/hooks/usePushEventAfterInactivity.ts

@@ -1,4 +1,4 @@
-import type { CommonParadata, InputParadata } from '@/types/telemetry'
+import type { CommonParadata, InputParadata } from '@/models/telemetry'
 import { areInputParadataIdentical } from '@/utils/telemetry'
 import { useEffect, useRef, useState } from 'react'
 

src/shared/components/Orchestrator/useStromaeNavigation.tsx → src/components/orchestrator/hooks/useStromaeNavigation.tsx

@@ -1,12 +1,12 @@
 import { PAGE_TYPE } from '@/constants/page'
-import type { InternalPageType, PageType, StromaePage } from '@/model/Page'
+import type { InternalPageType, PageType, StromaePage } from '@/models/Page'
 import { useState } from 'react'
 import { assert, type Equals } from 'tsafe/assert'
 import type {
   LunaticGoNextPage,
   LunaticGoPreviousPage,
   LunaticGoToPage,
-} from './utils/lunaticType'
+} from '../utils/lunaticType'
 
 type Params = {
   isFirstPage: boolean

src/shared/components/Orchestrator/slotComponents.tsx → src/components/orchestrator/slotComponents.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react-refresh/only-export-components */
-import { useSequenceTitle } from '@/shared/hooks/useDocumentTitle'
+import { useSequenceTitle } from '@/hooks/useDocumentTitle'
 import type { LunaticSlotComponents } from '@inseefr/lunatic'
 import { slotComponents as dsfrSlotsComponents } from '@inseefr/lunatic-dsfr'
 import { assert } from 'tsafe/assert'

src/utils/orchestrator.ts → src/components/orchestrator/utils/orchestrator.ts

@@ -1,6 +1,6 @@
 import { PAGE_TYPE } from '@/constants/page'
-import type { PageType } from '@/model/Page'
-import type { StateData } from '@/model/StateData'
+import type { PageType } from '@/models/Page'
+import type { StateData } from '@/models/StateData'
 
 // Whether or not the form has been sent and cannot be updated anymore
 export function hasBeenSent(state?: StateData['state']): boolean {

src/shared/components/Orchestrator/VTLDevTools/VTLErrorStore.tsx → src/components/orchestrator/vtlDevTools/VTLErrorStore.tsx

@@ -2,7 +2,7 @@ import type {
   ErrorMessage,
   LoggerMessage,
   LunaticPageTag,
-} from '@/shared/components/Orchestrator/utils/lunaticType'
+} from '@/components/orchestrator/utils/lunaticType'
 import { VTLExpressionError } from '@inseefr/lunatic'
 import { useSyncExternalStore } from 'react'
 

src/contexts/TelemetryContext.tsx

@@ -1,11 +1,11 @@
 /* eslint-disable react-refresh/only-export-components */
 import { addParadata } from '@/api/07-paradata-events'
-import { useBatch } from '@/shared/hooks/useBatch'
+import { useBatch } from '@/hooks/useBatch'
 import type {
   DefaultParadataValues,
   TelemetryEvent,
   TelemetryParadata,
-} from '@/types/telemetry'
+} from '@/models/telemetry'
 import {
   createContext,
   useCallback,

src/shared/hooks/useMode.ts → src/hooks/useMode.ts

@@ -1,7 +1,7 @@
 import { MODE_TYPE } from '@/constants/mode'
-import { collectPath } from '@/pages/Collect/route'
-import { reviewPath } from '@/pages/Review/route'
-import { visualizePath } from '@/pages/Visualize/route'
+import { collectPath } from '@/pages/collect/route'
+import { reviewPath } from '@/pages/review/route'
+import { visualizePath } from '@/pages/visualize/route'
 import { useMatchRoute } from '@tanstack/react-router'
 
 /** Returns current mode based on url */

src/i18n/types.ts

@@ -10,26 +10,26 @@ export const fallbackLanguage = 'fr'
 export type Language = (typeof languages)[number]
 
 export type ComponentKey =
-  | import('@/shared/components/Layout/Footer').I18n
-  | import('@/shared/components/Layout/Header').I18n
-  | import('@/shared/components/Layout/AutoLogoutCountdown').I18n
-  | import('@/shared/components/Error/ErrorComponent').I18n
-  | import('@/shared/components/Orchestrator/CustomPages/EndPage').I18n
-  | import('@/shared/components/Orchestrator/CustomPages/ValidationModal').I18n
-  | import('@/shared/components/Orchestrator/CustomPages/ValidationPage').I18n
-  | import('@/shared/components/Orchestrator/CustomPages/WelcomePage').I18n
-  | import('@/shared/components/Orchestrator/CustomPages/WelcomeModal').I18n
-  | import('@/shared/components/Orchestrator/SequenceHeader').I18n
-  | import('@/shared/components/Orchestrator/SurveyContainer').I18n
-  | import('@/shared/components/Orchestrator/VTLDevTools/VTLDevtools').I18n
-  | import('@/pages/Accessibility/AccessibilityPage').I18n
-  | import('@/pages/Legals/LegalsPage').I18n
-  | import('@/pages/NavigationAssistance/NavigationAssistancePage').I18n
-  | import('@/pages/Security/SecurityPage').I18n
-  | import('@/pages/SiteMap/SiteMapPage').I18n
-  | import('@/pages/Visualize/Form/VisualizeForm').I18n
-  | import('@/pages/Visualize/Form/SelectNomenclatures').I18n
-  | import('@/shared/error/errorNormalizer').I18n
+  | import('@/components/layout/Footer').I18n
+  | import('@/components/layout/Header').I18n
+  | import('@/components/layout/AutoLogoutCountdown').I18n
+  | import('@/components/error/ErrorComponent').I18n
+  | import('@/components/orchestrator/customPages/EndPage').I18n
+  | import('@/components/orchestrator/customPages/ValidationModal').I18n
+  | import('@/components/orchestrator/customPages/ValidationPage').I18n
+  | import('@/components/orchestrator/customPages/WelcomePage').I18n
+  | import('@/components/orchestrator/customPages/WelcomeModal').I18n
+  | import('@/components/orchestrator/SequenceHeader').I18n
+  | import('@/components/orchestrator/SurveyContainer').I18n
+  | import('@/components/orchestrator/vtlDevTools/VTLDevtools').I18n
+  | import('@/pages/accessibility/AccessibilityPage').I18n
+  | import('@/pages/legals/LegalsPage').I18n
+  | import('@/pages/navigationAssistance/NavigationAssistancePage').I18n
+  | import('@/pages/security/SecurityPage').I18n
+  | import('@/pages/siteMap/SiteMapPage').I18n
+  | import('@/pages/visualize/form/VisualizeForm').I18n
+  | import('@/pages/visualize/form/SelectNomenclatures').I18n
+  | import('@/components/error/errorNormalizer').I18n
 
 export type Translations<L extends Language> = GenericTranslations<
   ComponentKey,