hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 05:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

search page switchmap fix

Browse Source
This commit is contained in:
lotte
2018-08-02 11:34:34 +02:00
parent f04f5a1170
commit f4826ca71e
4 changed files with 47 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,14 +77,11 @@ export class SearchPageComponent implements OnInit {
*/ */
ngOnInit(): void { ngOnInit(): void {
this.searchOptions$ = this.searchConfigService.paginatedSearchOptions; this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
let subscription; this.sub = this.searchOptions$
this.sub = this.searchOptions$.subscribe((searchOptions) => { .switchMap((options) => this.service.search(options).filter((rd) => !rd.isLoading).first())
if (hasValue(subscription)) { .subscribe((results) => {
/** Make sure no race condition is possible with a previous result coming back from the server later */ this.resultsRD$.next(results);
subscription.unsubscribe(); });
}
subscription = this.service.search(searchOptions).filter((rd) => !rd.isLoading).first().subscribe((results) => this.resultsRD$.next(results))
});
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
flatMap((scopeId) => this.service.getScopes(scopeId)) flatMap((scopeId) => this.service.getScopes(scopeId))
); );

63
src/app/+search-page/search-service/search-configuration.service.spec.ts
View File

@@ -1,13 +1,11 @@
import { SearchConfigurationService } from './search-configuration.service'; import { SearchConfigurationService } from './search-configuration.service';
import { Observable } from 'rxjs/Observable';
import { ActivatedRouteStub } from '../../shared/testing/active-router-stub'; import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
import { RemoteData } from '../../core/data/remote-data';
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { PaginatedSearchOptions } from '../paginated-search-options.model'; import { PaginatedSearchOptions } from '../paginated-search-options.model';
import { cold, hot } from 'jasmine-marbles'; import { Observable } from 'rxjs/Observable';
fdescribe('SearchConfigurationService', () => { describe('SearchConfigurationService', () => {
let service: SearchConfigurationService; let service: SearchConfigurationService;
const value1 = 'random value'; const value1 = 'random value';
const value2 = 'another value'; const value2 = 'another value';
@@ -25,8 +23,8 @@ fdescribe('SearchConfigurationService', () => {
const backendFilters = { 'f.author': ['another value'], 'f.date': ['[2013 TO 2018]'] }; const backendFilters = { 'f.author': ['another value'], 'f.date': ['[2013 TO 2018]'] };
const spy = jasmine.createSpyObj('RouteService', { const spy = jasmine.createSpyObj('RouteService', {
getQueryParameterValue: cold('a', {a: [value1, value2]}), getQueryParameterValue: Observable.of([value1, value2]),
getQueryParamsWithPrefix: cold('a', {a: prefixFilter}), getQueryParamsWithPrefix: Observable.of(prefixFilter)
}); });
const activatedRoute: any = new ActivatedRouteStub(); const activatedRoute: any = new ActivatedRouteStub();
@@ -97,38 +95,39 @@ fdescribe('SearchConfigurationService', () => {
expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('pageSize'); expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('pageSize');
}); });
}); });
fdescribe('when updateSearchOptions or updatePaginatedSearchOptions is called', () => { describe('when subscribeToSearchOptions or subscribeToPaginatedSearchOptions is called', () => {
beforeEach(() => { beforeEach(() => {
spyOn(service, 'getPaginationPart'); spyOn(service, 'getCurrentPagination').and.callThrough();
spyOn(service, 'getSortPart'); spyOn(service, 'getCurrentSort').and.callThrough();
spyOn(service, 'getScopePart'); spyOn(service, 'getCurrentScope').and.callThrough();
spyOn(service, 'getQueryPart'); spyOn(service, 'getCurrentQuery').and.callThrough();
spyOn(service, 'getFiltersPart'); spyOn(service, 'getCurrentFilters').and.callThrough();
}); });
describe('when getPaginatedSearchOptions is called', () => {
describe('when subscribeToSearchOptions is called', () => {
beforeEach(() => { beforeEach(() => {
service.subscribeToSearchOptions(defaults); service.subscribeToSearchOptions(defaults)
});
it('should call all getters it needs, but not call any others', () => {
expect(service.getCurrentPagination).not.toHaveBeenCalled();
expect(service.getCurrentSort).not.toHaveBeenCalled();
expect(service.getCurrentScope).toHaveBeenCalled();
expect(service.getCurrentQuery).toHaveBeenCalled();
expect(service.getCurrentFilters).toHaveBeenCalled();
});
});
describe('when subscribeToPaginatedSearchOptions is called', () => {
beforeEach(() => {
service.subscribeToPaginatedSearchOptions(defaults);
}); });
it('should call all getters it needs', () => { it('should call all getters it needs', () => {
expect(service.getCurrentPagination).toHaveBeenCalled();
// expect(service.getCurrentPagination).toHaveBeenCalled(); expect(service.getCurrentSort).toHaveBeenCalled();
// expect(service.getCurrentSort).toHaveBeenCalled(); expect(service.getCurrentScope).toHaveBeenCalled();
expect(service.getScopePart).toHaveBeenCalled(); expect(service.getCurrentQuery).toHaveBeenCalled();
expect(service.getQueryPart).toHaveBeenCalled(); expect(service.getCurrentFilters).toHaveBeenCalled();
expect(service.getFiltersPart).toHaveBeenCalled();
}); });
}); });
// describe('when searchOptions is called', () => {
// beforeEach(() => {
// service.searchOptions;
// });
// it('should call all getters it needs', () => {
// expect(service.getCurrentPagination).not.toHaveBeenCalled();
// expect(service.getCurrentSort).not.toHaveBeenCalled();
// expect(service.getCurrentScope).toHaveBeenCalled();
// expect(service.getCurrentQuery).toHaveBeenCalled();
// expect(service.getCurrentFilters).toHaveBeenCalled();
// });
// });
}); });
}); });

