fix(frontend): replace markdown with html when update ES (#179) (#181)

SocialGouv · Nov 17, 2020 · 6fef358 · 6fef358
1 parent 25f3143
commit 6fef358
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/targets/frontend/src/components/editor/CodeEditor.js b/targets/frontend/src/components/editor/CodeEditor.js
@@ -14,6 +14,7 @@ export default function CodeEditor({ onChange, value }) {
       theme="github"
       name="EditJsonContent"
       setOptions={{
+        useWorker: false,
         wrap: true,
       }}
       editorProps={{ $blockScrolling: true }}

diff --git a/targets/frontend/src/lib/preview/glossary.js b/targets/frontend/src/lib/preview/glossary.js
@@ -23,25 +23,38 @@ export function addGlossary(entries, htmlContent) {
   let idHtmlContent = htmlContent;
 
   let glossary = [];
-  entries.forEach(({ abbrs, definition, title, variants }) => {
-    glossary = glossary.concat(
-      [title, ...variants].map((term) => ({
-        definition,
-        pattern: new RegExp(
-          `${startTag}${wordBoundaryStart}(${term})${wordBoundaryEnd}${endTag}`,
-          "gi"
-        ),
-        term,
-      }))
-    );
-    if (abbrs) {
-      glossary.push({
-        definition,
-        pattern: new RegExp(`${startTag}\\b(${abbrs})\\b${endTag}`, "g"),
-        term: abbrs,
-      });
+  entries.forEach(
+    ({
+      abbreviations: abbreviationsRaw,
+      definition,
+      term,
+      variants: variantsRaw,
+    }) => {
+      const abbreviations = JSON.parse(abbreviationsRaw);
+      const variants = JSON.parse(variantsRaw);
+
+      glossary = glossary.concat(
+        [term, ...variants].map((term) => ({
+          definition,
+          pattern: new RegExp(
+            `${startTag}${wordBoundaryStart}(${term})${wordBoundaryEnd}${endTag}`,
+            "gi"
+          ),
+          term,
+        }))
+      );
+
+      if (abbreviations.length) {
+        for (const word of abbreviations) {
+          glossary.push({
+            definition,
+            pattern: new RegExp(`${startTag}\\b(${word})\\b${endTag}`, "g"),
+            term: word,
+          });
+        }
+      }
     }
-  });
+  );
 
   // we make sure that bigger terms are replaced first
   glossary.sort((previous, next) => {

diff --git a/targets/frontend/src/pages/api/preview.js b/targets/frontend/src/pages/api/preview.js
@@ -56,7 +56,11 @@ export default async function (req, res) {
     });
     res.json({ message: "doc updated!" });
   } catch (response) {
-    console.error(response.body.error);
+    if (response.body) {
+      console.error(response.body.error);
+    } else {
+      console.error(response);
+    }
     res.status(response.statusCode).json({ message: response.body.error });
   }
 }

diff --git a/targets/frontend/src/pages/contenus/[id].js b/targets/frontend/src/pages/contenus/[id].js
@@ -52,7 +52,7 @@ mutation updateDocument($cdtnId: String!, $metaDescription: String!, $title: Str
   }
 }`;
 
-export function DocumentsPage() {
+export function DocumentPage() {
   const router = useRouter();
 
   const [result] = useQuery({
@@ -148,4 +148,4 @@ export function DocumentsPage() {
   );
 }
 
-export default withCustomUrqlClient(withUserProvider(DocumentsPage));
+export default withCustomUrqlClient(withUserProvider(DocumentPage));