Skip to content

Commit

Permalink
feat(conventions-collectives): ajout des nouvelles conventions collec…
Browse files Browse the repository at this point in the history
…tives (#5450)

* feat(contribution): handle new contrib display

* revert changes

* fix: ajout des modif

* fix: modif clean

* fix: modif clean

* fix: modif clean

* fix: xss

* fix test

* fix case when strong element with accordion summary

* remove

* fix: xss

* put tst es index

* fix build

* update index

* map table elements

* handle multiple items accordion

* spec + new index

* try to fix query to get all contribs

* add spec

* add tests for events on contrib page

* Empty-Commit

* fix: branch

* fix test

* new index

* update index

* revert changes

* revert changes

* include only generics in /contribution page

* fix nested summary

* fix: cc

* fix: ingester

* fix: retours de romain

* feat(metallurgie): affichage au nouveau format pour les anciennes contribs pour les 2 question qui seront déployés (4 et 23). (#5445)

* remove H2 + update test

* "Texte applicable" spécifique pour question 4

* fix: modif clean

* fix: modif

* fix: test

* fix: migrations

* new index

* Update packages/code-du-travail-frontend/src/contributions/ContributionCCPoc.tsx

Co-authored-by: Maxime Golfier <[email protected]>

* fix: migrations

* fix(e2e): correction des test e2e avec les données entreprises mise à jour (#5466)

* fix(e2e): correction des test e2e avec les données entreprises mise à jour

* fix test

* fix: merge

* fix: e2e

* fix: erreur

* fix: ccs-migration

* Update packages/code-du-travail-frontend/src/conventions/__tests__/utils.test.ts

Co-authored-by: Martial Maillot <[email protected]>

* fix: ccs-migration

---------

Co-authored-by: carolineBda <[email protected]>
Co-authored-by: Martial Maillot <[email protected]>
Co-authored-by: Caroline <[email protected]>
  • Loading branch information
4 people authored Dec 12, 2023
1 parent 45bf501 commit d2391ad
Show file tree
Hide file tree
Showing 21 changed files with 2,365 additions and 11,045 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,18 @@ import { handleError } from "../../src/lib/fetch-error";
import { SITE_URL } from "../../src/config";
import { apiIdcc } from "../../src/conventions/Search/api/agreement.service";
import EventTracker from "../../src/lib/tracking/EventTracker";
import { addPrefixAgreementTitle } from "../../src/conventions/utils";

interface Props {
convention;
}

function ConventionCollective(props: Props): JSX.Element {
const { convention } = props;
const { shortTitle, longTitle } = convention;
const { shortTitle, title } = convention;
return (
<Layout>
<Metas
title={`Convention collective ${shortTitle}`}
description={longTitle}
/>
<Metas title={addPrefixAgreementTitle(shortTitle)} description={title} />
<Answer
breadcrumbs={[
{
Expand Down Expand Up @@ -70,7 +68,7 @@ function ConventionCollective(props: Props): JSX.Element {
}
subtitle={
<Text fontSize="small">
{convention.title} (IDCC {formatIdcc(convention.num)})
{convention.shortTitle} (IDCC {formatIdcc(convention.num)})
</Text>
}
suptitle="CONVENTION COLLECTIVE"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ function Page({ ccs }) {
<FlatList>
{ccs.map((item) => (
<ListItem key={`${item.source}-${item.slug}`}>
<ListLink item={item} showTheme={true} titleTagType="h2" />
<ListLink
item={{ ...item, title: item.shortTitle }}
showTheme={true}
titleTagType="h2"
/>
</ListItem>
))}
</FlatList>
Expand Down
Loading

0 comments on commit d2391ad

Please sign in to comment.