Merge branch 'dspace-cris-2023_02_x' into task/dspace-cris-2023_02_x/DSC-1650-davide

# Conflicts:
#	src/app/shared/browse-most-elements/browse-most-elements.component.html
#	src/app/shared/browse-most-elements/browse-most-elements.component.ts
#	src/app/shared/browse-most-elements/themed-browse-most-elements.component.ts
#	src/app/shared/explore/section-component/top-section/top-section.component.html
#	src/app/shared/explore/section-component/top-section/top-section.component.ts

Author: alisaismailati

config/config.example.yml

@@ -275,6 +275,8 @@ browseBy:
   fiveYearLimit: 30
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
+  # Whether to add item badges to BOTH browse and search result lists.
+  showLabels: true
   # If true, thumbnail images for items will be added to BOTH search and browse result lists.
   showThumbnails: true
   # Whether to add item thumbnail images to BOTH browse and search result lists.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.05-SNAPSHOT",
+  "version": "2023.02.06-SNAPHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

src/app/app-routing.module.ts

@@ -43,6 +43,7 @@ import {
 import { ServerCheckGuard } from './core/server-check/server-check.guard';
 import { MenuResolver } from './menu.resolver';
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
 import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
 import { RedirectService } from './redirect/redirect.service';
 
@@ -99,7 +100,10 @@ import { RedirectService } from './redirect/redirect.service';
             path: FORGOT_PASSWORD_PATH,
             loadChildren: () => import('./forgot-password/forgot-password.module')
               .then((m) => m.ForgotPasswordModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [
+              ForgotPasswordCheckGuard,
+              EndUserAgreementCurrentUserGuard
+            ]
           },
           {
             path: COMMUNITY_MODULE_PATH,

src/app/core/data/feature-authorization/feature-id.ts

@@ -36,6 +36,7 @@ export enum FeatureID {
   CanEditItem = 'canEditItem',
   CanRegisterDOI = 'canRegisterDOI',
   CanSubscribe = 'canSubscribeDso',
+  EPersonForgotPassword = 'epersonForgotPassword',
   ShowClaimItem = 'showClaimItem',
   CanCorrectItem = 'canCorrectItem',
 }

src/app/core/data/processes/process-data.service.ts

@@ -123,8 +123,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
    * @param processId The ID of the process
    */
   getProcess(processId: string): Observable<RemoteData<Process>> {
-    const href$ = this.getProcessEndpoint(processId);
-    return this.findByHref(href$,false);
+    return this.findById(processId, false);
   }
 
   /**

src/app/core/locale/locale.service.ts

@@ -53,6 +53,7 @@ export class LocaleService {
     this.routeService.getQueryParameterValue('lang').subscribe(lang => {
       if (lang && this.translate.getLangs().includes(lang)) {
         this.setCurrentLanguageCode(lang);
+        this.routeService.removeQueryParam('lang');
       }
     });
   }

src/app/core/rest-property/forgot-password-check-guard.guard.ts

@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of } from 'rxjs';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+import {
+  SingleFeatureAuthorizationGuard
+} from '../data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard';
+import { AuthService } from '../auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard that checks if the forgot-password feature is enabled
+ */
+export class ForgotPasswordCheckGuard extends SingleFeatureAuthorizationGuard {
+
+  constructor(
+    protected readonly authorizationService: AuthorizationDataService,
+    protected readonly router: Router,
+    protected readonly authService: AuthService
+  ) {
+    super(authorizationService, router, authService);
+  }
+
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return of(FeatureID.EPersonForgotPassword);
+  }
+
+}

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;
   }
 }

src/app/core/services/route.service.ts

@@ -225,4 +225,23 @@ export class RouteService {
         }
       );
   }
+
+  /**
+   * Remove a parameter from the current route
+   * @param key The parameter name
+   */
+  removeQueryParam(key: string) {
+    let queryParams = { ...this.route.snapshot.queryParams };
+    delete queryParams[key];
+
+    // Navigate to the same route with the updated queryParams
+    this.router.navigate(
+      [],
+      {
+        relativeTo: this.route,
+        queryParams: queryParams,
+      }
+    );
+
+  }
 }