Merged in task/dspace-cris-2023_02_x/DSC-1552 (pull request DSpace#1659)

Task/dspace cris 2023 02 x/DSC-1552

Author: FrancescoMolinaro

src/app/core/services/internal-link.service.spec.ts

@@ -58,7 +58,7 @@ describe('InternalLinkService', () => {
 
     it('should return unchanged link for external link', () => {
       const result = service.getRelativePath('https://externalDomain/my-link');
-      expect(result).toBe('https://externalDomain/my-link');
+      expect(result).toBe('/https://externalDomain/my-link');
     });
 
     it('should return unchanged link for internal link with leading "/"', () => {

src/app/core/services/internal-link.service.ts

@@ -39,19 +39,41 @@ export class InternalLinkService {
    * @returns The relative path for the given internal link.
    */
   public getRelativePath(link: string): string {
-    // Create a Domain object for the provided link
+    // Obtaining the base URL, disregarding query parameters
+    const baseUrl = link.split('?')[0];
     const currentDomain = new URL(this.currentURL).hostname;
 
-    if (link.startsWith(this.currentURL)) {
-      const currentSegments = link.substring(this.currentURL.length);
+    if (baseUrl.startsWith(this.currentURL) || baseUrl.startsWith(currentDomain)) {
+      const base = baseUrl.startsWith(this.currentURL) ? this.currentURL : currentDomain;
+      const currentSegments = baseUrl.substring(base.length);
       return currentSegments.startsWith('/') ? currentSegments : `/${currentSegments}`;
     }
 
-    if (link.startsWith(currentDomain)) {
-      const currentSegments = link.substring(currentDomain.length);
-      return currentSegments.startsWith('/') ? currentSegments : `/${currentSegments}`;
+    return baseUrl.startsWith('/') ? baseUrl : `/${baseUrl}`;
+  }
+
+  /**
+   * Parse the query parameters from a given URL link.
+   *
+   * @param link The URL link containing query parameters.
+   * @returns An object containing the parsed query parameters.
+   */
+  public getQueryParams(link: string): Record<string, string> {
+    const queryParams: Record<string, string> = {};
+
+    const queryStringStartIndex = link.indexOf('?');
+    if (queryStringStartIndex !== -1) {
+        const paramsString = link.substring(queryStringStartIndex + 1);
+        const paramsArray = paramsString.split('&');
+
+        paramsArray.forEach(param => {
+            const [key, value] = param.split('=');
+            if (key && value) {
+                queryParams[key] = decodeURIComponent(value.replace(/\+/g, ' '));
+            }
+        });
     }
 
-    return link;
+    return queryParams;
   }
 }