Merge pull request #754 from geonetwork/DH/fix-link-detection

[Datahub] Fix : Improve linkify REGEX
geonetwork · Jan 9, 2024 · 513ce2f · 513ce2f
2 parents 5281d0d + 4c0daff
commit 513ce2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libs/ui/elements/src/lib/metadata-info/linkify.directive.spec.ts b/libs/ui/elements/src/lib/metadata-info/linkify.directive.spec.ts
@@ -51,6 +51,10 @@ const testingUrls = [
     'Thirteenth link http://foo.com/(something)?after=parens query params',
     'http://foo.com/(something)?after=parens',
   ],
+  [
+    'Fourteenth link (http://foo.com/blah) in parenthesis',
+    'http://foo.com/blah',
+  ],
 ]
 
 const testWithMultipleUrls = {

diff --git a/libs/ui/elements/src/lib/metadata-info/linkify.directive.ts b/libs/ui/elements/src/lib/metadata-info/linkify.directive.ts
@@ -40,9 +40,9 @@ export class GnUiLinkifyDirective implements OnInit {
     if (url) {
       displayValue = this.createLink(displayValue, url)
     } else {
-      const urlRegex = /\bhttps?:\/\/\S+\b[=)/]?/g
-      const matches = displayValue.match(urlRegex)
+      const urlRegex = /\bhttps?:\/\/(?:\([^\s()]+\)|[^\s()]+)+/g
 
+      const matches = displayValue.match(urlRegex)
       if (matches && matches.length > 0) {
         matches.forEach((match) => {
           url = match