diff --git a/front/src/app/contents/standard/siteMap.ts b/front/src/app/contents/standard/siteMap.ts index 58b5931114..5681e5b111 100644 --- a/front/src/app/contents/standard/siteMap.ts +++ b/front/src/app/contents/standard/siteMap.ts @@ -1,108 +1,74 @@ +import { RegisteredLinkProps } from "@codegouvfr/react-dsfr/link"; import { domElementIds } from "shared"; import { routes } from "src/app/routes/routes"; -// TODO replace with react dsfr link props type -type SiteMapLink = { - text: string; - linkProps: { - href: string; - id: string; - }; -}; - const { siteMap: siteMapIds } = domElementIds.standard; -const siteMapLinks: SiteMapLink[] = [ +const siteMapLinks: RegisteredLinkProps[] = [ { - text: "Accueil", - linkProps: { - ...routes.home().link, - id: siteMapIds.home, - }, + title: "Accueil", + id: siteMapIds.home, + ...routes.home().link, }, { - text: "Accueil candidat", - linkProps: { - ...routes.homeCandidates().link, - id: siteMapIds.candidateHome, - }, + title: "Accueil candidat", + id: siteMapIds.candidateHome, + ...routes.homeCandidates().link, }, { - text: "Accueil entreprise", - linkProps: { - ...routes.homeEstablishments().link, - id: siteMapIds.establishmentHome, - }, + title: "Accueil entreprise", + id: siteMapIds.establishmentHome, + ...routes.homeEstablishments().link, }, { - text: "Accueil prescripteurs", - linkProps: { - ...routes.homeAgencies().link, - id: siteMapIds.agencyHome, - }, + title: "Accueil prescripteurs", + id: siteMapIds.agencyHome, + ...routes.homeAgencies().link, }, { - text: "Trouver une entreprise accueillante", - linkProps: { - ...routes.search().link, - id: siteMapIds.search, - }, + title: "Trouver une entreprise accueillante", + id: siteMapIds.search, + ...routes.search().link, }, { - text: "Remplir la demande de convention", - linkProps: { - ...routes.conventionImmersion().link, - id: siteMapIds.coventionForm, - }, + title: "Remplir la demande de convention", + id: siteMapIds.coventionForm, + ...routes.conventionImmersion().link, }, { - text: "Référencer une entreprise", - linkProps: { - ...routes.formEstablishment().link, - id: siteMapIds.establishmentForm, - }, + title: "Référencer une entreprise", + id: siteMapIds.establishmentForm, + ...routes.formEstablishment().link, }, { - text: "Référencer un organisme", - linkProps: { - ...routes.addAgency().link, - id: siteMapIds.agencyForm, - }, + title: "Référencer un organisme", + id: siteMapIds.agencyForm, + ...routes.addAgency().link, }, { - text: "Déclaration d'accessibilité", - linkProps: { - ...routes.standard({ pagePath: "declaration-accessibilite" }).link, - id: siteMapIds.accessibility, - }, + title: "Déclaration d'accessibilité", + id: siteMapIds.accessibility, + ...routes.standard({ pagePath: "declaration-accessibilite" }).link, }, { - text: "Mentions légales", - linkProps: { - ...routes.standard({ pagePath: "mentions-legales" }).link, - id: siteMapIds.legals, - }, + title: "Mentions légales", + id: siteMapIds.legals, + ...routes.standard({ pagePath: "mentions-legales" }).link, }, { - text: "Politique de confidentialité", - linkProps: { - ...routes.standard({ pagePath: "politique-de-confidentialite" }).link, - id: siteMapIds.privacy, - }, + title: "Politique de confidentialité", + ...routes.standard({ pagePath: "politique-de-confidentialite" }).link, + id: siteMapIds.privacy, }, { - text: "Conditions générales d'utilisation", - linkProps: { - ...routes.standard({ pagePath: "cgu" }).link, - id: siteMapIds.cgu, - }, + title: "Conditions générales d'utilisation", + ...routes.standard({ pagePath: "cgu" }).link, + id: siteMapIds.cgu, }, { - text: "Statistiques", - linkProps: { - href: "/stats", - id: siteMapIds.stats, - }, + title: "Statistiques", + href: "/stats", + id: siteMapIds.stats, }, ]; @@ -112,7 +78,7 @@ export default { diff --git a/front/src/core-logic/adapters/AgencyGateway/HttpAgencyGateway.ts b/front/src/core-logic/adapters/AgencyGateway/HttpAgencyGateway.ts index 050d8683cf..bb8600f993 100644 --- a/front/src/core-logic/adapters/AgencyGateway/HttpAgencyGateway.ts +++ b/front/src/core-logic/adapters/AgencyGateway/HttpAgencyGateway.ts @@ -151,7 +151,6 @@ export class HttpAgencyGateway implements AgencyGateway { ); } - // TODO Mieux identifier l'admin public async validateOrRejectAgency( adminToken: BackOfficeJwt, agencyId: AgencyId, diff --git a/front/src/core-logic/adapters/AgencyGateway/agencyGateway.integration.test.ts b/front/src/core-logic/adapters/AgencyGateway/agencyGateway.integration.test.ts index 68de99fd35..e06ef80143 100644 --- a/front/src/core-logic/adapters/AgencyGateway/agencyGateway.integration.test.ts +++ b/front/src/core-logic/adapters/AgencyGateway/agencyGateway.integration.test.ts @@ -3,13 +3,7 @@ import { AgencyId } from "shared"; import { InMemoryAgencyGateway } from "src/core-logic/adapters/AgencyGateway/InMemoryAgencyGateway"; import { AgencyGateway } from "src/core-logic/ports/AgencyGateway"; -const adapters: AgencyGateway[] = [ - new InMemoryAgencyGateway(), - // TODO Propose default configuration to target local / docker backend when running integration tests - // front/jest.config.js => testEnvironment: "node" => "jsdom" ? ref: https://stackoverflow.com/questions/51957139/jest-tests-run-in-bash-but-generate-referenceerror-xmlhttprequest-is-not-defin - //new HttpAgencyGateway() - // option to override HttpGateways (hostname / http https) => target another fqdn -]; +const adapters: AgencyGateway[] = [new InMemoryAgencyGateway()]; describe("Agency Gateway - integration tests", () => { adapters.forEach((adapter: AgencyGateway) => {