moved headerFooterDisplayItem in footer

gip-inclusion · Sep 20, 2024 · e2abaa7 · e2abaa7
1 parent 7d232a2
commit e2abaa7
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 16 deletions.
diff --git a/back/src/domains/convention/adapters/PgConventionQueries.integration.test.ts b/back/src/domains/convention/adapters/PgConventionQueries.integration.test.ts
@@ -336,7 +336,12 @@ describe("Pg implementation of ConventionQueries", () => {
  describe("PG implementation of method getConventionsByFilters", () => {
  const agencyId = "bbbbbc15-9c0a-1aaa-aa6d-6aa9ad38aaff";
  const agency = AgencyDtoBuilder.create().withId(agencyId).build();
+ const siret1 = "11110000111100";
+ const siret2 = "22220000222200";
+ const siret3 = "33330000333300";
+
  const conventionCancelledAndDateStart20230327 = new ConventionDtoBuilder()
+ .withSiret(siret1)
  .withId("bbbbbc15-9c0a-1aaa-aa6d-6aa9ad38aa01")
  .withDateStart(new Date("2023-03-27").toISOString())
  .withDateEnd(new Date("2023-03-28").toISOString())
@@ -346,6 +351,7 @@ describe("Pg implementation of ConventionQueries", () => {
  .build();
 
  const conventionDraftAndDateStart20230330 = new ConventionDtoBuilder()
+ .withSiret(siret3)
  .withId("bbbbbc15-9c0a-1aaa-aa6d-6aa9ad38aa02")
  .withDateSubmission(new Date("2023-03-05").toISOString())
  .withDateStart(new Date("2023-03-30").toISOString())
@@ -356,6 +362,7 @@ describe("Pg implementation of ConventionQueries", () => {
  .build();
 
  const firstValidatedConvention = new ConventionDtoBuilder()
+ .withSiret(siret1)
  .withId("bbbbbc15-9c0a-1aaa-aa6d-6aa9ad38aa03")
  .withDateSubmission(new Date("2024-06-20").toISOString())
  .withDateStart(new Date("2024-07-01").toISOString())
@@ -368,6 +375,7 @@ describe("Pg implementation of ConventionQueries", () => {
  .build();
 
  const secondValidatedConvention = new ConventionDtoBuilder()
+ .withSiret(siret2)
  .withId("bbbbbc15-9c0a-1aaa-aa6d-6aa9ad38aa04")
  .withDateSubmission(new Date("2024-06-21").toISOString())
  .withDateStart(new Date("2024-07-02").toISOString())
@@ -523,6 +531,21 @@ describe("Pg implementation of ConventionQueries", () => {
  firstValidatedConvention,
  ]);
  });
+
+ it("getConventionsByFilters with some sirets", async () => {
+ const resultAll = await conventionQueries.getConventions({
+ filters: {
+ withSirets: [siret1, siret2],
+ },
+ sortBy: "dateStart",
+ });
+
+ expectToEqual(resultAll, [
+ secondValidatedConvention,
+ firstValidatedConvention,
+ conventionCancelledAndDateStart20230327,
+ ]);
+ });
  });
 
  describe("findSimilarConventions", () => {

diff --git a/back/src/domains/convention/adapters/PgConventionQueries.ts b/back/src/domains/convention/adapters/PgConventionQueries.ts
@@ -9,6 +9,7 @@ import {
  ConventionStatus,
  DateRange,
  FindSimilarConventionsParams,
+ SiretDto,
  conventionReadSchema,
  conventionSchema,
  pipeWithValue,
@@ -279,7 +280,7 @@ const addFiltersToBuilder =
 
  const addWithSiretsIfNeeded: AddToBuilder = (b) =>
  withSirets && withSirets.length > 0
- ? b.where("conventions.siret", "in", withSirets)
+ ? b.where("conventions.siret", "=", sql<SiretDto>`ANY(${withSirets})`)
  : b;
 
  return pipeWithValue(

diff --git a/front/src/app/components/layout/LayoutFooter.tsx b/front/src/app/components/layout/LayoutFooter.tsx
@@ -1,4 +1,8 @@
 import { fr } from "@codegouvfr/react-dsfr";
+import {
+ Display,
+ headerFooterDisplayItem,
+} from "@codegouvfr/react-dsfr/Display";
 import { useIsDark } from "@codegouvfr/react-dsfr/useIsDark";
 import React from "react";
 import {
@@ -139,7 +143,7 @@ const links: NavLink[] = [
  target: "_blank",
  },
 ];
-const bottomsLinks: NavLink[] = [
+const bottomsLinks: (NavLink | typeof headerFooterDisplayItem)[] = [
  {
  label: "Accessibilité : partiellement conforme",
  ...routes.standard({ pagePath: "accessibilite" }).link,
@@ -207,6 +211,7 @@ const bottomsLinks: NavLink[] = [
  id: bottomsLinksIds.communicationKit,
  target: "_blank",
  },
+ headerFooterDisplayItem,
 ];
 
 const navTopGroupLinks: NavTopGroupLinks[] = [
@@ -282,6 +287,7 @@ export const LayoutFooter = () => (
  bottomLinks={bottomsLinks}
  plateformeInclusionLogo={<PlateformeInclusionLogo />}
  />
+ <Display />
  </>
 );
 

diff --git a/front/src/app/components/layout/LayoutHeader.tsx b/front/src/app/components/layout/LayoutHeader.tsx
@@ -1,8 +1,4 @@
 import { fr } from "@codegouvfr/react-dsfr";
-import {
- Display,
- headerFooterDisplayItem,
-} from "@codegouvfr/react-dsfr/Display";
 import { Header, HeaderProps } from "@codegouvfr/react-dsfr/Header";
 import { MainNavigationProps } from "@codegouvfr/react-dsfr/MainNavigation";
 import { useIsDark } from "@codegouvfr/react-dsfr/useIsDark";
@@ -54,7 +50,6 @@ export const LayoutHeader = () => {
  const isAdminConnected = useAppSelector(authSelectors.isAdminConnected);
  const isPeConnected = useAppSelector(authSelectors.isPeConnected);
  const tools: HeaderProps["quickAccessItems"] = [
- headerFooterDisplayItem,
  {
  text: "Remplir la demande de convention",
  iconId: "fr-icon-draft-line",
@@ -318,7 +313,6 @@ export const LayoutHeader = () => {
  navigation={links}
  quickAccessItems={tools}
  />
- <Display />
  </>
  );
 };

diff --git a/libs/react-design-system/src/immersionFacile/components/footer/Footer.tsx b/libs/react-design-system/src/immersionFacile/components/footer/Footer.tsx
@@ -1,4 +1,5 @@
 import { fr } from "@codegouvfr/react-dsfr";
+import { FooterProps as FooterPropsDsfr } from "@codegouvfr/react-dsfr/Footer";
 import React from "react";
 import { useStyles } from "tss-react/dsfr";
 import FooterStyles from "./Footer.styles";
@@ -24,7 +25,7 @@ export type NavTopGroupLinks = {
 export type FooterProps = {
  links?: NavLink[];
  navTopGroupLinks?: NavTopGroupLinks[];
- bottomLinks?: NavLink[];
+ bottomLinks?: (NavLink | FooterPropsDsfr.BottomItem.Button)[];
  partnersLogos?: React.ReactNode;
  plateformeInclusionLogo?: React.ReactNode;
 };
@@ -47,13 +48,36 @@ const TopLink = ({ link }: { link: NavLink }) => {
  );
 };
 
-const BottomLink = ({ link }: { link: NavLink }) => (
- <li className={fr.cx("fr-footer__bottom-item")}>
- <a className={fr.cx("fr-footer__bottom-link")} {...link}>
- {link.label}
- </a>
- </li>
-);
+const BottomLink = ({
+ link,
+}: { link: NavLink | FooterPropsDsfr.BottomItem }) => {
+ const { cx } = useStyles();
+ return (
+ <li className={fr.cx("fr-footer__bottom-item")}>
+ {"label" in link ? (
+ <a className={fr.cx("fr-footer__bottom-link")} {...link}>
+ {link.label}
+ </a>
+ ) : (
+ <button
+ type="button"
+ className={cx(
+ fr.cx(
+ "fr-footer__bottom-link",
+ "fr-icon-theme-fill",
+ "fr-link--icon-left",
+ link.iconId,
+ ),
+ link.buttonProps?.className,
+ )}
+ {...link.buttonProps}
+ >
+ {link.text}
+ </button>
+ )}
+ </li>
+ );
+};
 
 export const Footer = ({
  links,