From 0c9a290938274ccb49686cbb34de7102aeca29f6 Mon Sep 17 00:00:00 2001 From: HubM Date: Thu, 18 Jan 2024 16:12:50 +0100 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=8E=A8=20add=20simple=20import=20sort?= =?UTF-8?q?=20eslint=20plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 +++ package.json | 3 ++- packages/applications/ssr/.eslintrc.json | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b31def938e..4e3d052c8d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,6 +2,9 @@ "workbench.startupEditor": "newUntitledFile", "editor.formatOnSave": true, "editor.formatOnPaste": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true, + }, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, diff --git a/package.json b/package.json index efad25defe..01ba551441 100644 --- a/package.json +++ b/package.json @@ -175,6 +175,7 @@ "eslint-config-prettier": "^8.10.0", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.28.1", + "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-storybook": "^0.6.14", "eslint-plugin-unused-imports": "^2.0.0", "glob": "^8.1.0", @@ -202,4 +203,4 @@ "engines": { "node": "^18.0.0" } -} +} \ No newline at end of file diff --git a/packages/applications/ssr/.eslintrc.json b/packages/applications/ssr/.eslintrc.json index c41c7f9e0c..5ac2476bd8 100644 --- a/packages/applications/ssr/.eslintrc.json +++ b/packages/applications/ssr/.eslintrc.json @@ -1,7 +1,9 @@ { "extends": "next/core-web-vitals", + "plugins": ["simple-import-sort"], "rules": { "import/no-unassigned-import": "off", - "react/no-unescaped-entities": "off" + "react/no-unescaped-entities": "off", + "simple-import-sort/imports": "error" } -} +} \ No newline at end of file From 76e74908da82ef85122adbad651056719542bbac Mon Sep 17 00:00:00 2001 From: HubM Date: Thu, 18 Jan 2024 16:13:17 +0100 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=8E=A8=20auto=20fix=20import=20in=20s?= =?UTF-8?q?sr=20app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applications/ssr/src/app/BootstrapApp.tsx | 3 ++- packages/applications/ssr/src/app/Providers.tsx | 6 +++--- packages/applications/ssr/src/app/StartDsfr.tsx | 3 ++- .../applications/ssr/src/app/abandons/page.tsx | 5 ++--- .../ssr/src/app/api/v1/taches/route.ts | 5 +++-- .../ssr/src/app/auth/signIn/page.tsx | 5 +++-- .../ssr/src/app/auth/signOut/page.tsx | 3 ++- .../ssr/src/app/documents/[documentKey]/route.ts | 2 +- .../[identifiant]/abandon/demander/page.tsx | 13 ++++++------- .../abandon/modele-reponse/route.ts | 5 +++-- .../app/laureats/[identifiant]/abandon/page.tsx | 9 ++++----- .../transmettre-preuve-recandidature/page.tsx | 7 +++---- packages/applications/ssr/src/app/layout.tsx | 15 +++++++++------ .../ssr/src/app/newApp/newApp.action.ts | 5 +++-- .../applications/ssr/src/app/newApp/page.tsx | 1 + .../reseaux/gestionnaires/[identifiant]/page.tsx | 9 +++++---- .../app/reseaux/gestionnaires/ajouter/page.tsx | 2 +- .../ssr/src/app/reseaux/gestionnaires/page.tsx | 4 ++-- .../applications/ssr/src/app/taches/page.tsx | 5 ++--- .../ssr/src/components/atoms/LinkAction.tsx | 2 +- .../ssr/src/components/atoms/form/Form.tsx | 2 +- .../molecules/ButtonWithFormInModal.tsx | 2 +- .../ssr/src/components/molecules/StatutBadge.tsx | 2 +- .../molecules/UserBasedRoleNavigation.tsx | 3 ++- .../molecules/UserHeaderQuickAccessItem.tsx | 5 +++-- .../components/molecules/projet/ProjetBanner.tsx | 3 ++- .../GestionnaireR\303\251seauListItem.tsx" | 2 +- .../t\303\242che/T\303\242cheListItem.tsx" | 2 +- .../ssr/src/components/organisms/Header.tsx | 3 ++- .../ssr/src/components/organisms/List.tsx | 2 +- .../ssr/src/components/organisms/ListFilters.tsx | 5 +++-- .../ssr/src/components/organisms/ListHeader.tsx | 4 ++-- .../ssr/src/components/organisms/Pagination.tsx | 3 ++- .../abandon/demander/DemanderAbandonPage.tsx | 16 +++++++++------- .../abandon/demander/demanderAbandon.action.ts | 5 +++-- .../d\303\251tails/DetailAbandonPage.tsx" | 12 +++++++----- .../abandon/d\303\251tails/EtapesAbandon.tsx" | 13 +++++++------ .../PreuveRecandidatureStatutBadge.tsx" | 2 +- .../AccorderAbandonAvecRecandidature.tsx" | 6 ++++-- .../AccorderAbandonSansRecandidature.tsx" | 7 ++++--- .../accorderAbandonAvecRecandidature.action.ts" | 9 +++++---- .../accorderAbandonSansRecandidature.action.ts" | 5 +++-- .../d\303\251tails/annuler/AnnulerAbandon.tsx" | 4 +++- .../annuler/annulerAbandon.action.ts" | 5 +++-- .../confirmer/ConfirmerAbandon.tsx" | 6 ++++-- .../confirmer/confirmerAbandon.action.ts" | 5 +++-- .../DemanderConfirmationAbandon.tsx" | 9 +++++---- .../demanderConfirmation.action.ts" | 5 +++-- .../d\303\251tails/rejeter/RejeterAbandon.tsx" | 8 +++++--- .../rejeter/rejeterAbandon.action.ts" | 5 +++-- .../pages/abandon/lister/AbandonListItem.tsx | 9 ++++----- .../pages/abandon/lister/AbandonListPage.tsx | 2 +- .../TransmettrePreuveRecandidatureForm.tsx | 10 +++++----- .../TransmettrePreuveRecandidaturePage.tsx | 12 +++++++----- .../transmettrePreuveRecandidature.action.ts | 5 +++-- .../pages/custom-error/CustomErrorPage.tsx | 3 ++- .../AjouterGestionnaireR\303\251seauPage.tsx" | 4 +++- .../GestionnaireR\303\251seauListPage.tsx" | 3 ++- .../ModifierGestionnaireR\303\251seauPage.tsx" | 4 +++- .../AjouterGestionnaireR\303\251seauForm.tsx" | 10 ++++++---- .../ajouterGestionnaireR\303\251seau.action.ts" | 5 +++-- .../ModifierGestionnaireR\303\251seauForm.tsx" | 10 ++++++---- .../modifierGestionnaireR\303\251seau.action.ts" | 5 +++-- .../pages/t\303\242che/T\303\242cheListPage.tsx" | 4 ++-- .../templates/DetailsAboutProjetPageTemplate.tsx | 1 + .../templates/FormForProjetPageTemplate.tsx | 3 ++- .../components/templates/ListPageTemplate.tsx | 10 +++++----- .../components/templates/ProjetPageTemplate.tsx | 1 + .../ssr/src/utils/PageWithErrorHandling.tsx | 1 + packages/applications/ssr/src/utils/apiAction.ts | 1 + .../applications/ssr/src/utils/formAction.ts | 2 +- .../src/utils/getAuthenticatedUser.handler.ts | 2 +- .../ssr/src/utils/withErrorHandling.ts | 8 ++++---- .../ssr/src/utils/withUtilisateur.ts | 3 ++- 74 files changed, 221 insertions(+), 166 deletions(-) diff --git a/packages/applications/ssr/src/app/BootstrapApp.tsx b/packages/applications/ssr/src/app/BootstrapApp.tsx index 4bb86d9a87..e24f7c8f33 100644 --- a/packages/applications/ssr/src/app/BootstrapApp.tsx +++ b/packages/applications/ssr/src/app/BootstrapApp.tsx @@ -1,6 +1,7 @@ -import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; import { mediator } from 'mediateur'; +import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; + mediator.register('GET_AUTHENTICATED_USER', getAuthenticatedUser); export const BootstrapApp = () => { diff --git a/packages/applications/ssr/src/app/Providers.tsx b/packages/applications/ssr/src/app/Providers.tsx index 73ec02168f..aaf1406de8 100644 --- a/packages/applications/ssr/src/app/Providers.tsx +++ b/packages/applications/ssr/src/app/Providers.tsx @@ -1,9 +1,9 @@ 'use client'; -import React from 'react'; -import { SessionProvider } from 'next-auth/react'; -import { DsfrProvider } from '@codegouvfr/react-dsfr/next-appdir/DsfrProvider'; import { createMuiDsfrThemeProvider } from '@codegouvfr/react-dsfr/mui'; +import { DsfrProvider } from '@codegouvfr/react-dsfr/next-appdir/DsfrProvider'; +import { SessionProvider } from 'next-auth/react'; +import React from 'react'; type ProvidersProps = { children: React.ReactNode; diff --git a/packages/applications/ssr/src/app/StartDsfr.tsx b/packages/applications/ssr/src/app/StartDsfr.tsx index 5d1af20a82..14e778176a 100644 --- a/packages/applications/ssr/src/app/StartDsfr.tsx +++ b/packages/applications/ssr/src/app/StartDsfr.tsx @@ -1,9 +1,10 @@ 'use client'; import { startReactDsfr } from '@codegouvfr/react-dsfr/next-appdir'; -import { defaultColorScheme } from './defaultColorScheme'; import Link from 'next/link'; +import { defaultColorScheme } from './defaultColorScheme'; + declare module '@codegouvfr/react-dsfr/next-appdir' { interface RegisterLink { Link: typeof Link; diff --git a/packages/applications/ssr/src/app/abandons/page.tsx b/packages/applications/ssr/src/app/abandons/page.tsx index c1a692f8a7..cd879af625 100644 --- a/packages/applications/ssr/src/app/abandons/page.tsx +++ b/packages/applications/ssr/src/app/abandons/page.tsx @@ -1,8 +1,7 @@ -import { mediator } from 'mediateur'; -import type { Metadata } from 'next'; - import { ListerAppelOffreQuery } from '@potentiel-domain/appel-offre'; import { Abandon } from '@potentiel-domain/laureat'; +import { mediator } from 'mediateur'; +import type { Metadata } from 'next'; import { AbandonListPage, diff --git a/packages/applications/ssr/src/app/api/v1/taches/route.ts b/packages/applications/ssr/src/app/api/v1/taches/route.ts index 49c62b8259..37e18143a3 100644 --- a/packages/applications/ssr/src/app/api/v1/taches/route.ts +++ b/packages/applications/ssr/src/app/api/v1/taches/route.ts @@ -1,6 +1,7 @@ -import { apiAction } from '@/utils/apiAction'; -import { mediator } from 'mediateur'; import { ConsulterNombreTâchesQuery } from '@potentiel-domain/tache'; +import { mediator } from 'mediateur'; + +import { apiAction } from '@/utils/apiAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; export const dynamic = 'force-dynamic'; diff --git a/packages/applications/ssr/src/app/auth/signIn/page.tsx b/packages/applications/ssr/src/app/auth/signIn/page.tsx index d2b146db37..d7b0d28be2 100644 --- a/packages/applications/ssr/src/app/auth/signIn/page.tsx +++ b/packages/applications/ssr/src/app/auth/signIn/page.tsx @@ -1,10 +1,11 @@ 'use client'; -import { PageTemplate } from '@/components/templates/PageTemplate'; -import { signIn, useSession } from 'next-auth/react'; import { redirect, useSearchParams } from 'next/navigation'; +import { signIn, useSession } from 'next-auth/react'; import { useEffect } from 'react'; +import { PageTemplate } from '@/components/templates/PageTemplate'; + export default function SignIn() { const params = useSearchParams(); const { status } = useSession(); diff --git a/packages/applications/ssr/src/app/auth/signOut/page.tsx b/packages/applications/ssr/src/app/auth/signOut/page.tsx index f42704f888..cba1ddfb4f 100644 --- a/packages/applications/ssr/src/app/auth/signOut/page.tsx +++ b/packages/applications/ssr/src/app/auth/signOut/page.tsx @@ -1,9 +1,10 @@ 'use client'; -import { PageTemplate } from '@/components/templates/PageTemplate'; import { signOut } from 'next-auth/react'; import { useEffect } from 'react'; +import { PageTemplate } from '@/components/templates/PageTemplate'; + export default function SignIn() { useEffect(() => { const autoSignout = async () => { diff --git a/packages/applications/ssr/src/app/documents/[documentKey]/route.ts b/packages/applications/ssr/src/app/documents/[documentKey]/route.ts index cf78b1d3d8..415a44a8e6 100644 --- a/packages/applications/ssr/src/app/documents/[documentKey]/route.ts +++ b/packages/applications/ssr/src/app/documents/[documentKey]/route.ts @@ -1,5 +1,5 @@ -import { mediator } from 'mediateur'; import { ConsulterDocumentProjetQuery } from '@potentiel-domain/document'; +import { mediator } from 'mediateur'; type DocumentKeyParameter = { params: { diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx index ac09e2750e..c8fa90713c 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx @@ -1,19 +1,18 @@ -import { mediator } from 'mediateur'; -import { Metadata } from 'next'; -import { redirect } from 'next/navigation'; - -import { NotFoundError } from '@potentiel-domain/core'; +import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre'; import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature'; +import { NotFoundError } from '@potentiel-domain/core'; import { CahierDesCharges } from '@potentiel-domain/laureat'; -import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre'; import { Routes } from '@potentiel-libraries/routes'; +import { mediator } from 'mediateur'; +import { Metadata } from 'next'; +import { redirect } from 'next/navigation'; -import { IdentifiantParameter } from '@/utils/identifiantParameter'; import { DemanderAbandonPage, DemanderAbandonPageProps, } from '@/components/pages/abandon/demander/DemanderAbandonPage'; import { decodeParameter } from '@/utils/decodeParameter'; +import { IdentifiantParameter } from '@/utils/identifiantParameter'; import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; export const metadata: Metadata = { diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts index 060b2810d3..3adbb42a91 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts @@ -1,7 +1,8 @@ +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; -import { IdentifiantParameter } from '@/utils/identifiantParameter'; + import { decodeParameter } from '@/utils/decodeParameter'; -import { Abandon } from '@potentiel-domain/laureat'; +import { IdentifiantParameter } from '@/utils/identifiantParameter'; import { withUtilisateur } from '@/utils/withUtilisateur'; export const GET = async (_: Request, { params: { identifiant } }: IdentifiantParameter) => diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx index 6cda096798..64b116b38c 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx @@ -1,16 +1,15 @@ -import { mediator } from 'mediateur'; -import type { Metadata } from 'next'; - -import { Abandon } from '@potentiel-domain/laureat'; import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature'; +import { Abandon } from '@potentiel-domain/laureat'; import { Utilisateur } from '@potentiel-domain/utilisateur'; +import { mediator } from 'mediateur'; +import type { Metadata } from 'next'; import { DetailAbandonPage, DetailAbandonPageProps, } from '@/components/pages/abandon/détails/DetailAbandonPage'; -import { IdentifiantParameter } from '@/utils/identifiantParameter'; import { decodeParameter } from '@/utils/decodeParameter'; +import { IdentifiantParameter } from '@/utils/identifiantParameter'; import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx index f8ca382237..63756d6ce8 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx @@ -1,13 +1,12 @@ -import { mediator } from 'mediateur'; -import type { Metadata } from 'next'; -import { redirect } from 'next/navigation'; - import { ConsulterCandidatureQuery, ListerCandidaturesEligiblesPreuveRecanditureQuery, } from '@potentiel-domain/candidature'; import { Abandon } from '@potentiel-domain/laureat'; import { Routes } from '@potentiel-libraries/routes'; +import { mediator } from 'mediateur'; +import type { Metadata } from 'next'; +import { redirect } from 'next/navigation'; import { TransmettrePreuveRecandidaturePage, diff --git a/packages/applications/ssr/src/app/layout.tsx b/packages/applications/ssr/src/app/layout.tsx index 975a2d9bf8..ffd1b938ad 100644 --- a/packages/applications/ssr/src/app/layout.tsx +++ b/packages/applications/ssr/src/app/layout.tsx @@ -1,15 +1,18 @@ import './global.css'; + import { DsfrHead } from '@codegouvfr/react-dsfr/next-appdir/DsfrHead'; import { getHtmlAttributes } from '@codegouvfr/react-dsfr/next-appdir/getHtmlAttributes'; -import { StartDsfr } from './StartDsfr'; -import { defaultColorScheme } from './defaultColorScheme'; -import Link from 'next/link'; -import Providers from './Providers'; -import { Header } from '@/components/organisms/Header'; -import { Footer } from '@/components/organisms/Footer'; import { SkipLinks } from '@codegouvfr/react-dsfr/SkipLinks'; import { Metadata } from 'next'; +import Link from 'next/link'; + +import { Footer } from '@/components/organisms/Footer'; +import { Header } from '@/components/organisms/Header'; + import { BootstrapApp } from './BootstrapApp'; +import { defaultColorScheme } from './defaultColorScheme'; +import Providers from './Providers'; +import { StartDsfr } from './StartDsfr'; export const metadata: Metadata = { title: 'Potentiel', diff --git a/packages/applications/ssr/src/app/newApp/newApp.action.ts b/packages/applications/ssr/src/app/newApp/newApp.action.ts index f96a067b0e..9a9704636c 100644 --- a/packages/applications/ssr/src/app/newApp/newApp.action.ts +++ b/packages/applications/ssr/src/app/newApp/newApp.action.ts @@ -1,8 +1,9 @@ 'use server'; -import * as zod from 'zod'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; import { NotFoundError } from '@potentiel-domain/core'; +import * as zod from 'zod'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; export type NewAppState = FormState; diff --git a/packages/applications/ssr/src/app/newApp/page.tsx b/packages/applications/ssr/src/app/newApp/page.tsx index dc7a224390..72370c8920 100644 --- a/packages/applications/ssr/src/app/newApp/page.tsx +++ b/packages/applications/ssr/src/app/newApp/page.tsx @@ -3,6 +3,7 @@ import { Heading1 } from '@/components/atoms/headings'; import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; import { PageTemplate } from '@/components/templates/PageTemplate'; + import { newAppAction } from './newApp.action'; export default function NewApp() { diff --git a/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx b/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx index c1f08c37ab..fc6c523ae6 100644 --- a/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx +++ b/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx @@ -1,9 +1,10 @@ -import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; -import { ModifierGestionnaireRéseauPage } from '@/components/pages/réseau/gestionnaire/ModifierGestionnaireRéseauPage'; -import { IdentifiantParameter } from '@/utils/identifiantParameter'; -import { mediator } from 'mediateur'; import { GestionnaireRéseau } from '@potentiel-domain/reseau'; +import { mediator } from 'mediateur'; + +import { ModifierGestionnaireRéseauPage } from '@/components/pages/réseau/gestionnaire/ModifierGestionnaireRéseauPage'; import { decodeParameter } from '@/utils/decodeParameter'; +import { IdentifiantParameter } from '@/utils/identifiantParameter'; +import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; export default async function Page({ params: { identifiant } }: IdentifiantParameter) { return PageWithErrorHandling(async () => { diff --git a/packages/applications/ssr/src/app/reseaux/gestionnaires/ajouter/page.tsx b/packages/applications/ssr/src/app/reseaux/gestionnaires/ajouter/page.tsx index 0650941564..7fa1024a62 100644 --- a/packages/applications/ssr/src/app/reseaux/gestionnaires/ajouter/page.tsx +++ b/packages/applications/ssr/src/app/reseaux/gestionnaires/ajouter/page.tsx @@ -1,5 +1,5 @@ -import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; import { AjouterGestionnaireRéseauPage } from '@/components/pages/réseau/gestionnaire/AjouterGestionnaireRéseauPage'; +import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; export default async function Page() { return PageWithErrorHandling(async () => { diff --git a/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx b/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx index e60a35b68f..b543a574f6 100644 --- a/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx +++ b/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx @@ -1,8 +1,8 @@ +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; -import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; import { GestionnaireRéseauListPage } from '@/components/pages/réseau/gestionnaire/GestionnaireRéseauListPage'; +import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; type PageProps = { searchParams?: Record; diff --git a/packages/applications/ssr/src/app/taches/page.tsx b/packages/applications/ssr/src/app/taches/page.tsx index 33b70493c8..5a403ce8e6 100644 --- a/packages/applications/ssr/src/app/taches/page.tsx +++ b/packages/applications/ssr/src/app/taches/page.tsx @@ -1,8 +1,7 @@ -import { mediator } from 'mediateur'; -import type { Metadata } from 'next'; - import { ListerAppelOffreQuery } from '@potentiel-domain/appel-offre'; import { ListerTâcheQuery, ListerTâcheReadModel } from '@potentiel-domain/tache'; +import { mediator } from 'mediateur'; +import type { Metadata } from 'next'; import { TâcheListPage, TâcheListPageProps } from '@/components/pages/tâche/TâcheListPage'; import { displayDate } from '@/utils/displayDate'; diff --git a/packages/applications/ssr/src/components/atoms/LinkAction.tsx b/packages/applications/ssr/src/components/atoms/LinkAction.tsx index 3a4def23ba..766eb3c73f 100644 --- a/packages/applications/ssr/src/components/atoms/LinkAction.tsx +++ b/packages/applications/ssr/src/components/atoms/LinkAction.tsx @@ -1,5 +1,5 @@ -import React, { FC } from 'react'; import Link from 'next/link'; +import React, { FC } from 'react'; type LinkActionProps = { label: string; diff --git a/packages/applications/ssr/src/components/atoms/form/Form.tsx b/packages/applications/ssr/src/components/atoms/form/Form.tsx index 77c6f808c9..cbbb48f11f 100644 --- a/packages/applications/ssr/src/components/atoms/form/Form.tsx +++ b/packages/applications/ssr/src/components/atoms/form/Form.tsx @@ -1,6 +1,6 @@ +import Alert from '@codegouvfr/react-dsfr/Alert'; import { FC, FormHTMLAttributes } from 'react'; import { useFormState } from 'react-dom'; -import Alert from '@codegouvfr/react-dsfr/Alert'; import { formAction } from '@/utils/formAction'; diff --git a/packages/applications/ssr/src/components/molecules/ButtonWithFormInModal.tsx b/packages/applications/ssr/src/components/molecules/ButtonWithFormInModal.tsx index 5b85302c01..c58c35f0e5 100644 --- a/packages/applications/ssr/src/components/molecules/ButtonWithFormInModal.tsx +++ b/packages/applications/ssr/src/components/molecules/ButtonWithFormInModal.tsx @@ -2,8 +2,8 @@ import Button from '@codegouvfr/react-dsfr/Button'; import { createModal } from '@codegouvfr/react-dsfr/Modal'; - import { FC, useState } from 'react'; + import { Form, FormProps } from '../atoms/form/Form'; type ButtonWithFormInModalProps = { diff --git a/packages/applications/ssr/src/components/molecules/StatutBadge.tsx b/packages/applications/ssr/src/components/molecules/StatutBadge.tsx index 28c5269292..86e91149d1 100644 --- a/packages/applications/ssr/src/components/molecules/StatutBadge.tsx +++ b/packages/applications/ssr/src/components/molecules/StatutBadge.tsx @@ -1,5 +1,5 @@ -import { FC } from 'react'; import Badge from '@codegouvfr/react-dsfr/Badge'; +import { FC } from 'react'; export type StatutBadgeProps = { statut: string; diff --git a/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx b/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx index 52d20dd753..92950f01db 100644 --- a/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx +++ b/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx @@ -1,8 +1,9 @@ -import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; import { MainNavigation, MainNavigationProps } from '@codegouvfr/react-dsfr/MainNavigation'; import { Utilisateur } from '@potentiel-domain/utilisateur'; import { Routes } from '@potentiel-libraries/routes'; +import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; + export async function UserBasedRoleNavigation() { let utilisateur: Utilisateur.ValueType | undefined; diff --git a/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx b/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx index b65cbd7d2d..ffe24a691a 100644 --- a/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx +++ b/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx @@ -1,10 +1,11 @@ -import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; import { HeaderQuickAccessItem } from '@codegouvfr/react-dsfr/Header'; import { ConsulterNombreTâchesQuery } from '@potentiel-domain/tache'; -import { Routes } from '@potentiel-libraries/routes'; import { Role, Utilisateur } from '@potentiel-domain/utilisateur'; +import { Routes } from '@potentiel-libraries/routes'; import { mediator } from 'mediateur'; +import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; + export async function UserHeaderQuickAccessItem() { let utilisateur: Utilisateur.ValueType | undefined; diff --git a/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx b/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx index 763fb6f750..b5fe5dcaa3 100644 --- a/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx +++ b/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx @@ -1,10 +1,11 @@ +import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; + import { StatutProjetBadge, StatutProjetBadgeProps, } from '@/components/molecules/projet/StatutProjetBadge'; import { displayDate } from '@/utils/displayDate'; -import { Routes } from '@potentiel-libraries/routes'; export type ProjetBannerProps = { statut: StatutProjetBadgeProps['statut']; diff --git "a/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" "b/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" index bbd1eca739..c5669b8f94 100644 --- "a/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" +++ "b/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" @@ -1,5 +1,5 @@ -import { FC } from 'react'; import { Routes } from '@potentiel-libraries/routes'; +import { FC } from 'react'; type GestionnaireRéseauListItemProps = { identifiantGestionnaireRéseau: string; diff --git "a/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" "b/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" index fbc20434c0..b5df49280e 100644 --- "a/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" +++ "b/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" @@ -1,5 +1,5 @@ -import { FC } from 'react'; import { Routes } from '@potentiel-libraries/routes'; +import { FC } from 'react'; export type TâcheListItemProps = { identifiantProjet: string; diff --git a/packages/applications/ssr/src/components/organisms/Header.tsx b/packages/applications/ssr/src/components/organisms/Header.tsx index 2d8a5d5889..6fa4f09b11 100644 --- a/packages/applications/ssr/src/components/organisms/Header.tsx +++ b/packages/applications/ssr/src/components/organisms/Header.tsx @@ -1,6 +1,7 @@ import DsfrHeader from '@codegouvfr/react-dsfr/Header'; -import { UserHeaderQuickAccessItem } from '../molecules/UserHeaderQuickAccessItem'; + import { UserBasedRoleNavigation } from '../molecules/UserBasedRoleNavigation'; +import { UserHeaderQuickAccessItem } from '../molecules/UserHeaderQuickAccessItem'; export const Header = () => { return ( diff --git a/packages/applications/ssr/src/components/organisms/List.tsx b/packages/applications/ssr/src/components/organisms/List.tsx index 6f50aee738..55e08f4f46 100644 --- a/packages/applications/ssr/src/components/organisms/List.tsx +++ b/packages/applications/ssr/src/components/organisms/List.tsx @@ -1,6 +1,6 @@ 'use client'; -import { FC } from 'react'; import { usePathname, useSearchParams } from 'next/navigation'; +import { FC } from 'react'; import { Pagination } from './Pagination'; import { Tile } from './Tile'; diff --git a/packages/applications/ssr/src/components/organisms/ListFilters.tsx b/packages/applications/ssr/src/components/organisms/ListFilters.tsx index ef5e93355b..0c6b60a116 100644 --- a/packages/applications/ssr/src/components/organisms/ListFilters.tsx +++ b/packages/applications/ssr/src/components/organisms/ListFilters.tsx @@ -1,8 +1,9 @@ 'use client'; -import { usePathname } from 'next/navigation'; import Button from '@codegouvfr/react-dsfr/Button'; -import { Heading2 } from '../atoms/headings'; +import { usePathname } from 'next/navigation'; import { FC, useState } from 'react'; + +import { Heading2 } from '../atoms/headings'; import { Filter } from '../molecules/Filter'; export type ListFiltersProps = { diff --git a/packages/applications/ssr/src/components/organisms/ListHeader.tsx b/packages/applications/ssr/src/components/organisms/ListHeader.tsx index a3058878ae..fba04d1361 100644 --- a/packages/applications/ssr/src/components/organisms/ListHeader.tsx +++ b/packages/applications/ssr/src/components/organisms/ListHeader.tsx @@ -1,7 +1,7 @@ 'use client'; -import { FC } from 'react'; -import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import Tag from '@codegouvfr/react-dsfr/Tag'; +import { usePathname, useRouter, useSearchParams } from 'next/navigation'; +import { FC } from 'react'; export type ListHeaderProps = { tagFilters: Array<{ diff --git a/packages/applications/ssr/src/components/organisms/Pagination.tsx b/packages/applications/ssr/src/components/organisms/Pagination.tsx index 73cbf33034..93a0732e9a 100644 --- a/packages/applications/ssr/src/components/organisms/Pagination.tsx +++ b/packages/applications/ssr/src/components/organisms/Pagination.tsx @@ -1,5 +1,6 @@ import React, { ComponentProps, FC } from 'react'; -import { PreviousPageIcon, NextPageIcon, FirstPageIcon, LastPageIcon } from '../atoms/icons'; + +import { FirstPageIcon, LastPageIcon, NextPageIcon, PreviousPageIcon } from '../atoms/icons'; type PaginationProps = { pageCount: number; diff --git a/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx b/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx index 97bdbc06c1..6d36fea54a 100644 --- a/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx @@ -1,17 +1,19 @@ 'use client'; -import { ProjetPageTemplateProps } from '@/components/templates/ProjetPageTemplate'; -import { FC, useState } from 'react'; -import { Form } from '@/components/atoms/form/Form'; -import { SubmitButton } from '@/components/atoms/form/SubmitButton'; import Alert from '@codegouvfr/react-dsfr/Alert'; -import Input from '@codegouvfr/react-dsfr/Input'; import Checkbox from '@codegouvfr/react-dsfr/Checkbox'; +import Input from '@codegouvfr/react-dsfr/Input'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { demanderAbandonAction } from './demanderAbandon.action'; +import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; +import { FC, useState } from 'react'; + +import { Form } from '@/components/atoms/form/Form'; +import { SubmitButton } from '@/components/atoms/form/SubmitButton'; import { FormForProjetPageTemplate } from '@/components/templates/FormForProjetPageTemplate'; -import { Routes } from '@potentiel-libraries/routes'; +import { ProjetPageTemplateProps } from '@/components/templates/ProjetPageTemplate'; + +import { demanderAbandonAction } from './demanderAbandon.action'; export type DemanderAbandonPageProps = { projet: ProjetPageTemplateProps['projet']; diff --git a/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts b/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts index ad41348b06..fd611ed813 100644 --- a/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts +++ b/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; export type DemanderAbandonState = FormState; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/DetailAbandonPage.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/DetailAbandonPage.tsx" index 10ad9052ce..05ca3aecb5 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/DetailAbandonPage.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/DetailAbandonPage.tsx" @@ -1,18 +1,20 @@ 'use client'; +import Badge from '@codegouvfr/react-dsfr/Badge'; import { FC } from 'react'; + import { StatutBadge, StatutBadgeProps } from '@/components/molecules/StatutBadge'; +import { DetailsAboutProjetPageTemplate } from '@/components/templates/DetailsAboutProjetPageTemplate'; import { ProjetPageTemplateProps } from '@/components/templates/ProjetPageTemplate'; -import { DemanderConfirmationAbandon } from './demanderConfirmation/DemanderConfirmationAbandon'; -import { RejeterAbandon } from './rejeter/RejeterAbandon'; + import { AccorderAbandonAvecRecandidature } from './accorder/AccorderAbandonAvecRecandidature'; import { AccorderAbandonSansRecandidature } from './accorder/AccorderAbandonSansRecandidature'; import { AnnulerAbandon } from './annuler/AnnulerAbandon'; import { ConfirmerAbandon } from './confirmer/ConfirmerAbandon'; -import { DetailsAboutProjetPageTemplate } from '@/components/templates/DetailsAboutProjetPageTemplate'; -import { EtapesAbandonProps, EtapesAbandon } from './EtapesAbandon'; +import { DemanderConfirmationAbandon } from './demanderConfirmation/DemanderConfirmationAbandon'; +import { EtapesAbandon, EtapesAbandonProps } from './EtapesAbandon'; import { StatutPreuveRecandidatureBadge } from './PreuveRecandidatureStatutBadge'; -import Badge from '@codegouvfr/react-dsfr/Badge'; +import { RejeterAbandon } from './rejeter/RejeterAbandon'; type AvailableActions = Array< | 'demander-confirmation' diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" index fffb7959ff..9beac2dd3d 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" @@ -1,20 +1,21 @@ 'use client'; -import { FC } from 'react'; +import Alert from '@codegouvfr/react-dsfr/Alert'; +import Download from '@codegouvfr/react-dsfr/Download'; import Timeline from '@mui/lab/Timeline'; -import TimelineItem from '@mui/lab/TimelineItem'; -import TimelineSeparator from '@mui/lab/TimelineSeparator'; import TimelineConnector from '@mui/lab/TimelineConnector'; import TimelineContent from '@mui/lab/TimelineContent'; import TimelineDot from '@mui/lab/TimelineDot'; +import TimelineItem from '@mui/lab/TimelineItem'; import TimelineOppositeContent, { timelineOppositeContentClasses, } from '@mui/lab/TimelineOppositeContent'; +import TimelineSeparator from '@mui/lab/TimelineSeparator'; +import { Routes } from '@potentiel-libraries/routes'; +import { FC } from 'react'; + import { displayDate } from '@/utils/displayDate'; -import Download from '@codegouvfr/react-dsfr/Download'; -import Alert from '@codegouvfr/react-dsfr/Alert'; -import { Routes } from '@potentiel-libraries/routes'; import { StatutPreuveRecandidatureBadgeProps } from './PreuveRecandidatureStatutBadge'; export type EtapesAbandonProps = { diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" index d691ed34c8..41e3febd9f 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" @@ -1,6 +1,6 @@ -import { FC } from 'react'; import Badge from '@codegouvfr/react-dsfr/Badge'; import { Abandon } from '@potentiel-domain/laureat'; +import { FC } from 'react'; export type StatutPreuveRecandidatureBadgeProps = { statut: Abandon.StatutPreuveRecandidature.RawType; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" index 3edf01895c..0d1b1c4ab0 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" @@ -1,9 +1,11 @@ 'use client'; -import { accorderAbandonAvecRecandidatureAction } from './accorderAbandonAvecRecandidature.action'; +import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; -import { Routes } from '@potentiel-libraries/routes'; + +import { accorderAbandonAvecRecandidatureAction } from './accorderAbandonAvecRecandidature.action'; type AccorderAbandonAvecRecandidatureFormProps = { identifiantProjet: string; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" index ba716b9463..165d5c751e 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" @@ -2,12 +2,13 @@ import { Download } from '@codegouvfr/react-dsfr/Download'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { accorderAbandonSansRecandidatureAction } from './accorderAbandonSansRecandidature.action'; +import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; - import { useState } from 'react'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; -import { Routes } from '@potentiel-libraries/routes'; + +import { accorderAbandonSansRecandidatureAction } from './accorderAbandonSansRecandidature.action'; type AccorderAbandonSansRecandidatureFormProps = { identifiantProjet: string; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" index b9192e1698..88c23555ae 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" @@ -1,13 +1,14 @@ 'use server'; -import { mediator } from 'mediateur'; -import * as zod from 'zod'; import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature'; +import { Abandon } from '@potentiel-domain/laureat'; import { ConsulterUtilisateurQuery } from '@potentiel-domain/utilisateur'; import { buildDocument, DonnéesDocument } from '@potentiel-infrastructure/document-builder'; +import { mediator } from 'mediateur'; +import * as zod from 'zod'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; const schema = zod.object({ diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" index df3a00e86e..2fe2cece48 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; const schema = zod.object({ diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/AnnulerAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/AnnulerAbandon.tsx" index 7138a7f344..e4951bdc75 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/AnnulerAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/AnnulerAbandon.tsx" @@ -1,9 +1,11 @@ 'use client'; -import { annulerAbandonAction } from './annulerAbandon.action'; import { useRouter } from 'next/navigation'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; +import { annulerAbandonAction } from './annulerAbandon.action'; + type AnnulerAbandonFormProps = { identifiantProjet: string; }; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" index e9e9766d27..f6802498c5 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; const schema = zod.object({ diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" index 06154a5a7a..bcb40c7b59 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" @@ -1,10 +1,12 @@ 'use client'; -import { confirmerAbandonAction } from './confirmerAbandon.action'; -import { useRouter } from 'next/navigation'; import { Routes } from '@potentiel-libraries/routes'; +import { useRouter } from 'next/navigation'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; +import { confirmerAbandonAction } from './confirmerAbandon.action'; + type ConfirmerAbandonFormProps = { identifiantProjet: string; }; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" index 2e752d7829..cb767c2bae 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; const schema = zod.object({ diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" index 4f8436467d..792bbc23c9 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" @@ -1,14 +1,15 @@ 'use client'; +import Download from '@codegouvfr/react-dsfr/Download'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { demanderConfirmationAbandonAction } from './demanderConfirmation.action'; -import { useRouter } from 'next/navigation'; import { Routes } from '@potentiel-libraries/routes'; -import Download from '@codegouvfr/react-dsfr/Download'; - +import { useRouter } from 'next/navigation'; import { useState } from 'react'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; +import { demanderConfirmationAbandonAction } from './demanderConfirmation.action'; + type DemanderConfirmationAbandonFormProps = { identifiantProjet: string; }; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" index bca762bba2..656c666857 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; const schema = zod.object({ diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" index 6417ea783f..dcb4b9e261 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" @@ -1,12 +1,14 @@ 'use client'; +import Download from '@codegouvfr/react-dsfr/Download'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { rejeterAbandonAction } from './rejeterAbandon.action'; +import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; -import Download from '@codegouvfr/react-dsfr/Download'; import { useState } from 'react'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; -import { Routes } from '@potentiel-libraries/routes'; + +import { rejeterAbandonAction } from './rejeterAbandon.action'; type RejeterAbandonFormProps = { identifiantProjet: string; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" index be47f86df1..d061c2809c 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; const schema = zod.object({ diff --git a/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx b/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx index 8d51ed1bc2..4cedfc7e82 100644 --- a/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx @@ -1,11 +1,10 @@ -import { FC } from 'react'; import Badge from '@codegouvfr/react-dsfr/Badge'; import { Abandon } from '@potentiel-domain/laureat'; -import { StatutBadge } from '../../../molecules/StatutBadge'; import { Routes } from '@potentiel-libraries/routes'; -import { - StatutPreuveRecandidatureBadge, -} from '../détails/PreuveRecandidatureStatutBadge'; +import { FC } from 'react'; + +import { StatutBadge } from '../../../molecules/StatutBadge'; +import { StatutPreuveRecandidatureBadge } from '../détails/PreuveRecandidatureStatutBadge'; export type AbandonListItemProps = { identifiantProjet: string; diff --git a/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListPage.tsx b/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListPage.tsx index d9cb1cb0d7..7df339f09e 100644 --- a/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListPage.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListPage.tsx @@ -1,7 +1,7 @@ 'use client'; -import { FC } from 'react'; import { useSearchParams } from 'next/navigation'; +import { FC } from 'react'; import { AbandonListItem, diff --git a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx index 679998db92..b1fa42e8da 100644 --- a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx @@ -1,15 +1,15 @@ 'use client'; -import { useState } from 'react'; - import SelectNext from '@codegouvfr/react-dsfr/SelectNext'; - -import { transmettrePreuveRecandidatureAction } from './transmettrePreuveRecandidature.action'; -import { useRouter } from 'next/navigation'; import { Routes } from '@potentiel-libraries/routes'; +import { useRouter } from 'next/navigation'; +import { useState } from 'react'; + import { Form } from '@/components/atoms/form/Form'; import { SubmitButton } from '@/components/atoms/form/SubmitButton'; +import { transmettrePreuveRecandidatureAction } from './transmettrePreuveRecandidature.action'; + type ProjetÀSélectionner = { identifiantProjet: string; dateDésignation: string; diff --git a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidaturePage.tsx b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidaturePage.tsx index ed1ccb7f38..7779286b96 100644 --- a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidaturePage.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidaturePage.tsx @@ -1,14 +1,16 @@ 'use client'; -import { - TransmettrePreuveRecandidatureForm, - TransmettrePreuveRecandidatureFormProps, -} from './TransmettrePreuveRecandidatureForm'; +import { FC } from 'react'; + import { ProjetPageTemplate, ProjetPageTemplateProps, } from '@/components/templates/ProjetPageTemplate'; -import { FC } from 'react'; + +import { + TransmettrePreuveRecandidatureForm, + TransmettrePreuveRecandidatureFormProps, +} from './TransmettrePreuveRecandidatureForm'; export type TransmettrePreuveRecandidaturePageProps = { projet: ProjetPageTemplateProps['projet']; diff --git a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts index 4091d35fd2..2758c2e090 100644 --- a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts +++ b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts @@ -1,9 +1,10 @@ 'use server'; +import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { Abandon } from '@potentiel-domain/laureat'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; export type TransmettrePreuveRecandidatureState = FormState; diff --git a/packages/applications/ssr/src/components/pages/custom-error/CustomErrorPage.tsx b/packages/applications/ssr/src/components/pages/custom-error/CustomErrorPage.tsx index 5677d370ba..e172332000 100644 --- a/packages/applications/ssr/src/components/pages/custom-error/CustomErrorPage.tsx +++ b/packages/applications/ssr/src/components/pages/custom-error/CustomErrorPage.tsx @@ -1,5 +1,6 @@ -import { FC } from 'react'; import Image from 'next/image'; +import { FC } from 'react'; + import { Heading1 } from '@/components/atoms/headings'; type ErrorType = diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/AjouterGestionnaireR\303\251seauPage.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/AjouterGestionnaireR\303\251seauPage.tsx" index 151febb0db..0c38799883 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/AjouterGestionnaireR\303\251seauPage.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/AjouterGestionnaireR\303\251seauPage.tsx" @@ -1,9 +1,11 @@ 'use client'; import { FC } from 'react'; + +import { Heading1 } from '@/components/atoms/headings'; import { PageTemplate } from '@/components/templates/PageTemplate'; + import { AjouterGestionnaireRéseauForm } from './ajouter/AjouterGestionnaireRéseauForm'; -import { Heading1 } from '@/components/atoms/headings'; export const AjouterGestionnaireRéseauPage: FC = () => { return ( diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" index 38722b34d7..6d623b0295 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" @@ -1,9 +1,10 @@ 'use client'; +import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; + import { GestionnaireRéseauListItem } from '@/components/molecules/réseau/gestionnaireRéseau/GestionnaireRéseauListItem'; import { ListPageTemplate } from '@/components/templates/ListPageTemplate'; -import { Routes } from '@potentiel-libraries/routes'; type GestionnaireRéseauListPageProps = { list: { diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ModifierGestionnaireR\303\251seauPage.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ModifierGestionnaireR\303\251seauPage.tsx" index eadda2cfa1..cce4d8d4c3 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ModifierGestionnaireR\303\251seauPage.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ModifierGestionnaireR\303\251seauPage.tsx" @@ -1,8 +1,10 @@ 'use client'; import { FC } from 'react'; -import { PageTemplate } from '@/components/templates/PageTemplate'; + import { Heading1 } from '@/components/atoms/headings'; +import { PageTemplate } from '@/components/templates/PageTemplate'; + import { ModifierGestionnaireRéseauForm } from './modifier/ModifierGestionnaireRéseauForm'; type ModifierGestionnaireRéseauProps = { diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" index 322a360fa6..05e326b407 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" @@ -1,12 +1,14 @@ 'use client'; -import { useRouter } from 'next/navigation'; -import { ajouterGestionnaireRéseauAction } from './ajouterGestionnaireRéseau.action'; import Input from '@codegouvfr/react-dsfr/Input'; +import { Routes } from '@potentiel-libraries/routes'; +import { useRouter } from 'next/navigation'; import { useState } from 'react'; -import { SubmitButton } from '@/components/atoms/form/SubmitButton'; + import { Form } from '@/components/atoms/form/Form'; -import { Routes } from '@potentiel-libraries/routes'; +import { SubmitButton } from '@/components/atoms/form/SubmitButton'; + +import { ajouterGestionnaireRéseauAction } from './ajouterGestionnaireRéseau.action'; export const AjouterGestionnaireRéseauForm = () => { const router = useRouter(); diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" index d0fe104a41..af006422af 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; export type AjouterGestionnaireRéseauState = FormState; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" index 5b26ca4751..23fa80a088 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" @@ -1,12 +1,14 @@ 'use client'; -import { useRouter } from 'next/navigation'; -import { modifierGestionnaireRéseauAction } from './modifierGestionnaireRéseau.action'; import Input from '@codegouvfr/react-dsfr/Input'; -import { Form } from '@/components/atoms/form/Form'; +import { Routes } from '@potentiel-libraries/routes'; +import { useRouter } from 'next/navigation'; import { useState } from 'react'; + +import { Form } from '@/components/atoms/form/Form'; import { SubmitButton } from '@/components/atoms/form/SubmitButton'; -import { Routes } from '@potentiel-libraries/routes'; + +import { modifierGestionnaireRéseauAction } from './modifierGestionnaireRéseau.action'; export type ModifierGestionnaireRéseauFormProps = { identifiantGestionnaireRéseau: string; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" index 363166ecd3..68f9877269 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" @@ -1,9 +1,10 @@ 'use server'; +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; import * as zod from 'zod'; -import { FormAction, FormState, formAction } from '@/utils/formAction'; -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; + +import { FormAction, formAction, FormState } from '@/utils/formAction'; export type ModifierGestionnaireRéseauState = FormState; diff --git "a/packages/applications/ssr/src/components/pages/t\303\242che/T\303\242cheListPage.tsx" "b/packages/applications/ssr/src/components/pages/t\303\242che/T\303\242cheListPage.tsx" index 120bd3856b..4d958ee72d 100644 --- "a/packages/applications/ssr/src/components/pages/t\303\242che/T\303\242cheListPage.tsx" +++ "b/packages/applications/ssr/src/components/pages/t\303\242che/T\303\242cheListPage.tsx" @@ -1,10 +1,10 @@ 'use client'; -import { FC } from 'react'; import { useSearchParams } from 'next/navigation'; +import { FC } from 'react'; -import { ListPageTemplate, ListPageTemplateProps } from '@/components/templates/ListPageTemplate'; import { TâcheListItem, TâcheListItemProps } from '@/components/molecules/tâche/TâcheListItem'; +import { ListPageTemplate, ListPageTemplateProps } from '@/components/templates/ListPageTemplate'; export type TâcheListPageProps = { list: { diff --git a/packages/applications/ssr/src/components/templates/DetailsAboutProjetPageTemplate.tsx b/packages/applications/ssr/src/components/templates/DetailsAboutProjetPageTemplate.tsx index f4bacfb83f..55a59f27c4 100644 --- a/packages/applications/ssr/src/components/templates/DetailsAboutProjetPageTemplate.tsx +++ b/packages/applications/ssr/src/components/templates/DetailsAboutProjetPageTemplate.tsx @@ -1,4 +1,5 @@ import { FC } from 'react'; + import { ProjetPageTemplate, ProjetPageTemplateProps } from './ProjetPageTemplate'; type DetailsAboutProjetPageTemplateProps = { diff --git a/packages/applications/ssr/src/components/templates/FormForProjetPageTemplate.tsx b/packages/applications/ssr/src/components/templates/FormForProjetPageTemplate.tsx index 3faf7c173d..34ee569d02 100644 --- a/packages/applications/ssr/src/components/templates/FormForProjetPageTemplate.tsx +++ b/packages/applications/ssr/src/components/templates/FormForProjetPageTemplate.tsx @@ -1,6 +1,7 @@ +import Alert from '@codegouvfr/react-dsfr/Alert'; import { FC } from 'react'; + import { ProjetPageTemplate, ProjetPageTemplateProps } from './ProjetPageTemplate'; -import Alert from '@codegouvfr/react-dsfr/Alert'; type FormForProjetPageTemplateProps = { projet: ProjetPageTemplateProps['projet']; diff --git a/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx b/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx index 9a80eb8887..3e1573b727 100644 --- a/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx +++ b/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx @@ -1,14 +1,14 @@ 'use client'; +import { useSearchParams } from 'next/navigation'; import { FC } from 'react'; -import { PageTemplate } from './PageTemplate'; -import { ListHeader, ListHeaderProps } from '../organisms/ListHeader'; -import { List } from '../organisms/List'; -import { ListFilters, ListFiltersProps } from '../organisms/ListFilters'; -import { useSearchParams } from 'next/navigation'; import { Heading1 } from '../atoms/headings'; import { LinkAction } from '../atoms/LinkAction'; +import { List } from '../organisms/List'; +import { ListFilters, ListFiltersProps } from '../organisms/ListFilters'; +import { ListHeader, ListHeaderProps } from '../organisms/ListHeader'; +import { PageTemplate } from './PageTemplate'; export type ListPageTemplateProps = { heading: string; diff --git a/packages/applications/ssr/src/components/templates/ProjetPageTemplate.tsx b/packages/applications/ssr/src/components/templates/ProjetPageTemplate.tsx index f426ee3539..b573ab5c95 100644 --- a/packages/applications/ssr/src/components/templates/ProjetPageTemplate.tsx +++ b/packages/applications/ssr/src/components/templates/ProjetPageTemplate.tsx @@ -1,5 +1,6 @@ import { ProjetBanner, ProjetBannerProps } from '@/components/molecules/projet/ProjetBanner'; import { PageTemplate } from '@/components/templates/PageTemplate'; + import { Heading1 } from '../atoms/headings'; export type ProjetPageTemplateProps = { diff --git a/packages/applications/ssr/src/utils/PageWithErrorHandling.tsx b/packages/applications/ssr/src/utils/PageWithErrorHandling.tsx index 9d99a82171..3a4e0b6db6 100644 --- a/packages/applications/ssr/src/utils/PageWithErrorHandling.tsx +++ b/packages/applications/ssr/src/utils/PageWithErrorHandling.tsx @@ -8,6 +8,7 @@ import { } from '@potentiel-domain/core'; import { CustomErrorPage } from '@/components/pages/custom-error/CustomErrorPage'; + import { withErrorHandling } from './withErrorHandling'; export const PageWithErrorHandling = async ( diff --git a/packages/applications/ssr/src/utils/apiAction.ts b/packages/applications/ssr/src/utils/apiAction.ts index 1edaf461c9..30837f0c90 100644 --- a/packages/applications/ssr/src/utils/apiAction.ts +++ b/packages/applications/ssr/src/utils/apiAction.ts @@ -4,6 +4,7 @@ import { NotFoundError, OperationRejectedError, } from '@potentiel-domain/core'; + import { withErrorHandling } from './withErrorHandling'; export const apiAction = async (action: () => Promise) => diff --git a/packages/applications/ssr/src/utils/formAction.ts b/packages/applications/ssr/src/utils/formAction.ts index c1eca90357..f385b5ffb1 100644 --- a/packages/applications/ssr/src/utils/formAction.ts +++ b/packages/applications/ssr/src/utils/formAction.ts @@ -1,5 +1,5 @@ -import { DomainError } from '@potentiel-domain/core'; import { getLogger } from '@potentiel/monitoring'; +import { DomainError } from '@potentiel-domain/core'; import * as zod from 'zod'; export type FormState = { diff --git a/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts b/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts index 9da4087f18..250235b986 100644 --- a/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts +++ b/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts @@ -1,7 +1,7 @@ import { Utilisateur } from '@potentiel-domain/utilisateur'; import { Message, MessageHandler } from 'mediateur'; -import { decode } from 'next-auth/jwt'; import { cookies } from 'next/headers'; +import { decode } from 'next-auth/jwt'; export type GetAuthenticatedUserMessage = Message< 'GET_AUTHENTICATED_USER', diff --git a/packages/applications/ssr/src/utils/withErrorHandling.ts b/packages/applications/ssr/src/utils/withErrorHandling.ts index 4d4fd944b6..5bbbdb8b2b 100644 --- a/packages/applications/ssr/src/utils/withErrorHandling.ts +++ b/packages/applications/ssr/src/utils/withErrorHandling.ts @@ -1,9 +1,9 @@ -import { redirect } from 'next/navigation'; -import { isRedirectError } from 'next/dist/client/components/redirect'; +import { getLogger } from '@potentiel/monitoring'; +import { DomainError } from '@potentiel-domain/core'; import { isNotFoundError } from 'next/dist/client/components/not-found'; +import { isRedirectError } from 'next/dist/client/components/redirect'; +import { redirect } from 'next/navigation'; -import { DomainError } from '@potentiel-domain/core'; -import { getLogger } from '@potentiel/monitoring'; import { NoAuthenticatedUserError } from './getAuthenticatedUser.handler'; export async function withErrorHandling( diff --git a/packages/applications/ssr/src/utils/withUtilisateur.ts b/packages/applications/ssr/src/utils/withUtilisateur.ts index 9cefab2880..4e5535268c 100644 --- a/packages/applications/ssr/src/utils/withUtilisateur.ts +++ b/packages/applications/ssr/src/utils/withUtilisateur.ts @@ -1,6 +1,7 @@ -import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; import { Utilisateur } from '@potentiel-domain/utilisateur'; +import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; + export async function withUtilisateur( action: (Utilisateur: Utilisateur.ValueType) => Promise, ): Promise { From 8edd463821a7b2e5adb0673293cce4651de70c6a Mon Sep 17 00:00:00 2001 From: HubM Date: Thu, 18 Jan 2024 16:18:47 +0100 Subject: [PATCH 3/6] =?UTF-8?q?=E2=9E=95=20missing=20eslint-plugin-simple-?= =?UTF-8?q?import-sort=20in=20package=20lock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package-lock.json b/package-lock.json index 29b7e5b0c5..875fe34101 100644 --- a/package-lock.json +++ b/package-lock.json @@ -142,6 +142,7 @@ "eslint-config-prettier": "^8.10.0", "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-import": "^2.28.1", + "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-storybook": "^0.6.14", "eslint-plugin-unused-imports": "^2.0.0", "glob": "^8.1.0", @@ -15902,6 +15903,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", + "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", + "dev": true, + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, "node_modules/eslint-plugin-storybook": { "version": "0.6.14", "dev": true, From 4eb526576781e51f8ad35b0fbb27f10af99bb694 Mon Sep 17 00:00:00 2001 From: HubM Date: Fri, 19 Jan 2024 11:14:35 +0100 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=8E=A8=20suppression=20de=20la=20d?= =?UTF-8?q?=C3=A9pendance=20eslint-plugin-simple-import-sort=20et=20utilis?= =?UTF-8?q?ation=20de=20la=20r=C3=A8gle=20import/order=20=C3=A0=20la=20pla?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 99 ++++++++++++++---------- package.json | 5 +- packages/applications/ssr/.eslintrc.json | 27 ++++++- 3 files changed, 83 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 875fe34101..65ee462a2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -141,8 +141,7 @@ "eslint": "^8.48.0", "eslint-config-prettier": "^8.10.0", "eslint-import-resolver-typescript": "^3.6.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-simple-import-sort": "^10.0.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-storybook": "^0.6.14", "eslint-plugin-unused-imports": "^2.0.0", "glob": "^8.1.0", @@ -11287,8 +11286,9 @@ }, "node_modules/@types/json5": { "version": "0.0.29", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true }, "node_modules/@types/lodash": { "version": "4.14.197", @@ -12320,13 +12320,14 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.1", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -12337,13 +12338,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -15754,27 +15756,28 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.28.1", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, - "license": "MIT", "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.findlastindex": "^1.2.2", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", + "eslint-import-resolver-node": "^0.3.9", "eslint-module-utils": "^2.8.0", - "has": "^1.0.3", - "is-core-module": "^2.13.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.6", - "object.groupby": "^1.0.0", - "object.values": "^1.1.6", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" + "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" @@ -15903,15 +15906,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/eslint-plugin-simple-import-sort": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", - "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", - "dev": true, - "peerDependencies": { - "eslint": ">=5.0.0" - } - }, "node_modules/eslint-plugin-storybook": { "version": "0.6.14", "dev": true, @@ -17080,8 +17074,12 @@ "license": "ISC" }, "node_modules/function-bind": { - "version": "1.1.1", - "license": "MIT" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.6", @@ -17557,6 +17555,17 @@ "minimalistic-assert": "^1.0.1" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "dev": true, @@ -18181,10 +18190,11 @@ } }, "node_modules/is-core-module": { - "version": "2.13.0", - "license": "MIT", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -26363,9 +26373,10 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.14.2", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, - "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -26375,8 +26386,9 @@ }, "node_modules/tsconfig-paths/node_modules/json5": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, - "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -26386,8 +26398,9 @@ }, "node_modules/tsconfig-paths/node_modules/strip-bom": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } diff --git a/package.json b/package.json index 01ba551441..0a7767d3db 100644 --- a/package.json +++ b/package.json @@ -174,8 +174,7 @@ "eslint": "^8.48.0", "eslint-config-prettier": "^8.10.0", "eslint-import-resolver-typescript": "^3.6.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-simple-import-sort": "^10.0.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-storybook": "^0.6.14", "eslint-plugin-unused-imports": "^2.0.0", "glob": "^8.1.0", @@ -203,4 +202,4 @@ "engines": { "node": "^18.0.0" } -} \ No newline at end of file +} diff --git a/packages/applications/ssr/.eslintrc.json b/packages/applications/ssr/.eslintrc.json index 5ac2476bd8..1fc1256a16 100644 --- a/packages/applications/ssr/.eslintrc.json +++ b/packages/applications/ssr/.eslintrc.json @@ -1,9 +1,32 @@ { "extends": "next/core-web-vitals", - "plugins": ["simple-import-sort"], "rules": { "import/no-unassigned-import": "off", "react/no-unescaped-entities": "off", - "simple-import-sort/imports": "error" + "import/order": [ + "error", { + "newlines-between": "always", + "pathGroupsExcludedImportTypes": ["builtin"], + "groups": [ + "builtin", + "external", + "internal", + "parent", + "index" + ], + "pathGroups": [ + { + "pattern": "@potentiel-*/**", + "group": "internal", + "position": "before" + }, + { + "pattern": "@/**", + "group": "parent", + "position": "before" + } + ] + } + ] } } \ No newline at end of file From 95704f7d1d0121de5683924623bf185e2747c3e0 Mon Sep 17 00:00:00 2001 From: HubM Date: Fri, 19 Jan 2024 11:21:37 +0100 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=8E=A8=20fix=20all=20files=20+=20disa?= =?UTF-8?q?ble=20vscode=20repo=20rule=20eslint=20fix=20on=20save?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 --- packages/applications/ssr/package.json | 1 + packages/applications/ssr/src/app/abandons/page.tsx | 5 +++-- packages/applications/ssr/src/app/api/v1/taches/route.ts | 3 ++- .../ssr/src/app/documents/[documentKey]/route.ts | 3 ++- .../app/laureats/[identifiant]/abandon/demander/page.tsx | 7 ++++--- .../laureats/[identifiant]/abandon/modele-reponse/route.ts | 3 ++- .../ssr/src/app/laureats/[identifiant]/abandon/page.tsx | 5 +++-- .../abandon/transmettre-preuve-recandidature/page.tsx | 7 ++++--- packages/applications/ssr/src/app/newApp/newApp.action.ts | 3 ++- .../src/app/reseaux/gestionnaires/[identifiant]/page.tsx | 3 ++- .../ssr/src/app/reseaux/gestionnaires/page.tsx | 3 ++- packages/applications/ssr/src/app/taches/page.tsx | 5 +++-- .../src/components/molecules/UserBasedRoleNavigation.tsx | 1 + .../src/components/molecules/UserHeaderQuickAccessItem.tsx | 3 ++- .../ssr/src/components/molecules/projet/ProjetBanner.tsx | 3 ++- .../GestionnaireR\303\251seauListItem.tsx" | 3 ++- .../molecules/t\303\242che/T\303\242cheListItem.tsx" | 3 ++- ...T\303\242cheTransmettrePreuveRecandidatureListItem.tsx" | 3 ++- .../pages/abandon/demander/DemanderAbandonPage.tsx | 3 ++- .../pages/abandon/demander/demanderAbandon.action.ts | 3 ++- .../pages/abandon/d\303\251tails/EtapesAbandon.tsx" | 3 ++- .../d\303\251tails/PreuveRecandidatureStatutBadge.tsx" | 3 ++- .../accorder/AccorderAbandonAvecRecandidature.tsx" | 3 ++- .../accorder/AccorderAbandonSansRecandidature.tsx" | 3 ++- .../accorder/accorderAbandonAvecRecandidature.action.ts" | 5 +++-- .../accorder/accorderAbandonSansRecandidature.action.ts" | 3 ++- .../d\303\251tails/annuler/annulerAbandon.action.ts" | 3 ++- .../abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" | 3 ++- .../d\303\251tails/confirmer/confirmerAbandon.action.ts" | 3 ++- .../demanderConfirmation/DemanderConfirmationAbandon.tsx" | 3 ++- .../demanderConfirmation/demanderConfirmation.action.ts" | 3 ++- .../abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" | 3 ++- .../d\303\251tails/rejeter/rejeterAbandon.action.ts" | 3 ++- .../components/pages/abandon/lister/AbandonListItem.tsx | 3 ++- .../TransmettrePreuveRecandidatureForm.tsx | 5 +++-- .../transmettrePreuveRecandidature.action.ts | 3 ++- .../gestionnaire/GestionnaireR\303\251seauListPage.tsx" | 3 ++- .../ajouter/AjouterGestionnaireR\303\251seauForm.tsx" | 3 ++- .../ajouter/ajouterGestionnaireR\303\251seau.action.ts" | 3 ++- .../modifier/ModifierGestionnaireR\303\251seauForm.tsx" | 3 ++- .../modifier/modifierGestionnaireR\303\251seau.action.ts" | 3 ++- .../ssr/src/components/templates/ListPageTemplate.tsx | 1 + packages/applications/ssr/src/utils/formAction.ts | 3 ++- .../ssr/src/utils/getAuthenticatedUser.handler.ts | 3 ++- packages/applications/ssr/src/utils/withErrorHandling.ts | 3 ++- 46 files changed, 96 insertions(+), 54 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4e3d052c8d..b31def938e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,9 +2,6 @@ "workbench.startupEditor": "newUntitledFile", "editor.formatOnSave": true, "editor.formatOnPaste": true, - "editor.codeActionsOnSave": { - "source.fixAll.eslint": true, - }, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, diff --git a/packages/applications/ssr/package.json b/packages/applications/ssr/package.json index 16d1266acf..f0c47a85d6 100644 --- a/packages/applications/ssr/package.json +++ b/packages/applications/ssr/package.json @@ -7,6 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", + "lint:fix": "next lint --fix", "predev": "only-include-used-icons", "prebuild": "only-include-used-icons" }, diff --git a/packages/applications/ssr/src/app/abandons/page.tsx b/packages/applications/ssr/src/app/abandons/page.tsx index cd879af625..c1a692f8a7 100644 --- a/packages/applications/ssr/src/app/abandons/page.tsx +++ b/packages/applications/ssr/src/app/abandons/page.tsx @@ -1,8 +1,9 @@ -import { ListerAppelOffreQuery } from '@potentiel-domain/appel-offre'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import type { Metadata } from 'next'; +import { ListerAppelOffreQuery } from '@potentiel-domain/appel-offre'; +import { Abandon } from '@potentiel-domain/laureat'; + import { AbandonListPage, AbandonListPageProps, diff --git a/packages/applications/ssr/src/app/api/v1/taches/route.ts b/packages/applications/ssr/src/app/api/v1/taches/route.ts index 37e18143a3..8dafd7f7fb 100644 --- a/packages/applications/ssr/src/app/api/v1/taches/route.ts +++ b/packages/applications/ssr/src/app/api/v1/taches/route.ts @@ -1,6 +1,7 @@ -import { ConsulterNombreTâchesQuery } from '@potentiel-domain/tache'; import { mediator } from 'mediateur'; +import { ConsulterNombreTâchesQuery } from '@potentiel-domain/tache'; + import { apiAction } from '@/utils/apiAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git a/packages/applications/ssr/src/app/documents/[documentKey]/route.ts b/packages/applications/ssr/src/app/documents/[documentKey]/route.ts index 415a44a8e6..df238e6799 100644 --- a/packages/applications/ssr/src/app/documents/[documentKey]/route.ts +++ b/packages/applications/ssr/src/app/documents/[documentKey]/route.ts @@ -1,6 +1,7 @@ -import { ConsulterDocumentProjetQuery } from '@potentiel-domain/document'; import { mediator } from 'mediateur'; +import { ConsulterDocumentProjetQuery } from '@potentiel-domain/document'; + type DocumentKeyParameter = { params: { documentKey: string; diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx index c8fa90713c..0b1fd301a7 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx @@ -1,11 +1,12 @@ +import { mediator } from 'mediateur'; +import { Metadata } from 'next'; +import { redirect } from 'next/navigation'; + import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre'; import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature'; import { NotFoundError } from '@potentiel-domain/core'; import { CahierDesCharges } from '@potentiel-domain/laureat'; import { Routes } from '@potentiel-libraries/routes'; -import { mediator } from 'mediateur'; -import { Metadata } from 'next'; -import { redirect } from 'next/navigation'; import { DemanderAbandonPage, diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts index 3adbb42a91..c72ad96ae7 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts @@ -1,6 +1,7 @@ -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; +import { Abandon } from '@potentiel-domain/laureat'; + import { decodeParameter } from '@/utils/decodeParameter'; import { IdentifiantParameter } from '@/utils/identifiantParameter'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx index 64b116b38c..fc3b5a3afc 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx @@ -1,8 +1,9 @@ +import { mediator } from 'mediateur'; +import type { Metadata } from 'next'; + import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature'; import { Abandon } from '@potentiel-domain/laureat'; import { Utilisateur } from '@potentiel-domain/utilisateur'; -import { mediator } from 'mediateur'; -import type { Metadata } from 'next'; import { DetailAbandonPage, diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx index 63756d6ce8..f8ca382237 100644 --- a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx +++ b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/transmettre-preuve-recandidature/page.tsx @@ -1,12 +1,13 @@ +import { mediator } from 'mediateur'; +import type { Metadata } from 'next'; +import { redirect } from 'next/navigation'; + import { ConsulterCandidatureQuery, ListerCandidaturesEligiblesPreuveRecanditureQuery, } from '@potentiel-domain/candidature'; import { Abandon } from '@potentiel-domain/laureat'; import { Routes } from '@potentiel-libraries/routes'; -import { mediator } from 'mediateur'; -import type { Metadata } from 'next'; -import { redirect } from 'next/navigation'; import { TransmettrePreuveRecandidaturePage, diff --git a/packages/applications/ssr/src/app/newApp/newApp.action.ts b/packages/applications/ssr/src/app/newApp/newApp.action.ts index 9a9704636c..d02e0f5b1c 100644 --- a/packages/applications/ssr/src/app/newApp/newApp.action.ts +++ b/packages/applications/ssr/src/app/newApp/newApp.action.ts @@ -1,8 +1,9 @@ 'use server'; -import { NotFoundError } from '@potentiel-domain/core'; import * as zod from 'zod'; +import { NotFoundError } from '@potentiel-domain/core'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; export type NewAppState = FormState; diff --git a/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx b/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx index fc6c523ae6..325b4793bb 100644 --- a/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx +++ b/packages/applications/ssr/src/app/reseaux/gestionnaires/[identifiant]/page.tsx @@ -1,6 +1,7 @@ -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; + import { ModifierGestionnaireRéseauPage } from '@/components/pages/réseau/gestionnaire/ModifierGestionnaireRéseauPage'; import { decodeParameter } from '@/utils/decodeParameter'; import { IdentifiantParameter } from '@/utils/identifiantParameter'; diff --git a/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx b/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx index b543a574f6..addf9b4c98 100644 --- a/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx +++ b/packages/applications/ssr/src/app/reseaux/gestionnaires/page.tsx @@ -1,6 +1,7 @@ -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; + import { GestionnaireRéseauListPage } from '@/components/pages/réseau/gestionnaire/GestionnaireRéseauListPage'; import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling'; diff --git a/packages/applications/ssr/src/app/taches/page.tsx b/packages/applications/ssr/src/app/taches/page.tsx index 5a403ce8e6..33b70493c8 100644 --- a/packages/applications/ssr/src/app/taches/page.tsx +++ b/packages/applications/ssr/src/app/taches/page.tsx @@ -1,8 +1,9 @@ -import { ListerAppelOffreQuery } from '@potentiel-domain/appel-offre'; -import { ListerTâcheQuery, ListerTâcheReadModel } from '@potentiel-domain/tache'; import { mediator } from 'mediateur'; import type { Metadata } from 'next'; +import { ListerAppelOffreQuery } from '@potentiel-domain/appel-offre'; +import { ListerTâcheQuery, ListerTâcheReadModel } from '@potentiel-domain/tache'; + import { TâcheListPage, TâcheListPageProps } from '@/components/pages/tâche/TâcheListPage'; import { displayDate } from '@/utils/displayDate'; import { IdentifiantParameter } from '@/utils/identifiantParameter'; diff --git a/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx b/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx index 92950f01db..cdb4e0f6c5 100644 --- a/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx +++ b/packages/applications/ssr/src/components/molecules/UserBasedRoleNavigation.tsx @@ -1,4 +1,5 @@ import { MainNavigation, MainNavigationProps } from '@codegouvfr/react-dsfr/MainNavigation'; + import { Utilisateur } from '@potentiel-domain/utilisateur'; import { Routes } from '@potentiel-libraries/routes'; diff --git a/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx b/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx index ffe24a691a..3a71618344 100644 --- a/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx +++ b/packages/applications/ssr/src/components/molecules/UserHeaderQuickAccessItem.tsx @@ -1,8 +1,9 @@ import { HeaderQuickAccessItem } from '@codegouvfr/react-dsfr/Header'; +import { mediator } from 'mediateur'; + import { ConsulterNombreTâchesQuery } from '@potentiel-domain/tache'; import { Role, Utilisateur } from '@potentiel-domain/utilisateur'; import { Routes } from '@potentiel-libraries/routes'; -import { mediator } from 'mediateur'; import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler'; diff --git a/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx b/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx index b5fe5dcaa3..a91f48a892 100644 --- a/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx +++ b/packages/applications/ssr/src/components/molecules/projet/ProjetBanner.tsx @@ -1,6 +1,7 @@ -import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { StatutProjetBadge, StatutProjetBadgeProps, diff --git "a/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" "b/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" index c5669b8f94..aedda7e210 100644 --- "a/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" +++ "b/packages/applications/ssr/src/components/molecules/r\303\251seau/gestionnaireR\303\251seau/GestionnaireR\303\251seauListItem.tsx" @@ -1,6 +1,7 @@ -import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + type GestionnaireRéseauListItemProps = { identifiantGestionnaireRéseau: string; raisonSociale: string; diff --git "a/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" "b/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" index b5df49280e..6024bae9d9 100644 --- "a/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" +++ "b/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheListItem.tsx" @@ -1,6 +1,7 @@ -import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + export type TâcheListItemProps = { identifiantProjet: string; nomProjet: string; diff --git "a/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheTransmettrePreuveRecandidatureListItem.tsx" "b/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheTransmettrePreuveRecandidatureListItem.tsx" index 8d7913c2c6..3a633a37ce 100644 --- "a/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheTransmettrePreuveRecandidatureListItem.tsx" +++ "b/packages/applications/ssr/src/components/molecules/t\303\242che/T\303\242cheTransmettrePreuveRecandidatureListItem.tsx" @@ -1,6 +1,7 @@ -import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + type TâcheTransmettrePreuveRecandidatureListItemProps = { identifiantProjet: string; misÀJourLe: string; diff --git a/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx b/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx index 6d36fea54a..f652f915aa 100644 --- a/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/demander/DemanderAbandonPage.tsx @@ -4,10 +4,11 @@ import Alert from '@codegouvfr/react-dsfr/Alert'; import Checkbox from '@codegouvfr/react-dsfr/Checkbox'; import Input from '@codegouvfr/react-dsfr/Input'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { FC, useState } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { Form } from '@/components/atoms/form/Form'; import { SubmitButton } from '@/components/atoms/form/SubmitButton'; import { FormForProjetPageTemplate } from '@/components/templates/FormForProjetPageTemplate'; diff --git a/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts b/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts index fd611ed813..6438b291dc 100644 --- a/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts +++ b/packages/applications/ssr/src/components/pages/abandon/demander/demanderAbandon.action.ts @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" index 9beac2dd3d..1876450e03 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/EtapesAbandon.tsx" @@ -11,9 +11,10 @@ import TimelineOppositeContent, { timelineOppositeContentClasses, } from '@mui/lab/TimelineOppositeContent'; import TimelineSeparator from '@mui/lab/TimelineSeparator'; -import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { displayDate } from '@/utils/displayDate'; import { StatutPreuveRecandidatureBadgeProps } from './PreuveRecandidatureStatutBadge'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" index 41e3febd9f..e88d422826 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/PreuveRecandidatureStatutBadge.tsx" @@ -1,7 +1,8 @@ import Badge from '@codegouvfr/react-dsfr/Badge'; -import { Abandon } from '@potentiel-domain/laureat'; import { FC } from 'react'; +import { Abandon } from '@potentiel-domain/laureat'; + export type StatutPreuveRecandidatureBadgeProps = { statut: Abandon.StatutPreuveRecandidature.RawType; small?: true; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" index 0d1b1c4ab0..457846f341 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonAvecRecandidature.tsx" @@ -1,8 +1,9 @@ 'use client'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; +import { Routes } from '@potentiel-libraries/routes'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; import { accorderAbandonAvecRecandidatureAction } from './accorderAbandonAvecRecandidature.action'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" index 165d5c751e..dec323ebf1 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/AccorderAbandonSansRecandidature.tsx" @@ -2,10 +2,11 @@ import { Download } from '@codegouvfr/react-dsfr/Download'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; import { accorderAbandonSansRecandidatureAction } from './accorderAbandonSansRecandidature.action'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" index 88c23555ae..7b7cb4a85d 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonAvecRecandidature.action.ts" @@ -1,12 +1,13 @@ 'use server'; +import { mediator } from 'mediateur'; +import * as zod from 'zod'; + import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre'; import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature'; import { Abandon } from '@potentiel-domain/laureat'; import { ConsulterUtilisateurQuery } from '@potentiel-domain/utilisateur'; import { buildDocument, DonnéesDocument } from '@potentiel-infrastructure/document-builder'; -import { mediator } from 'mediateur'; -import * as zod from 'zod'; import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" index 2fe2cece48..adf9208b86 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/accorder/accorderAbandonSansRecandidature.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" index f6802498c5..b2b89654da 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/annuler/annulerAbandon.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" index bcb40c7b59..0832451884 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/ConfirmerAbandon.tsx" @@ -1,8 +1,9 @@ 'use client'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; +import { Routes } from '@potentiel-libraries/routes'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; import { confirmerAbandonAction } from './confirmerAbandon.action'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" index cb767c2bae..6631773414 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/confirmer/confirmerAbandon.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" index 792bbc23c9..36cbfffb1e 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/DemanderConfirmationAbandon.tsx" @@ -2,10 +2,11 @@ import Download from '@codegouvfr/react-dsfr/Download'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; import { demanderConfirmationAbandonAction } from './demanderConfirmation.action'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" index 656c666857..3419b2bf31 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/demanderConfirmation/demanderConfirmation.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" index dcb4b9e261..c371bb3582 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/RejeterAbandon.tsx" @@ -2,10 +2,11 @@ import Download from '@codegouvfr/react-dsfr/Download'; import { Upload } from '@codegouvfr/react-dsfr/Upload'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { ButtonWithFormInModal } from '@/components/molecules/ButtonWithFormInModal'; import { rejeterAbandonAction } from './rejeterAbandon.action'; diff --git "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" index d061c2809c..e435ffc786 100644 --- "a/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" +++ "b/packages/applications/ssr/src/components/pages/abandon/d\303\251tails/rejeter/rejeterAbandon.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git a/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx b/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx index 4cedfc7e82..53e31b303c 100644 --- a/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/lister/AbandonListItem.tsx @@ -1,7 +1,8 @@ import Badge from '@codegouvfr/react-dsfr/Badge'; +import { FC } from 'react'; + import { Abandon } from '@potentiel-domain/laureat'; import { Routes } from '@potentiel-libraries/routes'; -import { FC } from 'react'; import { StatutBadge } from '../../../molecules/StatutBadge'; import { StatutPreuveRecandidatureBadge } from '../détails/PreuveRecandidatureStatutBadge'; diff --git a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx index b1fa42e8da..f36d55445d 100644 --- a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx @@ -1,9 +1,10 @@ 'use client'; -import SelectNext from '@codegouvfr/react-dsfr/SelectNext'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; +import SelectNext from '@codegouvfr/react-dsfr/SelectNext'; + +import { Routes } from '@potentiel-libraries/routes'; import { Form } from '@/components/atoms/form/Form'; import { SubmitButton } from '@/components/atoms/form/SubmitButton'; diff --git a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts index 2758c2e090..305eec601c 100644 --- a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts +++ b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/transmettrePreuveRecandidature.action.ts @@ -1,9 +1,10 @@ 'use server'; -import { Abandon } from '@potentiel-domain/laureat'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { Abandon } from '@potentiel-domain/laureat'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; import { withUtilisateur } from '@/utils/withUtilisateur'; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" index 6d623b0295..d9b4d67d56 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/GestionnaireR\303\251seauListPage.tsx" @@ -1,8 +1,9 @@ 'use client'; -import { Routes } from '@potentiel-libraries/routes'; import { FC } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { GestionnaireRéseauListItem } from '@/components/molecules/réseau/gestionnaireRéseau/GestionnaireRéseauListItem'; import { ListPageTemplate } from '@/components/templates/ListPageTemplate'; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" index 05e326b407..7d7a15c812 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/AjouterGestionnaireR\303\251seauForm.tsx" @@ -1,10 +1,11 @@ 'use client'; import Input from '@codegouvfr/react-dsfr/Input'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { Form } from '@/components/atoms/form/Form'; import { SubmitButton } from '@/components/atoms/form/SubmitButton'; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" index af006422af..8987d6eea3 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/ajouter/ajouterGestionnaireR\303\251seau.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; export type AjouterGestionnaireRéseauState = FormState; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" index 23fa80a088..1ad25c9903 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/ModifierGestionnaireR\303\251seauForm.tsx" @@ -1,10 +1,11 @@ 'use client'; import Input from '@codegouvfr/react-dsfr/Input'; -import { Routes } from '@potentiel-libraries/routes'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; +import { Routes } from '@potentiel-libraries/routes'; + import { Form } from '@/components/atoms/form/Form'; import { SubmitButton } from '@/components/atoms/form/SubmitButton'; diff --git "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" index 68f9877269..396c9aa769 100644 --- "a/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" +++ "b/packages/applications/ssr/src/components/pages/r\303\251seau/gestionnaire/modifier/modifierGestionnaireR\303\251seau.action.ts" @@ -1,9 +1,10 @@ 'use server'; -import { GestionnaireRéseau } from '@potentiel-domain/reseau'; import { mediator } from 'mediateur'; import * as zod from 'zod'; +import { GestionnaireRéseau } from '@potentiel-domain/reseau'; + import { FormAction, formAction, FormState } from '@/utils/formAction'; export type ModifierGestionnaireRéseauState = FormState; diff --git a/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx b/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx index 3e1573b727..218e1415c0 100644 --- a/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx +++ b/packages/applications/ssr/src/components/templates/ListPageTemplate.tsx @@ -8,6 +8,7 @@ import { LinkAction } from '../atoms/LinkAction'; import { List } from '../organisms/List'; import { ListFilters, ListFiltersProps } from '../organisms/ListFilters'; import { ListHeader, ListHeaderProps } from '../organisms/ListHeader'; + import { PageTemplate } from './PageTemplate'; export type ListPageTemplateProps = { diff --git a/packages/applications/ssr/src/utils/formAction.ts b/packages/applications/ssr/src/utils/formAction.ts index f385b5ffb1..44cd541cd2 100644 --- a/packages/applications/ssr/src/utils/formAction.ts +++ b/packages/applications/ssr/src/utils/formAction.ts @@ -1,6 +1,7 @@ +import * as zod from 'zod'; import { getLogger } from '@potentiel/monitoring'; + import { DomainError } from '@potentiel-domain/core'; -import * as zod from 'zod'; export type FormState = { success?: true; diff --git a/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts b/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts index 250235b986..e206b61fe7 100644 --- a/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts +++ b/packages/applications/ssr/src/utils/getAuthenticatedUser.handler.ts @@ -1,8 +1,9 @@ -import { Utilisateur } from '@potentiel-domain/utilisateur'; import { Message, MessageHandler } from 'mediateur'; import { cookies } from 'next/headers'; import { decode } from 'next-auth/jwt'; +import { Utilisateur } from '@potentiel-domain/utilisateur'; + export type GetAuthenticatedUserMessage = Message< 'GET_AUTHENTICATED_USER', {}, diff --git a/packages/applications/ssr/src/utils/withErrorHandling.ts b/packages/applications/ssr/src/utils/withErrorHandling.ts index 5bbbdb8b2b..c42efa9676 100644 --- a/packages/applications/ssr/src/utils/withErrorHandling.ts +++ b/packages/applications/ssr/src/utils/withErrorHandling.ts @@ -1,9 +1,10 @@ import { getLogger } from '@potentiel/monitoring'; -import { DomainError } from '@potentiel-domain/core'; import { isNotFoundError } from 'next/dist/client/components/not-found'; import { isRedirectError } from 'next/dist/client/components/redirect'; import { redirect } from 'next/navigation'; +import { DomainError } from '@potentiel-domain/core'; + import { NoAuthenticatedUserError } from './getAuthenticatedUser.handler'; export async function withErrorHandling( From 38c58ba651ae857dd5b641b61c56d465e096c291 Mon Sep 17 00:00:00 2001 From: HubM Date: Fri, 19 Jan 2024 15:14:40 +0100 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=8E=A8=20@potentiel/=20and=20@potenti?= =?UTF-8?q?el-*=20workspace=20imports=20must=20be=20group=20together?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/applications/ssr/.eslintrc.json | 2 +- .../TransmettrePreuveRecandidatureForm.tsx | 2 +- packages/applications/ssr/src/utils/formAction.ts | 2 +- packages/applications/ssr/src/utils/withErrorHandling.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/applications/ssr/.eslintrc.json b/packages/applications/ssr/.eslintrc.json index 1fc1256a16..5639eccffb 100644 --- a/packages/applications/ssr/.eslintrc.json +++ b/packages/applications/ssr/.eslintrc.json @@ -16,7 +16,7 @@ ], "pathGroups": [ { - "pattern": "@potentiel-*/**", + "pattern": "@potentiel*/**", "group": "internal", "position": "before" }, diff --git a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx index f36d55445d..600a3f9cf9 100644 --- a/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx +++ b/packages/applications/ssr/src/components/pages/abandon/transmettrePreuveRecandidature/TransmettrePreuveRecandidatureForm.tsx @@ -1,8 +1,8 @@ 'use client'; +import SelectNext from '@codegouvfr/react-dsfr/SelectNext'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; -import SelectNext from '@codegouvfr/react-dsfr/SelectNext'; import { Routes } from '@potentiel-libraries/routes'; diff --git a/packages/applications/ssr/src/utils/formAction.ts b/packages/applications/ssr/src/utils/formAction.ts index 44cd541cd2..16831aa0e1 100644 --- a/packages/applications/ssr/src/utils/formAction.ts +++ b/packages/applications/ssr/src/utils/formAction.ts @@ -1,6 +1,6 @@ import * as zod from 'zod'; -import { getLogger } from '@potentiel/monitoring'; +import { getLogger } from '@potentiel/monitoring'; import { DomainError } from '@potentiel-domain/core'; export type FormState = { diff --git a/packages/applications/ssr/src/utils/withErrorHandling.ts b/packages/applications/ssr/src/utils/withErrorHandling.ts index c42efa9676..8dd4e480b6 100644 --- a/packages/applications/ssr/src/utils/withErrorHandling.ts +++ b/packages/applications/ssr/src/utils/withErrorHandling.ts @@ -1,8 +1,8 @@ -import { getLogger } from '@potentiel/monitoring'; import { isNotFoundError } from 'next/dist/client/components/not-found'; import { isRedirectError } from 'next/dist/client/components/redirect'; import { redirect } from 'next/navigation'; +import { getLogger } from '@potentiel/monitoring'; import { DomainError } from '@potentiel-domain/core'; import { NoAuthenticatedUserError } from './getAuthenticatedUser.handler';