Skip to content

Commit

Permalink
feat(glossaire): retrait du markdown dans les définitions du glossaire (
Browse files Browse the repository at this point in the history 
#5607)

* feat(glossaire): retrait du markdown dans les définitions du glossaire

* fix test

* revert
  • Loading branch information
@carolineBda
carolineBda authored Feb 12, 2024
1 parent ad2ec7e commit 5ffe9b3
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 55 deletions.
98 changes: 47 additions & 51 deletions packages/code-du-travail-frontend/__tests__/__snapshots__/glossaire-[slug].test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,9 @@ exports[`<Term /> should render 1`] = `
Définition
</th>
<td>
<div
class="sc-iXzfSG"
>
<p>
Accord collectif de travail conclu au niveau d'une entreprise.
</p>
</div>
<p>
Accord collectif de travail conclu au niveau d'une entreprise.
</p>
</td>
</tr>
</tbody>
Expand All @@ -239,13 +235,13 @@ exports[`<Term /> should render 1`] = `
</div>
</main>
<div
class="sc-bkSUFG huEoYc"
class="sc-fAGzit kTBFVN"
>
<footer
class="sc-deXhhX gKMlxm"
class="sc-bkSUFG cXqWSx"
>
<div
class="sc-gEvEer hpVpdb sc-dQEtJz djAHca"
class="sc-gEvEer hpVpdb sc-deXhhX hHbWTj"
>
<div
class="sc-aXZVg gZgZQL"
Expand All @@ -265,7 +261,7 @@ exports[`<Term /> should render 1`] = `
</p>
</div>
<div
class="sc-aXZVg sc-imwsjW dPpwpV ARQDb"
class="sc-aXZVg sc-dQEtJz dPpwpV jTyZXO"
>
<p>
Les services du ministère du Travail en région informent, conseillent et orientent les salariés et les employeurs du secteur privé sur leurs questions en droit du travail.
Expand All @@ -277,7 +273,7 @@ exports[`<Term /> should render 1`] = `
Contacter nos services en région
<svg
aria-hidden="true"
class="sc-kCMKrZ hlLkTA"
class="sc-imwsjW jDOHmf"
fill="none"
viewBox="0 0 28 15"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -291,61 +287,61 @@ exports[`<Term /> should render 1`] = `
</div>
</div>
<div
class="sc-gEvEer hpVpdb sc-dJiZtA hGLVYH"
class="sc-gEvEer hpVpdb sc-kCMKrZ jBhcwF"
>
<div
class="sc-aXZVg sc-epALIP gZgZQL huBlCy"
class="sc-aXZVg sc-dJiZtA gZgZQL UAXPn"
>
<div
class="sc-fAGzit gIkdLa"
class="sc-dGCmGc hgWVvM"
>
<div>
<strong
aria-level="2"
class="sc-lbJcrp kpWXOu sc-kAyceB jIzQpS"
class="sc-iLsKjm bHyFYd sc-kAyceB jIzQpS"
data-testid="heading"
role="heading"
>
Code du travail numérique
</strong>
<ul
class="sc-cfxfcM sc-iLsKjm kMmTaI hfFDOO"
class="sc-cfxfcM sc-epALIP kMmTaI PLedh"
>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/droit-du-travail"
>
Le droit du travail
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/glossaire"
>
Glossaire
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/a-propos"
>
À propos
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/stats"
>
Statistiques d’utilisation
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/integration"
>
Intégrer les outils du Code du travail numérique
Expand All @@ -355,39 +351,39 @@ exports[`<Term /> should render 1`] = `
</div>
</div>
<div
class="sc-fAGzit gIkdLa"
class="sc-dGCmGc hgWVvM"
>
<div>
<strong
aria-level="2"
class="sc-lbJcrp kpWXOu sc-kAyceB jIzQpS"
class="sc-iLsKjm bHyFYd sc-kAyceB jIzQpS"
data-testid="heading"
role="heading"
>
Outils populaires
</strong>
<ul
class="sc-cfxfcM sc-iLsKjm kMmTaI hfFDOO"
class="sc-cfxfcM sc-epALIP kMmTaI PLedh"
>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/outils/simulateur-embauche"
>
Calcul du salaire brut/net
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/outils/indemnite-licenciement"
>
Calcul de l'indemnité de licenciement
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/outils/convention-collective"
>
Trouver sa convention collective
Expand All @@ -398,34 +394,34 @@ exports[`<Term /> should render 1`] = `
<div>
<strong
aria-level="2"
class="sc-lbJcrp kpWXOu sc-kAyceB jIzQpS"
class="sc-iLsKjm bHyFYd sc-kAyceB jIzQpS"
data-testid="heading"
role="heading"
>
Modèles populaires
</strong>
<ul
class="sc-cfxfcM sc-iLsKjm kMmTaI hfFDOO"
class="sc-cfxfcM sc-epALIP kMmTaI PLedh"
>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/modeles-de-courriers/lettre-de-demission"
>
Lettre de démission
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/modeles-de-courriers/rupture-du-contrat-en-periode-dessai-par-le-salarie"
>
Rupture du contrat en période d'essai par le salarié
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/modeles-de-courriers/convocation-a-un-entretien-prealable-au-licenciement-pour-motif-personnel"
>
Convocation à un entretien préalable au licenciement pour motif personnel
Expand All @@ -435,39 +431,39 @@ exports[`<Term /> should render 1`] = `
</div>
</div>
<div
class="sc-fAGzit gIkdLa"
class="sc-dGCmGc hgWVvM"
>
<div>
<strong
aria-level="2"
class="sc-lbJcrp kpWXOu sc-kAyceB jIzQpS"
class="sc-iLsKjm bHyFYd sc-kAyceB jIzQpS"
data-testid="heading"
role="heading"
>
Fiches pratiques populaires
</strong>
<ul
class="sc-cfxfcM sc-iLsKjm kMmTaI hfFDOO"
class="sc-cfxfcM sc-epALIP kMmTaI PLedh"
>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/contribution/quelle-est-la-duree-du-preavis-en-cas-de-demission"
>
Durée du préavis de démission
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/contribution/les-conges-pour-evenements-familiaux"
>
Congés pour événements familiaux
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/contribution/en-cas-darret-maladie-du-salarie-lemployeur-doit-il-assurer-le-maintien-de-salaire"
>
Maintien du salaire en cas d'arrêt maladie
Expand All @@ -478,34 +474,34 @@ exports[`<Term /> should render 1`] = `
<div>
<strong
aria-level="2"
class="sc-lbJcrp kpWXOu sc-kAyceB jIzQpS"
class="sc-iLsKjm bHyFYd sc-kAyceB jIzQpS"
data-testid="heading"
role="heading"
>
Conventions collectives populaires
</strong>
<ul
class="sc-cfxfcM sc-iLsKjm kMmTaI hfFDOO"
class="sc-cfxfcM sc-epALIP kMmTaI PLedh"
>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/convention-collective/1090-services-de-lautomobile-commerce-et-reparation-de-lautomobile-du-cycle"
>
Services de l'automobile
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/convention-collective/3248-metallurgie"
>
Métallurgie
</a>
</li>
<li>
<a
class="sc-eifrsQ dieYdC"
class="sc-lbJcrp fVfqop"
href="/convention-collective/573-commerces-de-gros"
>
Commerce de gros
Expand All @@ -517,10 +513,10 @@ exports[`<Term /> should render 1`] = `
</div>
</div>
<div
class="sc-aXZVg sc-kFWlue gZgZQL epqIEU"
class="sc-aXZVg sc-jOnpCo gZgZQL dNBAUF"
>
<div
class="sc-bkEOxz gcLzOM"
class="sc-kFWlue gGpaBv"
>
<img
alt="le site du ministere du travail, de l'emploi et de l'insertion"
Expand All @@ -534,7 +530,7 @@ exports[`<Term /> should render 1`] = `
width="170"
/>
<ul
class="sc-dhFUGM fngMeF"
class="sc-bkEOxz brUpVF"
>
<li>
<a
Expand Down Expand Up @@ -574,13 +570,13 @@ exports[`<Term /> should render 1`] = `
</ul>
</div>
<div
class="sc-bJBgwP hEwZGH"
class="sc-leSDtu vcyTG"
/>
<div
class="sc-fbKhjd EwujM"
class="sc-dhFUGM dxwgZk"
>
<ul
class="sc-dhFUGM sc-leSDtu fngMeF hMQRJI"
class="sc-bkEOxz sc-fbKhjd brUpVF jMnJWO"
>
<li>
<a
Expand Down Expand Up @@ -622,7 +618,7 @@ exports[`<Term /> should render 1`] = `
<li>
<a
aria-label="Nous contacter"
class="sc-dGCmGc hYoBaN"
class="sc-bJBgwP cKCQfW"
role="link"
>
Nous contacter
Expand Down
2 changes: 1 addition & 1 deletion packages/code-du-travail-frontend/__tests__/glossaire-[slug].test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Term from "../pages/glossaire/[slug]";
const term = {
abbreviations: [],
definition:
"<p>Accord collectif de travail conclu au niveau d'une entreprise.</p>",
"Accord collectif de travail conclu au niveau d'une entreprise.",
references: [],
slug: "accord-dentreprise",
term: "Accord d'entreprise",
Expand Down
2 changes: 1 addition & 1 deletion packages/code-du-travail-frontend/pages/code-du-travail/[slug].tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getLabelBySource, SOURCES, Breadcrumb } from "@socialgouv/cdtn-utils";
import { Breadcrumb, getLabelBySource, SOURCES } from "@socialgouv/cdtn-utils";
import { Alert } from "@socialgouv/cdtn-ui";
import { format } from "date-fns";
import frLocale from "date-fns/locale/fr";
Expand Down
3 changes: 1 addition & 2 deletions packages/code-du-travail-frontend/pages/glossaire/[slug].tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import React from "react";
import styled from "styled-components";

import { A11yLink } from "../../src/common/A11yLink";
import Html from "../../src/common/Html";
import Metas from "../../src/common/Metas";
import { SITE_URL } from "../../src/config";
import { Layout } from "../../src/layout/Layout";
Expand All @@ -39,7 +38,7 @@ function Term(props: Props): JSX.Element {
<tr>
<th>Définition</th>
<td>
<Html>{definition}</Html>
<p>{definition}</p>
</td>
</tr>
{references && references.length > 0 && (
Expand Down
2 changes: 2 additions & 0 deletions packages/code-du-travail-frontend/pages/widgets/modeles-de-courriers/[id].tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ const StyledHeader = styled.div`
display: flex;
align-items: center;
justify-content: center;
header {
margin: 0;
}
`;

const StyledTitle = styled(PageTitle)`
flex: 1;
h1 {
font-size: ${fonts.sizes.headings.xmedium};
}
Expand Down

0 comments on commit 5ffe9b3

Please sign in to comment.