fix(publication softwares): Escape regexp reserved characters

dataesr · Oct 22, 2024 · 98fc559 · 98fc559
1 parent 97574f7
commit 98fc559
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/client/src/pages/publications/[id]/components/header/index.tsx b/client/src/pages/publications/[id]/components/header/index.tsx
@@ -12,7 +12,7 @@ export default function PublicationsHeader({ data, authors, affiliations }) {
     <section>
       <div>
         <BadgeGroup>
-          <Badge color="purple-glycine" noIcon>{publicationTypeMapping[data.type]}</Badge>
+          {publicationTypeMapping[data.type] && <Badge color="purple-glycine" noIcon>{publicationTypeMapping[data.type]}</Badge>}
           <Badge color={data.isOa ? 'green-emeraude' : 'pink-macaron'} icon={data.isOa ? 'lock-unlock-line' : 'lock-line'}>
             {intl.formatMessage({ id: `publications.header.oa.${data.isOa ? "true" : "false"}` })}
           </Badge>
@@ -54,4 +54,4 @@ export default function PublicationsHeader({ data, authors, affiliations }) {
       </Row>)}
     </section>
   )
-}
+}
diff --git a/client/src/pages/publications/[id]/components/softwares/index.tsx b/client/src/pages/publications/[id]/components/softwares/index.tsx
@@ -22,9 +22,14 @@ export default function Softwares({ softwares }: { softwares: SoftwareMention[]
   const getSoftwareContexts = (softwareName: string, contexts?: string[]) => {
     if (!contexts.length) return null;
     const newContexts = contexts.map((context) => {
-      const regexp = new RegExp(softwareName, "ig")
-      const newContext = context.replace(regexp, `<strong>${softwareName}</strong>`);
-      return newContext;
+      const name = softwareName.replace(/[-[\]{}()*+?.,\\^$|#]/g, '\\$&')
+      try {
+        const regexp = new RegExp(name, "ig")
+        const newContext = context.replace(regexp, `<strong>${softwareName}</strong>`);
+        return newContext;
+      } catch (e) {
+        return context;
+      }
     });
     const stringContexts = newContexts.reduce((acc, cur) => {
       if (acc.length === 0) return cur;
@@ -84,4 +89,4 @@ export default function Softwares({ softwares }: { softwares: SoftwareMention[]
       </Col>
     </Row>
   );
-}
+}