Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-1852

Author: Andrea Barbasso

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/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,
+      }
+    );
+
+  }
 }

src/app/shared/cookies/browser-klaro.service.ts

@@ -264,7 +264,7 @@ export class BrowserKlaroService extends KlaroService {
    * Show the cookie consent form
    */
   showSettings() {
-    this.lazyKlaro.then(({show}) => show(this.klaroConfig));
+    void this.lazyKlaro.then(({show}) => show(this.klaroConfig, true));
   }
 
   /**

src/app/shared/testing/route-service.stub.ts

@@ -37,6 +37,9 @@ export const routeServiceStub: any = {
   },
   getPreviousUrl: () => {
     return observableOf('/home');
+  },
+  removeQueryParam: () => {
+    return;
   }
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };