hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

55647: Intermediate FixedFilter fixes

Browse Source
This commit is contained in:
Kristof De Langhe
2018-09-18 16:08:29 +02:00
parent 363e1459cc
commit d8ce01b27a
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/+search-page/filtered-search-page.component.ts
View File

@@ -27,8 +27,9 @@ export class FilteredSearchPageComponent extends SearchPageComponent {
protected sidebarService: SearchSidebarService, protected sidebarService: SearchSidebarService,
protected windowService: HostWindowService, protected windowService: HostWindowService,
protected filterService: SearchFilterService, protected filterService: SearchFilterService,
protected searchConfigService: SearchConfigurationService) { protected searchConfigService: SearchConfigurationService,
super(service, sidebarService, windowService, filterService, searchConfigService); protected routeService: RouteService) {
super(service, sidebarService, windowService, filterService, searchConfigService, routeService);
} }
} }

3
src/app/+search-page/search-options.model.ts
View File

@@ -16,11 +16,12 @@ export class SearchOptions {
filters?: any; filters?: any;
fixedFilter?: 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.scope = options.scope;
this.query = options.query; this.query = options.query;
this.dsoType = options.dsoType; this.dsoType = options.dsoType;
this.filters = options.filters; this.filters = options.filters;
this.fixedFilter = options.fixedFilter;
} }
/** /**

3
src/app/+search-page/search-page.component.html
View File

@@ -31,7 +31,8 @@
</button> </button>
</div> </div>
<ds-search-results [searchResults]="resultsRD$ | async" <ds-search-results [searchResults]="resultsRD$ | async"
[searchConfig]="searchOptions$ | async"></ds-search-results> [searchConfig]="searchOptions$ | async"
[fixedFilter]="fixedFilter | async"></ds-search-results>
</div> </div>
</div> </div>
</div> </div>

7
src/app/+search-page/search-page.component.ts
View File

@@ -16,6 +16,7 @@ import { hasValue } from '../shared/empty.util';
import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { SearchConfigurationService } from './search-service/search-configuration.service'; import { SearchConfigurationService } from './search-service/search-configuration.service';
import { getSucceededRemoteData } from '../core/shared/operators'; import { getSucceededRemoteData } from '../core/shared/operators';
import { RouteService } from '../shared/services/route.service';
/** /**
* This component renders a simple item page. * This component renders a simple item page.
@@ -61,11 +62,14 @@ export class SearchPageComponent implements OnInit {
*/ */
sub: Subscription; sub: Subscription;
fixedFilter;
constructor(protected service: SearchService, constructor(protected service: SearchService,
protected sidebarService: SearchSidebarService, protected sidebarService: SearchSidebarService,
protected windowService: HostWindowService, protected windowService: HostWindowService,
protected filterService: SearchFilterService, protected filterService: SearchFilterService,
protected searchConfigService: SearchConfigurationService) { protected searchConfigService: SearchConfigurationService,
protected routeService: RouteService) {
this.isXsOrSm$ = this.windowService.isXsOrSm(); this.isXsOrSm$ = this.windowService.isXsOrSm();
} }
@@ -86,6 +90,7 @@ export class SearchPageComponent implements OnInit {
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
switchMap((scopeId) => this.service.getScopes(scopeId)) switchMap((scopeId) => this.service.getScopes(scopeId))
); );
this.fixedFilter = this.routeService.getRouteParameterValue('filter');
} }
/** /**

4
src/app/+search-page/search-settings/search-settings.component.ts
View File

@@ -54,7 +54,7 @@ export class SearchSettingsComponent implements OnInit {
}, },
queryParamsHandling: 'merge' 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' queryParamsHandling: 'merge'
}; };
this.router.navigate([ '/search' ], navigationExtras); this.router.navigate([ this.service.getSearchLink() ], navigationExtras);
} }
} }