Merge branch 'main' into Item-page-redirects

src/app/+search-page/configuration-search-page.component.ts

@@ -1,7 +1,14 @@
 import { HostWindowService } from '../shared/host-window.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { SearchComponent } from './search.component';
-import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
@@ -27,7 +34,7 @@ import { Router } from '@angular/router';
   ]
 })
 
-export class ConfigurationSearchPageComponent extends SearchComponent implements OnInit {
+export class ConfigurationSearchPageComponent extends SearchComponent implements OnInit, OnDestroy {
   /**
    * The configuration to use for the search options
    * If empty, the configuration will be determined by the route parameter called 'configuration'
@@ -65,4 +72,17 @@ export class ConfigurationSearchPageComponent extends SearchComponent implements
       this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
     }
   }
+
+  /**
+   * Reset the updated query/configuration set in ngOnInit()
+   */
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    if (hasValue(this.configuration)) {
+      this.routeService.setParameter('configuration', undefined);
+    }
+    if (hasValue(this.fixedFilterQuery)) {
+      this.routeService.setParameter('fixedFilterQuery', undefined);
+    }
+  }
 }