fix: glossary

SocialGouv · Dec 3, 2024 · 03a8589 · 03a8589
1 parent 8938e97
commit 03a8589
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/targets/export-elasticsearch/src/workers/glossary/__mocks__/glossaryData.ts b/targets/export-elasticsearch/src/workers/glossary/__mocks__/glossaryData.ts
@@ -1,4 +1,11 @@
 export const glossaryData = [
+  {
+    abbreviations: ["ZC"],
+    definition: "Definition de la zone commerciale",
+    term: "Zone commerciale",
+    variants: [],
+    references: [],
+  },
   {
     abbreviations: [],
     definition:

diff --git a/targets/export-elasticsearch/src/workers/glossary/__tests__/addGlossaryContent.test.ts b/targets/export-elasticsearch/src/workers/glossary/__tests__/addGlossaryContent.test.ts
@@ -542,6 +542,14 @@ describe("Glossary", () => {
           `<webcomponent-tooltip content="word">ward</webcomponent-tooltip>`
         );
       });
+
+      test("should work with a composed name in tag with a non breaking space", async () => {
+        const htmlContent = "<p>Une zone commerciale&nbsp;</p>";
+        expect(await addGlossaryContent(glossaryData, htmlContent)).toEqual(
+          `<p>Une <webcomponent-tooltip content="Definition%20de%20la%20zone%20commerciale">zone commerciale</webcomponent-tooltip>&nbsp;</p>`
+        );
+      });
+
       test("should match a variant with plural", async () => {
         const htmlContent = `wards`;
         expect(

diff --git a/targets/export-elasticsearch/src/workers/glossary/explodeGlossaryTerms.ts b/targets/export-elasticsearch/src/workers/glossary/explodeGlossaryTerms.ts
@@ -3,8 +3,8 @@ import { GlossaryTerms, Glossary, Term } from "@socialgouv/cdtn-types";
 const conventionMatchers =
   "[Cc]onventions? [Cc]ollectives?|[Aa]ccords? de [Bb]ranches?|[Dd]ispositions? [Cc]onventionnelles?";
 
-const startWordBreaks = `(?<=^| |\\.|,|'|>|\\()`;
-const endWordBreaks = `(?= |\\.|,|'|$|<|\\))`;
+const startWordBreaks = `(?<=^| |\\.|,|'|>|\\(|&nbsp;)`;
+const endWordBreaks = `(?= |\\.|,|'|$|<|\\)|&nbsp;)`;
 
 const startAnchorOmit = `(?<!<span class="(?:sub-)?title">[^<]*)`;
 const endAnchorOmit = `(?![^<]*(?:</a>|</summary>|</strong>.*</summary>|</h[1-6]>))`;