feat: unified URL structure

Signed-off-by: Maud Royer <[email protected]>
betagouv · Nov 12, 2024 · c263820 · c263820
1 parent cca7b17
commit c263820
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 26 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -9,6 +9,26 @@ const nextConfig = {
     });
     return config;
   },
+  async rewrites() {
+    return [
+      {
+        source: "/articles/:letter([A-Za-z])",
+        destination: "/alpha_lists/articles/:letter",
+      },
+      {
+        source: "/medicaments/:letter([A-Za-z])/:page(\\d+)",
+        destination: "/alpha_lists/medicaments/:letter/:page",
+      },
+      {
+        source: "/pathologies/:letter([A-Za-z])",
+        destination: "/alpha_lists/pathologies/:letter",
+      },
+      {
+        source: "/substances/:letter([A-Za-z])",
+        destination: "/alpha_lists/substances/:letter",
+      },
+    ];
+  },
   experimental: {
     instrumentationHook: true,
   },

diff --git a/...urir/medicaments/[letter]/[page]/page.tsx → ...ists/medicaments/[letter]/[page]/page.tsx b/...urir/medicaments/[letter]/[page]/page.tsx → ...ists/medicaments/[letter]/[page]/page.tsx
@@ -69,7 +69,7 @@ export default async function Page({
           <h1 className={fr.cx("fr-h1", "fr-mb-8w")}>Liste des médicaments</h1>
           <AlphabeticNav
             letters={letters}
-            url={(letter) => `/parcourir/medicaments/${letter}/1`}
+            url={(letter) => `/medicaments/${letter}/1`}
           />
           <MedGroupSpecListList
             items={medicaments.slice(
@@ -82,7 +82,7 @@ export default async function Page({
               count={pageCount}
               defaultPage={pageNumber}
               getPageLinkProps={(number: number) => ({
-                href: `/parcourir/medicaments/${letter}/${number}`,
+                href: `/medicaments/${letter}/${number}`,
               })}
             />
           )}

diff --git a/...)/parcourir/pathologies/[letter]/page.tsx → ...alpha_lists/pathologies/[letter]/page.tsx b/...)/parcourir/pathologies/[letter]/page.tsx → ...alpha_lists/pathologies/[letter]/page.tsx
@@ -51,13 +51,13 @@ export default async function Page({
           <h1 className={fr.cx("fr-h1", "fr-mb-8w")}>Liste des pathologies</h1>
           <AlphabeticNav
             letters={letters}
-            url={(letter) => `/parcourir/pathologies/${letter}`}
+            url={(letter) => `/pathologies/${letter}`}
           />
           <ul className={fr.cx("fr-raw-list")}>
             {pathos.map((patho, i) => (
               <li key={i} className={fr.cx("fr-mb-1v")}>
                 <Link
-                  href={`/pathologie/${patho.codePatho}`}
+                  href={`/pathologies/${patho.codePatho}`}
                   className={fr.cx("fr-link")}
                 >
                   {patho.NomPatho}

diff --git a/...r)/parcourir/substances/[letter]/page.tsx → .../alpha_lists/substances/[letter]/page.tsx b/...r)/parcourir/substances/[letter]/page.tsx → .../alpha_lists/substances/[letter]/page.tsx
@@ -65,13 +65,13 @@ export default async function Page({
           <h1 className={fr.cx("fr-h1", "fr-mb-8w")}>Liste des substances</h1>
           <AlphabeticNav
             letters={letters}
-            url={(letter) => `/parcourir/substances/${letter}`}
+            url={(letter) => `/substances/${letter}`}
           />
           <ul className={fr.cx("fr-raw-list")}>
             {substances.map((substance, i) => (
               <li key={i} className={fr.cx("fr-mb-1v")}>
                 <Link
-                  href={`/substance/${substance.NomId}`}
+                  href={`/substances/${substance.NomId}`}
                   className={fr.cx("fr-link")}
                 >
                   {substance.NomLib}

diff --git a/src/app/(container)/article/[slug]/page.tsx → src/app/(container)/articles/[slug]/page.tsx b/src/app/(container)/article/[slug]/page.tsx → src/app/(container)/articles/[slug]/page.tsx
@@ -29,7 +29,7 @@ export default async function Page({
           { label: "Acceuil", linkProps: { href: "/" } },
           {
             label: "Liste des articles",
-            linkProps: { href: "/parcourir/articles" },
+            linkProps: { href: "/articles" },
           },
         ]}
         currentPageLabel={title}

diff --git a/...p/(container)/parcourir/articles/page.tsx → src/app/(container)/articles/page.tsx b/...p/(container)/parcourir/articles/page.tsx → src/app/(container)/articles/page.tsx
@@ -35,7 +35,7 @@ export default async function Page() {
                   .map(({ title, slug }) => (
                     <li key={slug} className={"fr-mb-1w"}>
                       <Link
-                        href={`/article/${slug}`}
+                        href={`/articles/${slug}`}
                         className={fr.cx(
                           "fr-link",
                           "fr-link--icon-left",

diff --git a/src/app/(container)/atc/[code]/page.tsx b/src/app/(container)/atc/[code]/page.tsx
@@ -13,7 +13,7 @@ export const dynamicParams = true;
 
 const SubstanceItem = ({ item }: { item: SubstanceNom }) => (
   <li key={item.NomId} className={fr.cx("fr-mb-1w")}>
-    <Link className={fr.cx("fr-link")} href={`/substance/${item.NomId}`}>
+    <Link className={fr.cx("fr-link")} href={`/substances/${item.NomId}`}>
       {item.NomLib}
     </Link>
   </li>

diff --git a/...icament/[CIS]/DsfrLeafletSection.test.tsx → ...caments/[CIS]/DsfrLeafletSection.test.tsx b/...icament/[CIS]/DsfrLeafletSection.test.tsx → ...caments/[CIS]/DsfrLeafletSection.test.tsx
@@ -2,7 +2,7 @@ import { afterEach, describe, expect, test } from "vitest";
 import { cleanup, screen, within } from "@testing-library/react";
 import HTMLParser from "node-html-parser";
 
-import DsfrLeafletSection from "@/app/(container)/medicament/[CIS]/DsfrLeafletSection";
+import DsfrLeafletSection from "./DsfrLeafletSection";
 import { renderServerComponent } from "@/testsUtils/renderServerComponent";
 
 describe("DsfrLeafletSection", () => {

diff --git a/...)/medicament/[CIS]/DsfrLeafletSection.tsx → .../medicaments/[CIS]/DsfrLeafletSection.tsx b/...)/medicament/[CIS]/DsfrLeafletSection.tsx → .../medicaments/[CIS]/DsfrLeafletSection.tsx
@@ -2,11 +2,7 @@ import { HTMLElement, Node, NodeType } from "node-html-parser";
 import { JSX } from "react";
 import Image from "next/image";
 import { fr } from "@codegouvfr/react-dsfr";
-import {
-  isEmptyTextNode,
-  isHtmlElement,
-  isListItem,
-} from "@/app/(container)/medicament/[CIS]/leafletUtils";
+import { isEmptyTextNode, isHtmlElement, isListItem } from "./leafletUtils";
 import { getLeafletImage } from "@/db";
 
 async function DsfrLeafletElement({ node }: { node: HTMLElement }) {

diff --git a/...tainer)/medicament/[CIS]/leafletUtils.tsx → ...ainer)/medicaments/[CIS]/leafletUtils.tsx b/...tainer)/medicament/[CIS]/leafletUtils.tsx → ...ainer)/medicaments/[CIS]/leafletUtils.tsx
diff --git a/...app/(container)/medicament/[CIS]/page.tsx → ...pp/(container)/medicaments/[CIS]/page.tsx b/...app/(container)/medicament/[CIS]/page.tsx → ...pp/(container)/medicaments/[CIS]/page.tsx
@@ -15,8 +15,8 @@ import { Nullable, sql } from "kysely";
 
 import { pdbmMySQL } from "@/db/pdbmMySQL";
 import liste_CIS_MVP from "@/liste_CIS_MVP.json";
-import DsfrLeafletSection from "@/app/(container)/medicament/[CIS]/DsfrLeafletSection";
-import { isHtmlElement } from "@/app/(container)/medicament/[CIS]/leafletUtils";
+import DsfrLeafletSection from "./DsfrLeafletSection";
+import { isHtmlElement } from "./leafletUtils";
 import {
   dateShortFormat,
   displayCompleteComposants,
@@ -356,7 +356,7 @@ export default async function Page({
                   key={substance.NomId}
                   small
                   linkProps={{
-                    href: `/substance/${substance.NomId}`,
+                    href: `/substances/${substance.NomId}`,
                     className: cx("fr-tag--custom-alt-substance"),
                   }}
                 >

diff --git a/...pp/(container)/pathologie/[code]/page.tsx → ...p/(container)/pathologies/[code]/page.tsx b/...pp/(container)/pathologie/[code]/page.tsx → ...p/(container)/pathologies/[code]/page.tsx
@@ -51,7 +51,7 @@ export default async function Page({
           {
             label: "Listes des pathologies",
             linkProps: {
-              href: `/parcourir/pathologies/${patho.NomPatho.slice(0, 1)}`,
+              href: `/pathologies/${patho.NomPatho.slice(0, 1)}`,
             },
           },
         ]}

diff --git a/src/app/(container)/rechercher/page.tsx b/src/app/(container)/rechercher/page.tsx
@@ -18,7 +18,7 @@ const SubstanceResult = ({ item }: { item: SubstanceNom }) => (
       )}
     />
     <Link
-      href={`/substance/${item.NomId}`}
+      href={`/substances/${item.NomId}`}
       className={fr.cx("fr-text--md", "fr-text--bold", "fr-link")}
     >
       {formatSpecName(item.NomLib)}

diff --git a/src/app/(container)/substance/[id]/page.tsx → src/app/(container)/substances/[id]/page.tsx b/src/app/(container)/substance/[id]/page.tsx → src/app/(container)/substances/[id]/page.tsx
@@ -72,7 +72,7 @@ export default async function Page({
                 <ul>
                   {specialites?.map((specialite) => (
                     <li key={specialite.SpecId}>
-                      <Link href={`/medicament/${specialite.SpecId}`}>
+                      <Link href={`/medicaments/${specialite.SpecId}`}>
                         {formatSpecName(specialite.SpecDenom01)}
                       </Link>
                     </li>

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -93,21 +93,21 @@ export default async function RootLayout({
                   menuLinks: [
                     {
                       text: "Tous les médicaments",
-                      linkProps: { href: "/parcourir/medicaments/A/1" },
+                      linkProps: { href: "/medicaments/A/1" },
                     },
                     {
                       text: "Toutes les substances",
-                      linkProps: { href: "/parcourir/substances/A" },
+                      linkProps: { href: "/substances/A" },
                     },
                     {
                       text: "Toutes les pathologies",
-                      linkProps: { href: "/parcourir/pathologies/A" },
+                      linkProps: { href: "/pathologies/A" },
                     },
                   ],
                 },
                 {
                   text: "Articles",
-                  linkProps: { href: "/parcourir/articles" },
+                  linkProps: { href: "/articles" },
                 },
               ]}
             />

diff --git a/src/components/MedGroupSpecList.tsx b/src/components/MedGroupSpecList.tsx
@@ -69,7 +69,7 @@ export default async function MedGroupSpecList({
         {specialites?.map((specialite, i) => (
           <li key={i} className={fr.cx("fr-mb-1v")}>
             <Link
-              href={`/medicament/${specialite.SpecId}`}
+              href={`/medicaments/${specialite.SpecId}`}
               className={fr.cx("fr-text--sm", "fr-link")}
             >
               {formatSpecName(specialite.SpecDenom01)}