From d8ce01b27a4f8871fa1301e2979be8b95addf7dc Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 18 Sep 2018 16:08:29 +0200
Subject: [PATCH] 55647: Intermediate FixedFilter fixes

---
 src/app/+search-page/filtered-search-page.component.ts     | 5 +++--
 src/app/+search-page/search-options.model.ts               | 3 ++-
 src/app/+search-page/search-page.component.html            | 3 ++-
 src/app/+search-page/search-page.component.ts              | 7 ++++++-
 .../search-settings/search-settings.component.ts           | 4 ++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/+search-page/filtered-search-page.component.ts b/src/app/+search-page/filtered-search-page.component.ts
index 648926e52a..e4a75e3481 100644
--- a/src/app/+search-page/filtered-search-page.component.ts
+++ b/src/app/+search-page/filtered-search-page.component.ts
@@ -27,8 +27,9 @@ export class FilteredSearchPageComponent extends SearchPageComponent {
               protected sidebarService: SearchSidebarService,
               protected windowService: HostWindowService,
               protected filterService: SearchFilterService,
-              protected searchConfigService: SearchConfigurationService) {
-    super(service, sidebarService, windowService, filterService, searchConfigService);
+              protected searchConfigService: SearchConfigurationService,
+              protected routeService: RouteService) {
+    super(service, sidebarService, windowService, filterService, searchConfigService, routeService);
   }
 
 }
diff --git a/src/app/+search-page/search-options.model.ts b/src/app/+search-page/search-options.model.ts
index 7a4a810f80..69309bed66 100644
--- a/src/app/+search-page/search-options.model.ts
+++ b/src/app/+search-page/search-options.model.ts
@@ -16,11 +16,12 @@ export class SearchOptions {
   filters?: any;
   fixedFilter?: any;
 
-  constructor(options: {scope?: string, query?: string, dsoType?: DSpaceObjectType, filters?: SearchFilter[]}) {
+  constructor(options: {scope?: string, query?: string, dsoType?: DSpaceObjectType, filters?: SearchFilter[], fixedFilter?: any}) {
       this.scope = options.scope;
       this.query = options.query;
       this.dsoType = options.dsoType;
       this.filters = options.filters;
+      this.fixedFilter = options.fixedFilter;
   }
 
   /**
diff --git a/src/app/+search-page/search-page.component.html b/src/app/+search-page/search-page.component.html
index 653f5e8cd4..aa7a117dcd 100644
--- a/src/app/+search-page/search-page.component.html
+++ b/src/app/+search-page/search-page.component.html
@@ -31,7 +31,8 @@
                             </button>
                         </div>
                         <ds-search-results [searchResults]="resultsRD$ | async"
-                                           [searchConfig]="searchOptions$ | async"></ds-search-results>
+                                           [searchConfig]="searchOptions$ | async"
+                                           [fixedFilter]="fixedFilter | async"></ds-search-results>
                     </div>
                 </div>
             </div>
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 78e30c2968..c646318de3 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -16,6 +16,7 @@ import { hasValue } from '../shared/empty.util';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { SearchConfigurationService } from './search-service/search-configuration.service';
 import { getSucceededRemoteData } from '../core/shared/operators';
+import { RouteService } from '../shared/services/route.service';
 
 /**
  * This component renders a simple item page.
@@ -61,11 +62,14 @@ export class SearchPageComponent implements OnInit {
    */
   sub: Subscription;
 
+  fixedFilter;
+
   constructor(protected service: SearchService,
               protected sidebarService: SearchSidebarService,
               protected windowService: HostWindowService,
               protected filterService: SearchFilterService,
-              protected searchConfigService: SearchConfigurationService) {
+              protected searchConfigService: SearchConfigurationService,
+              protected routeService: RouteService) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -86,6 +90,7 @@ export class SearchPageComponent implements OnInit {
     this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
       switchMap((scopeId) => this.service.getScopes(scopeId))
     );
+    this.fixedFilter = this.routeService.getRouteParameterValue('filter');
   }
 
   /**
diff --git a/src/app/+search-page/search-settings/search-settings.component.ts b/src/app/+search-page/search-settings/search-settings.component.ts
index 81e2366e39..cf9dea35f1 100644
--- a/src/app/+search-page/search-settings/search-settings.component.ts
+++ b/src/app/+search-page/search-settings/search-settings.component.ts
@@ -54,7 +54,7 @@ export class SearchSettingsComponent implements OnInit {
       },
       queryParamsHandling: 'merge'
     };
-    this.router.navigate([ '/search' ], navigationExtras);
+    this.router.navigate([ this.service.getSearchLink() ], navigationExtras);
   }
 
   /**
@@ -71,6 +71,6 @@ export class SearchSettingsComponent implements OnInit {
       },
       queryParamsHandling: 'merge'
     };
-    this.router.navigate([ '/search' ], navigationExtras);
+    this.router.navigate([ this.service.getSearchLink() ], navigationExtras);
   }
 }