fix(contributions): affichage du nom de la CC dans le H1 des contribs…

… personnalisées
SocialGouv · Jan 9, 2025 · d2f1e30 · d2f1e30
1 parent 441a008
commit d2f1e30
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/packages/code-du-travail-frontend/app/contribution/[slug]/page.tsx b/packages/code-du-travail-frontend/app/contribution/[slug]/page.tsx
@@ -9,11 +9,11 @@ import {
 } from "../../../src/modules/contributions";
 
 export async function generateMetadata({ params }) {
-  const { title, description } = await getContribution(params.slug);
+  const { metas } = await getContribution(params.slug);
 
   return generateDefaultMetadata({
-    title: title,
-    description: description,
+    title: metas.title,
+    description: metas.description,
     path: `/contribution/${params.slug}`,
   });
 }

diff --git a/packages/code-du-travail-frontend/src/modules/contributions/ContributionLayout.tsx b/packages/code-du-travail-frontend/src/modules/contributions/ContributionLayout.tsx
@@ -110,7 +110,14 @@ export function ContributionLayout({ relatedItems, contribution }: Props) {
           linkProps: { href: breadcrumb.slug },
         }))}
       />
-      <h1 className={fr.cx("fr-mb-6w")}>{title}</h1>
+      <h1 className={fr.cx("fr-mb-6w")}>
+        {title}{" "}
+        {!isGeneric && (
+          <span className={`${fr.cx("fr-h2")} ${h1}`}>
+            {contribution.ccnShortTitle}
+          </span>
+        )}
+      </h1>
       <p className={fr.cx("fr-mt-6w")}>Mis à jour le&nbsp;: {date}</p>
       <div className={`${fr.cx("fr-p-3w", "fr-mt-6w")} ${block}`}>
         {isGeneric ? (
@@ -233,11 +240,7 @@ export function ContributionLayout({ relatedItems, contribution }: Props) {
                 Que dit le code du travail&nbsp;?
               </p>
               <ContributionContent
-                contribution={
-                  contribution as
-                    | ElasticSearchContributionGeneric
-                    | ElasticSearchContributionConventionnelle
-                }
+                contribution={contribution as ElasticSearchContributionGeneric}
                 titleLevel={2}
               />
               {contribution.references.length && (
@@ -294,9 +297,7 @@ export function ContributionLayout({ relatedItems, contribution }: Props) {
           >
             <ContributionContent
               contribution={
-                contribution as
-                  | ElasticSearchContributionGeneric
-                  | ElasticSearchContributionConventionnelle
+                contribution as ElasticSearchContributionConventionnelle
               }
               titleLevel={3}
             ></ContributionContent>
@@ -335,6 +336,10 @@ export function ContributionLayout({ relatedItems, contribution }: Props) {
   );
 }
 
+const h1 = css({
+  display: "block",
+});
+
 const block = css({
   background: "var(--background-alt-blue-cumulus) !important",
 });