From 1af11e96c493909487fddb85b12a2a6409d162a3 Mon Sep 17 00:00:00 2001 From: Victor Zeinstra Date: Mon, 17 Jun 2024 15:54:49 +0200 Subject: [PATCH] feat: CC fusions (#5967) Co-authored-by: victor --- .../code-du-travail-frontend/redirects.json | 50 +++++++++++++++++++ .../src/api/config.ts | 7 ++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/packages/code-du-travail-frontend/redirects.json b/packages/code-du-travail-frontend/redirects.json index a3de4ef8db..4d4d576c90 100644 --- a/packages/code-du-travail-frontend/redirects.json +++ b/packages/code-du-travail-frontend/redirects.json @@ -1058,5 +1058,55 @@ "source": "/convention-collective/(0780|780(?:-[a-z0-9-]+)?)", "destination": "/convention-collective/303-couture-parisienne", "permanent": true + }, + { + "source": "/convention-collective/(0706|706(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/1539-papeterie-commerce-de-detail-de-papeterie-fournitures-de-bureau-bureaut", + "permanent": true + }, + { + "source": "/convention-collective/(2075|2075(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/1747-activites-industrielles-de-boulangerie-et-patisserie", + "permanent": true + }, + { + "source": "/convention-collective/(7012|7012(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/personnels-des-activites-hippiques", + "permanent": true + }, + { + "source": "/convention-collective/(7013|7013(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/personnels-des-activites-hippiques", + "permanent": true + }, + { + "source": "/convention-collective/(7014|7014(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/personnels-des-activites-hippiques", + "permanent": true + }, + { + "source": "/convention-collective/(1194|1194(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/2121-edition", + "permanent": true + }, + { + "source": "/convention-collective/(1016|1016(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/2121-edition", + "permanent": true + }, + { + "source": "/convention-collective/(2770|2770(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/2121-edition", + "permanent": true + }, + { + "source": "/convention-collective/(635|635(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/573-commerces-de-gros", + "permanent": true + }, + { + "source": "/convention-collective/(1734|1734(?:-[a-z0-9-]+)?)", + "destination": "/convention-collective/2642-production-audiovisuelle", + "permanent": true } ] diff --git a/packages/code-du-travail-frontend/src/api/config.ts b/packages/code-du-travail-frontend/src/api/config.ts index e5136d920b..27c7dc313a 100644 --- a/packages/code-du-travail-frontend/src/api/config.ts +++ b/packages/code-du-travail-frontend/src/api/config.ts @@ -17,7 +17,7 @@ export const IDCC_MERGE = { 3245: [1710, 412], 3238: [1492, 1495, 700, 707], 3241: [2411], - 573: [1761, 1624], + 573: [1761, 1624, 635], 3229: [1974, 2174], 3236: [1423], 158: [172], @@ -28,4 +28,9 @@ export const IDCC_MERGE = { 1557: [1618], 18: [1942], 787: [3160, 1237], + 1539: [706], + 1747: [2075], + 7026: [7012, 7013, 7014], + 2121: [1194, 1016, 2770], + 2642: [1734], };