25
src/app/+search-page/search-service/search-configuration.service.ts
View File

@@ -1,7 +1,6 @@
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { SearchOptions } from '../search-options.model'; import { SearchOptions } from '../search-options.model';
import { distinctUntilChanged, map } from 'rxjs/operators';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { ActivatedRoute, Params } from '@angular/router'; import { ActivatedRoute, Params } from '@angular/router';
import { PaginatedSearchOptions } from '../paginated-search-options.model'; import { PaginatedSearchOptions } from '../paginated-search-options.model';
@@ -17,7 +16,11 @@ import { Subscription } from 'rxjs/Subscription';
*/ */
@Injectable() @Injectable()
export class SearchConfigurationService implements OnDestroy { export class SearchConfigurationService implements OnDestroy {
private defaultPagination = Object.assign(new PaginationComponentOptions(), { id: 'search-page-configuration', pageSize: 10, currentPage: 1 }); private defaultPagination = Object.assign(new PaginationComponentOptions(), {
id: 'search-page-configuration',
pageSize: 10,
currentPage: 1
});
private defaultSort = new SortOptions('score', SortDirection.DESC); private defaultSort = new SortOptions('score', SortDirection.DESC);
@@ -118,7 +121,7 @@ export class SearchConfigurationService implements OnDestroy {
}); });
} }
/** /**
* @returns {Observable<Params>} Emits the current active filters with their values as they are displayed in the frontend URL * @returns {Observable<Params>} Emits the current active filters with their values as they are displayed in the frontend URL
*/ */
getCurrentFrontendFilters(): Observable<Params> { getCurrentFrontendFilters(): Observable<Params> {
@@ -126,12 +129,6 @@ export class SearchConfigurationService implements OnDestroy {
} }
subscribeToSearchOptions(defaults: SearchOptions): Subscription { subscribeToSearchOptions(defaults: SearchOptions): Subscription {
console.log('scope: ', this.getScopePart(defaults.scope));
console.log('query: ', this.getQueryPart(defaults.query));
console.log('filters: ', this.getFiltersPart());
this.getScopePart(defaults.scope).subscribe((y) => console.log('scope: ' + JSON.stringify(y)));
this.getQueryPart(defaults.query).subscribe((y) => console.log('query: ' + JSON.stringify(y)));
this.getFiltersPart().subscribe((y) => console.log('filters: ' + JSON.stringify(y)));
return Observable.merge( return Observable.merge(
this.getScopePart(defaults.scope), this.getScopePart(defaults.scope),
this.getQueryPart(defaults.query), this.getQueryPart(defaults.query),
@@ -179,7 +176,7 @@ export class SearchConfigurationService implements OnDestroy {
}); });
} }
getScopePart(defaultScope: string): Observable<any> { private getScopePart(defaultScope: string): Observable<any> {
return this.getCurrentScope(defaultScope).map((scope) => { return this.getCurrentScope(defaultScope).map((scope) => {
return { scope } return { scope }
}); });
@@ -188,7 +185,7 @@ export class SearchConfigurationService implements OnDestroy {
/** /**
* @returns {Observable<string>} Emits the current query string * @returns {Observable<string>} Emits the current query string
*/ */
getQueryPart(defaultQuery: string): Observable<any> { private getQueryPart(defaultQuery: string): Observable<any> {
return this.getCurrentQuery(defaultQuery).map((query) => { return this.getCurrentQuery(defaultQuery).map((query) => {
return { query } return { query }
}); });
@@ -197,7 +194,7 @@ export class SearchConfigurationService implements OnDestroy {
/** /**
* @returns {Observable<string>} Emits the current pagination settings * @returns {Observable<string>} Emits the current pagination settings
*/ */
getPaginationPart(defaultPagination: PaginationComponentOptions): Observable<any> { private getPaginationPart(defaultPagination: PaginationComponentOptions): Observable<any> {
return this.getCurrentPagination(defaultPagination).map((pagination) => { return this.getCurrentPagination(defaultPagination).map((pagination) => {
return { pagination } return { pagination }
}); });
@@ -206,7 +203,7 @@ export class SearchConfigurationService implements OnDestroy {
/** /**
* @returns {Observable<string>} Emits the current sorting settings * @returns {Observable<string>} Emits the current sorting settings
*/ */
getSortPart(defaultSort: SortOptions): Observable<any> { private getSortPart(defaultSort: SortOptions): Observable<any> {
return this.getCurrentSort(defaultSort).map((sort) => { return this.getCurrentSort(defaultSort).map((sort) => {
return { sort } return { sort }
}); });
@@ -215,7 +212,7 @@ export class SearchConfigurationService implements OnDestroy {
/** /**
* @returns {Observable<Params>} Emits the current active filters with their values as they are sent to the backend * @returns {Observable<Params>} Emits the current active filters with their values as they are sent to the backend
*/ */
getFiltersPart(): Observable<any> { private getFiltersPart(): Observable<any> {
return this.getCurrentFilters().map((filters) => { return this.getCurrentFilters().map((filters) => {
return { filters } return { filters }
}); });

1
src/app/shared/services/route.service.ts
View File

@@ -17,7 +17,6 @@ export class RouteService {
} }
getQueryParameterValue(paramName: string): Observable<string> { getQueryParameterValue(paramName: string): Observable<string> {
this.route.queryParamMap.map((map) => map.get(paramName)).distinctUntilChanged().subscribe((t) => console.log('paramName: ' + paramName + 'values: ' + t));
return this.route.queryParamMap.map((map) => map.get(paramName)).distinctUntilChanged(); return this.route.queryParamMap.map((map) => map.get(paramName)).distinctUntilChanged();
} }