Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tech enlever des todos du front #550

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Tech enlever des todos du front #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd86565
use react dsfr RegisteredLinkProps type
celineung Aug 8, 2023
f5093f2
remove old todos
celineung Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 42 additions & 76 deletions front/src/app/contents/standard/siteMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
},
];

Expand All @@ -112,7 +78,7 @@ export default {
<ul>${siteMapLinks
.map(
(link) =>
`<li><a class="fr-link fr-fi-arrow-right-line fr-link--icon-right" href=${link.linkProps.href} id=${link.linkProps.id}>${link.text}</a></li>`,
`<li><a class="fr-link fr-fi-arrow-right-line fr-link--icon-right" href=${link.href} id=${link.id}>${link.title}</a></li>`,
)
.join("")}
</ul>
Expand Down
1 change: 0 additions & 1 deletion front/src/core-logic/adapters/AgencyGateway/HttpAgencyGateway.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ export class HttpAgencyGateway implements AgencyGateway {
);
}

// TODO Mieux identifier l'admin
public async validateOrRejectAgency(
adminToken: BackOfficeJwt,
agencyId: AgencyId,
Expand Down
8 changes: 1 addition & 7 deletions front/src/core-logic/adapters/AgencyGateway/agencyGateway.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down