fix(linkify): include trailing slash in URL if present

geonetwork · Nov 28, 2023 · 70c3a51 · 70c3a51
1 parent ef6a273
commit 70c3a51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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
@@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser'
 import { GnUiLinkifyDirective } from './linkify.directive'
 
 @Component({
-  template: `<div [gnUiLinkify]>Click this link https://www.example.com</div>`,
+  template: `<div [gnUiLinkify]>Click this link https://www.example.com/</div>`,
 })
 class TestComponent {}
 
@@ -32,7 +32,7 @@ describe('GnUiLinkifyDirective', () => {
     const anchorElement = debugElement.query(By.css('a'))
 
     const href = anchorElement.nativeElement.getAttribute('href')
-    expect(href).toBe('https://www.example.com')
+    expect(href).toBe('https://www.example.com/')
   })
 
   it('should have the target attribute set to "_blank"', () => {

diff --git a/libs/ui/elements/src/lib/metadata-info/linkify.directive.ts b/libs/ui/elements/src/lib/metadata-info/linkify.directive.ts
@@ -30,7 +30,7 @@ export class GnUiLinkifyDirective implements OnInit {
   }
 
   private linkifyText(text: string): string {
-    return text.replace(/(\bhttps?:\/\/\S+\b)/g, (match) => {
+    return text.replace(/(\bhttps?:\/\/\S+\b\/?)/g, (match) => {
       return `<a href="${match}" target="_blank"
                   class="text-primary cursor-pointer hover:underline">${match} <mat-icon class="material-symbols-outlined !w-[12px] !h-[14px] !text-[14px] opacity-75">open_in_new</mat-icon></a>`
     })