+
+ [resultCount]="(resultsRD$ | async)?.payload.totalElements">
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index 96820e8a0b..57b8caaddc 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -19,6 +19,8 @@ import { By } from '@angular/platform-browser';
import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
+import { SearchConfigurationService } from './search-service/search-configuration.service';
+import { RemoteData } from '../core/data/remote-data';
describe('SearchPageComponent', () => {
let comp: SearchPageComponent;
@@ -35,19 +37,20 @@ describe('SearchPageComponent', () => {
pagination.currentPage = 1;
pagination.pageSize = 10;
const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
- const mockResults = Observable.of(['test', 'data']);
+ const mockResults = Observable.of(new RemoteData(false, false, true, null,['test', 'data']));
const searchServiceStub = jasmine.createSpyObj('SearchService', {
search: mockResults,
- getSearchLink: '/search'
+ getSearchLink: '/search',
+ getScopes: Observable.of(['test-scope'])
});
const queryParam = 'test query';
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
const paginatedSearchOptions = {
- query: queryParam,
- scope: scopeParam,
- pagination,
- sort
- };
+ query: queryParam,
+ scope: scopeParam,
+ pagination,
+ sort
+ };
const activatedRouteStub = {
queryParams: Observable.of({
query: queryParam,
@@ -76,11 +79,11 @@ describe('SearchPageComponent', () => {
},
{
provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService',
- {
- isXs: Observable.of(true),
- isSm: Observable.of(false),
- isXsOrSm: Observable.of(true)
- })
+ {
+ isXs: Observable.of(true),
+ isSm: Observable.of(false),
+ isXsOrSm: Observable.of(true)
+ })
},
{
provide: SearchSidebarService,
@@ -88,16 +91,20 @@ describe('SearchPageComponent', () => {
},
{
provide: SearchFilterService,
- useValue: jasmine.createSpyObj('SearchFilterService', {
- getPaginatedSearchOptions: hot('a', {
+ useValue: {}
+ }, {
+ provide: SearchConfigurationService,
+ useValue: {
+ paginatedSearchOptions: hot('a', {
a: paginatedSearchOptions
- })
- })
+ }),
+ getCurrentScope: (a) => Observable.of('test-id')
+ }
},
],
schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(SearchPageComponent, {
- set: { changeDetection: ChangeDetectionStrategy.Default }
+ set: { changeDetection: ChangeDetectionStrategy.Default }
}).compileComponents();
}));
@@ -171,4 +178,5 @@ describe('SearchPageComponent', () => {
});
});
-});
+})
+;
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 63e72960d8..893395719a 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,11 +1,8 @@
-import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs/Observable';
-import { flatMap, } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { CommunityDataService } from '../core/data/community-data.service';
+import { flatMap, switchMap, } from 'rxjs/operators';
import { PaginatedList } from '../core/data/paginated-list';
import { RemoteData } from '../core/data/remote-data';
-import { Community } from '../core/shared/community.model';
import { DSpaceObject } from '../core/shared/dspace-object.model';
import { pushInOut } from '../shared/animations/push';
import { HostWindowService } from '../shared/host-window.service';
@@ -14,6 +11,10 @@ import { SearchFilterService } from './search-filters/search-filter/search-filte
import { SearchResult } from './search-result.model';
import { SearchService } from './search-service/search.service';
import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
+import { Subscription } from 'rxjs/Subscription';
+import { hasValue } from '../shared/empty.util';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { SearchConfigurationService } from './search-service/search-configuration.service';
/**
* This component renders a simple item page.
@@ -28,54 +29,99 @@ import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [pushInOut]
})
+
+/**
+ * This component represents the whole search page
+ */
export class SearchPageComponent implements OnInit {
- resultsRD$: Observable
>>>;
+ /**
+ * The current search results
+ */
+ resultsRD$: BehaviorSubject>>> = new BehaviorSubject(null);
+
+ /**
+ * The current paginated search options
+ */
searchOptions$: Observable;
- sortConfig: SortOptions;
- scopeListRD$: Observable>>;
+
+ /**
+ * The current relevant scopes
+ */
+ scopeListRD$: Observable;
+
+ /**
+ * Emits true if were on a small screen
+ */
isXsOrSm$: Observable;
- pageSize;
- pageSizeOptions;
- defaults = {
- pagination: {
- id: 'search-results-pagination',
- pageSize: 10
- },
- sort: new SortOptions('score', SortDirection.DESC),
- query: '',
- scope: ''
- };
+
+ /**
+ * Subscription to unsubscribe from
+ */
+ sub: Subscription;
constructor(private service: SearchService,
- private communityService: CommunityDataService,
private sidebarService: SearchSidebarService,
private windowService: HostWindowService,
- private filterService: SearchFilterService) {
+ private filterService: SearchFilterService,
+ private searchConfigService: SearchConfigurationService) {
this.isXsOrSm$ = this.windowService.isXsOrSm();
- this.scopeListRD$ = communityService.findAll();
}
+ /**
+ * Listening to changes in the paginated search options
+ * If something changes, update the search results
+ *
+ * Listen to changes in the scope
+ * If something changes, update the list of scopes for the dropdown
+ */
ngOnInit(): void {
- this.searchOptions$ = this.filterService.getPaginatedSearchOptions(this.defaults);
- this.resultsRD$ = this.searchOptions$.pipe(
- flatMap((searchOptions) => this.service.search(searchOptions))
+ this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
+ this.sub = this.searchOptions$
+ .switchMap((options) => this.service.search(options).filter((rd) => !rd.isLoading).first())
+ .subscribe((results) => {
+ this.resultsRD$.next(results);
+ });
+ this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
+ switchMap((scopeId) => this.service.getScopes(scopeId))
);
}
+ /**
+ * Set the sidebar to a collapsed state
+ */
public closeSidebar(): void {
this.sidebarService.collapse()
}
+ /**
+ * Set the sidebar to an expanded state
+ */
public openSidebar(): void {
this.sidebarService.expand();
}
+ /**
+ * Check if the sidebar is collapsed
+ * @returns {Observable} emits true if the sidebar is currently collapsed, false if it is expanded
+ */
public isSidebarCollapsed(): Observable {
return this.sidebarService.isCollapsed;
}
+ /**
+ * @returns {string} The base path to the search page
+ */
public getSearchLink(): string {
return this.service.getSearchLink();
}
+
+ /**
+ * Unsubscribe from the subscription
+ */
+ ngOnDestroy(): void {
+ if (hasValue(this.sub)) {
+ this.sub.unsubscribe();
+ }
+ }
}
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index 1468fe532e..0c8a4ee306 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -21,6 +21,13 @@ import { SearchFiltersComponent } from './search-filters/search-filters.componen
import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
+import { SearchLabelsComponent } from './search-labels/search-labels.component';
+import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
+import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
+import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
+import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
+import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchConfigurationService } from './search-service/search-configuration.service';
const effects = [
SearchSidebarEffects
@@ -48,12 +55,20 @@ const effects = [
CommunitySearchResultListElementComponent,
SearchFiltersComponent,
SearchFilterComponent,
- SearchFacetFilterComponent
+ SearchFacetFilterComponent,
+ SearchLabelsComponent,
+ SearchFacetFilterComponent,
+ SearchFacetFilterWrapperComponent,
+ SearchRangeFilterComponent,
+ SearchTextFilterComponent,
+ SearchHierarchyFilterComponent,
+ SearchBooleanFilterComponent,
],
providers: [
SearchService,
SearchSidebarService,
- SearchFilterService
+ SearchFilterService,
+ SearchConfigurationService
],
entryComponents: [
ItemSearchResultListElementComponent,
@@ -62,7 +77,16 @@ const effects = [
ItemSearchResultGridElementComponent,
CollectionSearchResultGridElementComponent,
CommunitySearchResultGridElementComponent,
+ SearchFacetFilterComponent,
+ SearchRangeFilterComponent,
+ SearchTextFilterComponent,
+ SearchHierarchyFilterComponent,
+ SearchBooleanFilterComponent,
]
})
+
+/**
+ * This module handles all components and pipes that are necessary for the search page
+ */
export class SearchPageModule {
}
diff --git a/src/app/+search-page/search-result.model.ts b/src/app/+search-page/search-result.model.ts
index cc2bd8cd58..00b1c62a99 100644
--- a/src/app/+search-page/search-result.model.ts
+++ b/src/app/+search-page/search-result.model.ts
@@ -2,9 +2,18 @@ import { DSpaceObject } from '../core/shared/dspace-object.model';
import { Metadatum } from '../core/shared/metadatum.model';
import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
+/**
+ * Represents a search result object of a certain () DSpaceObject
+ */
export class SearchResult implements ListableObject {
-
+ /**
+ * The DSpaceObject that was found
+ */
dspaceObject: T;
+
+ /**
+ * The metadata that was used to find this item, hithighlighted
+ */
hitHighlights: Metadatum[];
}
diff --git a/src/app/+search-page/search-results/search-results.component.ts b/src/app/+search-page/search-results/search-results.component.ts
index 14ccb5d541..6399243f92 100644
--- a/src/app/+search-page/search-results/search-results.component.ts
+++ b/src/app/+search-page/search-results/search-results.component.ts
@@ -2,16 +2,11 @@ import { Component, Input } from '@angular/core';
import { RemoteData } from '../../core/data/remote-data';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { SearchOptions, ViewMode } from '../search-options.model';
-import { SortOptions } from '../../core/cache/models/sort-options.model';
+import { SearchOptions } from '../search-options.model';
import { SearchResult } from '../search-result.model';
import { PaginatedList } from '../../core/data/paginated-list';
+import { ViewMode } from '../../core/shared/view-mode.model';
-/**
- * This component renders a simple item page.
- * The route parameter 'id' is used to request the item it represents.
- * All fields of the item that should be displayed, are defined in its template.
- */
@Component({
selector: 'ds-search-results',
templateUrl: './search-results.component.html',
@@ -20,9 +15,24 @@ import { PaginatedList } from '../../core/data/paginated-list';
fadeInOut
]
})
+
+/**
+ * Component that represents all results from a search
+ */
export class SearchResultsComponent {
+ /**
+ * The actual search result objects
+ */
@Input() searchResults: RemoteData>>;
+
+ /**
+ * The current configuration of the search
+ */
@Input() searchConfig: SearchOptions;
- @Input() sortConfig: SortOptions;
+
+ /**
+ * The current view mode for the search results
+ */
@Input() viewMode: ViewMode;
+
}
diff --git a/src/app/+search-page/search-service/facet-value.model.ts b/src/app/+search-page/search-service/facet-value.model.ts
index 06eb50bc6b..a597528d50 100644
--- a/src/app/+search-page/search-service/facet-value.model.ts
+++ b/src/app/+search-page/search-service/facet-value.model.ts
@@ -1,13 +1,25 @@
import { autoserialize, autoserializeAs } from 'cerialize';
+/**
+ * Class representing possible values for a certain filter
+ */
export class FacetValue {
+ /**
+ * The display value of the facet value
+ */
@autoserializeAs(String, 'label')
value: string;
+ /**
+ * The number of results this facet value would have if selected
+ */
@autoserialize
count: number;
+ /**
+ * The REST url to add this filter value
+ */
@autoserialize
search: string;
}
diff --git a/src/app/+search-page/search-service/filter-type.model.ts b/src/app/+search-page/search-service/filter-type.model.ts
index 354ca87f98..d9b9629347 100644
--- a/src/app/+search-page/search-service/filter-type.model.ts
+++ b/src/app/+search-page/search-service/filter-type.model.ts
@@ -1,6 +1,24 @@
+/**
+ * Enumeration containing all possible types for filters
+ */
export enum FilterType {
- text,
- date,
- hierarchical,
- standard
+ /**
+ * Represents simple text facets
+ */
+ text = 'text',
+
+ /**
+ * Represents date facets
+ */
+ range = 'date',
+
+ /**
+ * Represents hierarchically structured facets
+ */
+ hierarchy = 'hierarchical',
+
+ /**
+ * Represents binary facets
+ */
+ boolean = 'standard'
}
diff --git a/src/app/+search-page/search-service/search-configuration.service.spec.ts b/src/app/+search-page/search-service/search-configuration.service.spec.ts
new file mode 100644
index 0000000000..af1b19f06a
--- /dev/null
+++ b/src/app/+search-page/search-service/search-configuration.service.spec.ts
@@ -0,0 +1,133 @@
+import { SearchConfigurationService } from './search-configuration.service';
+import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginatedSearchOptions } from '../paginated-search-options.model';
+import { Observable } from 'rxjs/Observable';
+
+describe('SearchConfigurationService', () => {
+ let service: SearchConfigurationService;
+ const value1 = 'random value';
+ const value2 = 'another value';
+ const prefixFilter = {
+ 'f.author': ['another value'],
+ 'f.date.min': ['2013'],
+ 'f.date.max': ['2018']
+ };
+ const defaults = Object.assign(new PaginatedSearchOptions(), {
+ pagination: Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 }),
+ sort: new SortOptions('score', SortDirection.DESC),
+ query: '',
+ scope: ''
+ });
+ const backendFilters = { 'f.author': ['another value'], 'f.date': ['[2013 TO 2018]'] };
+
+ const spy = jasmine.createSpyObj('RouteService', {
+ getQueryParameterValue: Observable.of([value1, value2]),
+ getQueryParamsWithPrefix: Observable.of(prefixFilter)
+ });
+
+ const activatedRoute: any = new ActivatedRouteStub();
+
+ beforeEach(() => {
+ service = new SearchConfigurationService(spy, activatedRoute);
+ });
+
+ describe('when the scope is called', () => {
+ beforeEach(() => {
+ service.getCurrentScope('');
+ });
+ it('should call getQueryParameterValue on the routeService with parameter name \'scope\'', () => {
+ expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('scope');
+ });
+ });
+
+ describe('when getCurrentQuery is called', () => {
+ beforeEach(() => {
+ service.getCurrentQuery('');
+ });
+ it('should call getQueryParameterValue on the routeService with parameter name \'query\'', () => {
+ expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('query');
+ });
+ });
+
+ describe('when getCurrentFrontendFilters is called', () => {
+ beforeEach(() => {
+ service.getCurrentFrontendFilters();
+ });
+ it('should call getQueryParamsWithPrefix on the routeService with parameter prefix \'f.\'', () => {
+ expect((service as any).routeService.getQueryParamsWithPrefix).toHaveBeenCalledWith('f.');
+ });
+ });
+
+ describe('when getCurrentFilters is called', () => {
+ let parsedValues$;
+ beforeEach(() => {
+ parsedValues$ = service.getCurrentFilters();
+ });
+ it('should call getQueryParamsWithPrefix on the routeService with parameter prefix \'f.\'', () => {
+ expect((service as any).routeService.getQueryParamsWithPrefix).toHaveBeenCalledWith('f.');
+ parsedValues$.subscribe((values) => {
+ expect(values).toEqual(backendFilters);
+ });
+ });
+ });
+
+ describe('when getCurrentSort is called', () => {
+ beforeEach(() => {
+ service.getCurrentSort({} as any);
+ });
+ it('should call getQueryParameterValue on the routeService with parameter name \'sortDirection\'', () => {
+ expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('sortDirection');
+ });
+ it('should call getQueryParameterValue on the routeService with parameter name \'sortField\'', () => {
+ expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('sortField');
+ });
+ });
+ describe('when getCurrentPagination is called', () => {
+ beforeEach(() => {
+ service.getCurrentPagination({ currentPage: 1, pageSize: 10 } as any);
+ });
+ it('should call getQueryParameterValue on the routeService with parameter name \'page\'', () => {
+ expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('page');
+ });
+ it('should call getQueryParameterValue on the routeService with parameter name \'pageSize\'', () => {
+ expect((service as any).routeService.getQueryParameterValue).toHaveBeenCalledWith('pageSize');
+ });
+ });
+ describe('when subscribeToSearchOptions or subscribeToPaginatedSearchOptions is called', () => {
+ beforeEach(() => {
+ spyOn(service, 'getCurrentPagination').and.callThrough();
+ spyOn(service, 'getCurrentSort').and.callThrough();
+ spyOn(service, 'getCurrentScope').and.callThrough();
+ spyOn(service, 'getCurrentQuery').and.callThrough();
+ spyOn(service, 'getCurrentFilters').and.callThrough();
+ });
+
+ describe('when subscribeToSearchOptions is called', () => {
+ beforeEach(() => {
+ 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', () => {
+ expect(service.getCurrentPagination).toHaveBeenCalled();
+ expect(service.getCurrentSort).toHaveBeenCalled();
+ expect(service.getCurrentScope).toHaveBeenCalled();
+ expect(service.getCurrentQuery).toHaveBeenCalled();
+ expect(service.getCurrentFilters).toHaveBeenCalled();
+ });
+ });
+ });
+});
diff --git a/src/app/+search-page/search-service/search-configuration.service.ts b/src/app/+search-page/search-service/search-configuration.service.ts
new file mode 100644
index 0000000000..8ad0b684ad
--- /dev/null
+++ b/src/app/+search-page/search-service/search-configuration.service.ts
@@ -0,0 +1,267 @@
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { SearchOptions } from '../search-options.model';
+import { Observable } from 'rxjs/Observable';
+import { ActivatedRoute, Params } from '@angular/router';
+import { PaginatedSearchOptions } from '../paginated-search-options.model';
+import { Injectable, OnDestroy } from '@angular/core';
+import { RouteService } from '../../shared/services/route.service';
+import { hasNoValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { RemoteData } from '../../core/data/remote-data';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { Subscription } from 'rxjs/Subscription';
+
+/**
+ * Service that performs all actions that have to do with the current search configuration
+ */
+@Injectable()
+export class SearchConfigurationService implements OnDestroy {
+ /**
+ * Default pagination settings
+ */
+ private defaultPagination = Object.assign(new PaginationComponentOptions(), {
+ id: 'search-page-configuration',
+ pageSize: 10,
+ currentPage: 1
+ });
+
+ /**
+ * Default sort settings
+ */
+ private defaultSort = new SortOptions('score', SortDirection.DESC);
+
+ /**
+ * Default scope setting
+ */
+ private defaultScope = '';
+
+ /**
+ * Default query setting
+ */
+ private defaultQuery = '';
+
+ /**
+ * Emits the current default values
+ */
+ private _defaults: Observable>;
+
+ /**
+ * Emits the current search options
+ */
+ public searchOptions: BehaviorSubject;
+
+ /**
+ * Emits the current search options including pagination and sort
+ */
+ public paginatedSearchOptions: BehaviorSubject;
+
+ /**
+ * List of subscriptions to unsubscribe from on destroy
+ */
+ private subs: Subscription[] = new Array();
+
+ /**
+ * Initialize the search options
+ * @param {RouteService} routeService
+ * @param {ActivatedRoute} route
+ */
+ constructor(private routeService: RouteService,
+ private route: ActivatedRoute) {
+ this.defaults.first().subscribe((defRD) => {
+ const defs = defRD.payload;
+ this.paginatedSearchOptions = new BehaviorSubject(defs);
+ this.searchOptions = new BehaviorSubject(defs);
+
+ this.subs.push(this.subscribeToSearchOptions(defs));
+ this.subs.push(this.subscribeToPaginatedSearchOptions(defs));
+ }
+ )
+ }
+
+ /**
+ * @returns {Observable} Emits the current scope's identifier
+ */
+ getCurrentScope(defaultScope: string) {
+ return this.routeService.getQueryParameterValue('scope').map((scope) => {
+ return scope || defaultScope;
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current query string
+ */
+ getCurrentQuery(defaultQuery: string) {
+ return this.routeService.getQueryParameterValue('query').map((query) => {
+ return query || defaultQuery;
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current pagination settings
+ */
+ getCurrentPagination(defaultPagination: PaginationComponentOptions): Observable {
+ const page$ = this.routeService.getQueryParameterValue('page');
+ const size$ = this.routeService.getQueryParameterValue('pageSize');
+ return Observable.combineLatest(page$, size$, (page, size) => {
+ return Object.assign(new PaginationComponentOptions(), defaultPagination, {
+ currentPage: page || defaultPagination.currentPage,
+ pageSize: size || defaultPagination.pageSize
+ });
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current sorting settings
+ */
+ getCurrentSort(defaultSort: SortOptions): Observable {
+ const sortDirection$ = this.routeService.getQueryParameterValue('sortDirection');
+ const sortField$ = this.routeService.getQueryParameterValue('sortField');
+ return Observable.combineLatest(sortDirection$, sortField$, (sortDirection, sortField) => {
+ // Dirty fix because sometimes the observable value is null somehow
+ sortField = this.route.snapshot.queryParamMap.get('sortField');
+
+ const field = sortField || defaultSort.field;
+ const direction = SortDirection[sortDirection] || defaultSort.direction;
+ return new SortOptions(field, direction)
+ }
+ )
+ }
+
+ /**
+ * @returns {Observable} Emits the current active filters with their values as they are sent to the backend
+ */
+ getCurrentFilters(): Observable {
+ return this.routeService.getQueryParamsWithPrefix('f.').map((filterParams) => {
+ if (isNotEmpty(filterParams)) {
+ const params = {};
+ Object.keys(filterParams).forEach((key) => {
+ if (key.endsWith('.min') || key.endsWith('.max')) {
+ const realKey = key.slice(0, -4);
+ if (isEmpty(params[realKey])) {
+ const min = filterParams[realKey + '.min'] ? filterParams[realKey + '.min'][0] : '*';
+ const max = filterParams[realKey + '.max'] ? filterParams[realKey + '.max'][0] : '*';
+ params[realKey] = ['[' + min + ' TO ' + max + ']'];
+ }
+ } else {
+ params[key] = filterParams[key];
+ }
+ });
+ return params;
+ }
+ return filterParams;
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current active filters with their values as they are displayed in the frontend URL
+ */
+ getCurrentFrontendFilters(): Observable {
+ return this.routeService.getQueryParamsWithPrefix('f.');
+ }
+
+ /**
+ * Sets up a subscription to all necessary parameters to make sure the searchOptions emits a new value every time they update
+ * @param {SearchOptions} defaults Default values for when no parameters are available
+ * @returns {Subscription} The subscription to unsubscribe from
+ */
+ subscribeToSearchOptions(defaults: SearchOptions): Subscription {
+ return Observable.merge(
+ this.getScopePart(defaults.scope),
+ this.getQueryPart(defaults.query),
+ this.getFiltersPart()
+ ).subscribe((update) => {
+ const currentValue: SearchOptions = this.searchOptions.getValue();
+ const updatedValue: SearchOptions = Object.assign(new SearchOptions(), currentValue, update);
+ this.searchOptions.next(updatedValue);
+ });
+ }
+
+ /**
+ * Sets up a subscription to all necessary parameters to make sure the paginatedSearchOptions emits a new value every time they update
+ * @param {PaginatedSearchOptions} defaults Default values for when no parameters are available
+ * @returns {Subscription} The subscription to unsubscribe from
+ */
+ subscribeToPaginatedSearchOptions(defaults: PaginatedSearchOptions): Subscription {
+ return Observable.merge(
+ this.getPaginationPart(defaults.pagination),
+ this.getSortPart(defaults.sort),
+ this.getScopePart(defaults.scope),
+ this.getQueryPart(defaults.query),
+ this.getFiltersPart()
+ ).subscribe((update) => {
+ const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
+ const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions(), currentValue, update);
+ this.paginatedSearchOptions.next(updatedValue);
+ });
+ }
+
+ /**
+ * Default values for the Search Options
+ */
+ get defaults(): Observable> {
+ if (hasNoValue(this._defaults)) {
+ const options = Object.assign(new PaginatedSearchOptions(), {
+ pagination: this.defaultPagination,
+ sort: this.defaultSort,
+ scope: this.defaultScope,
+ query: this.defaultQuery
+ });
+ this._defaults = Observable.of(new RemoteData(false, false, true, null, options));
+ }
+ return this._defaults;
+ }
+
+ /**
+ * Make sure to unsubscribe from all existing subscription to prevent memory leaks
+ */
+ ngOnDestroy(): void {
+ this.subs.forEach((sub) => {
+ sub.unsubscribe();
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current scope's identifier
+ */
+ private getScopePart(defaultScope: string): Observable {
+ return this.getCurrentScope(defaultScope).map((scope) => {
+ return { scope }
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current query string as a partial SearchOptions object
+ */
+ private getQueryPart(defaultQuery: string): Observable {
+ return this.getCurrentQuery(defaultQuery).map((query) => {
+ return { query }
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current pagination settings as a partial SearchOptions object
+ */
+ private getPaginationPart(defaultPagination: PaginationComponentOptions): Observable {
+ return this.getCurrentPagination(defaultPagination).map((pagination) => {
+ return { pagination }
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current sorting settings as a partial SearchOptions object
+ */
+ private getSortPart(defaultSort: SortOptions): Observable {
+ return this.getCurrentSort(defaultSort).map((sort) => {
+ return { sort }
+ });
+ }
+
+ /**
+ * @returns {Observable} Emits the current active filters as a partial SearchOptions object
+ */
+ private getFiltersPart(): Observable {
+ return this.getCurrentFilters().map((filters) => {
+ return { filters }
+ });
+ }
+}
diff --git a/src/app/+search-page/search-service/search-filter-config.model.ts b/src/app/+search-page/search-service/search-filter-config.model.ts
index 2b77ef6768..dc6fef1f87 100644
--- a/src/app/+search-page/search-service/search-filter-config.model.ts
+++ b/src/app/+search-page/search-service/search-filter-config.model.ts
@@ -1,22 +1,53 @@
import { FilterType } from './filter-type.model';
import { autoserialize, autoserializeAs } from 'cerialize';
+ /**
+ * The configuration for a search filter
+ */
export class SearchFilterConfig {
+ /**
+ * The name of this filter
+ */
@autoserialize
name: string;
+ /**
+ * The FilterType of this filter
+ */
@autoserializeAs(String, 'facetType')
type: FilterType;
+ /**
+ * True if the filter has facets
+ */
@autoserialize
hasFacets: boolean;
- // @autoserializeAs(String, 'facetLimit') - uncomment when fixed in rest
+ /**
+ * @type {number} The page size used for this facet
+ */
+ @autoserializeAs(String, 'facetLimit')
pageSize = 5;
+ /**
+ * Defines if the item facet is collapsed by default or not on the search page
+ */
@autoserialize
isOpenByDefault: boolean;
+
+ /**
+ * Minimum value possible for this facet in the repository
+ */
+ @autoserialize
+ maxValue: string;
+
+ /**
+ * Maximum value possible for this facet in the repository
+ */
+ @autoserialize
+ minValue: string;
+
/**
* Name of this configuration that can be used in a url
* @returns Parameter name
diff --git a/src/app/+search-page/search-service/search-query-response.model.ts b/src/app/+search-page/search-service/search-query-response.model.ts
index b8948d963f..ac1d8b7df3 100644
--- a/src/app/+search-page/search-service/search-query-response.model.ts
+++ b/src/app/+search-page/search-service/search-query-response.model.ts
@@ -2,46 +2,88 @@ import { autoserialize, autoserializeAs } from 'cerialize';
import { PageInfo } from '../../core/shared/page-info.model';
import { NormalizedSearchResult } from '../normalized-search-result.model';
+/**
+ * Class representing the response returned by the server when performing a search request
+ */
export class SearchQueryResponse {
+ /**
+ * The scope used in the search request represented by the UUID of a DSpaceObject
+ */
@autoserialize
scope: string;
+ /**
+ * The search query used in the search request
+ */
@autoserialize
query: string;
+ /**
+ * The currently active filters used in the search request
+ */
@autoserialize
appliedFilters: any[]; // TODO
+ /**
+ * The sort parameters used in the search request
+ */
@autoserialize
sort: any; // TODO
+ /**
+ * The sort parameters used in the search request
+ */
@autoserialize
configurationName: string;
+ /**
+ * The sort parameters used in the search request
+ */
@autoserialize
public type: string;
+ /**
+ * Pagination configuration for this response
+ */
@autoserialize
page: PageInfo;
+ /**
+ * The results for this query
+ */
@autoserializeAs(NormalizedSearchResult)
objects: NormalizedSearchResult[];
@autoserialize
facets: any; // TODO
+ /**
+ * The REST url to retrieve the current response
+ */
@autoserialize
self: string;
+ /**
+ * The REST url to retrieve the next response
+ */
@autoserialize
next: string;
+ /**
+ * The REST url to retrieve the previous response
+ */
@autoserialize
previous: string;
+ /**
+ * The REST url to retrieve the first response
+ */
@autoserialize
first: string;
+ /**
+ * The REST url to retrieve the last response
+ */
@autoserialize
last: string;
}
diff --git a/src/app/+search-page/search-service/search-result-element-decorator.ts b/src/app/+search-page/search-service/search-result-element-decorator.ts
index 545d1b20eb..348cf7f592 100644
--- a/src/app/+search-page/search-service/search-result-element-decorator.ts
+++ b/src/app/+search-page/search-service/search-result-element-decorator.ts
@@ -1,8 +1,16 @@
import { GenericConstructor } from '../../core/shared/generic-constructor';
import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
+/**
+ * Contains the mapping between a search result component and a DSpaceObject
+ */
const searchResultMap = new Map();
+/**
+ * Used to map Search Result components to their matching DSpaceObject
+ * @param {GenericConstructor} domainConstructor The constructor of the DSpaceObject
+ * @returns Decorator function that performs the actual mapping on initialization of the component
+ */
export function searchResultFor(domainConstructor: GenericConstructor) {
return function decorator(searchResult: any) {
if (!searchResult) {
@@ -12,6 +20,11 @@ export function searchResultFor(domainConstructor: GenericConstructor} domainConstructor The DSpaceObject's constructor for which the search result component is requested
+ * @returns The component's constructor that matches the given DSpaceObject
+ */
export function getSearchResultFor(domainConstructor: GenericConstructor) {
return searchResultMap.get(domainConstructor);
}
diff --git a/src/app/+search-page/search-service/search.service.spec.ts b/src/app/+search-page/search-service/search.service.spec.ts
index 5cc71d9bbd..488996a3da 100644
--- a/src/app/+search-page/search-service/search.service.spec.ts
+++ b/src/app/+search-page/search-service/search.service.spec.ts
@@ -1,14 +1,10 @@
-import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { SearchService } from './search.service';
-import { ItemDataService } from './../../core/data/item-data.service';
-import { ViewMode } from '../../+search-page/search-options.model';
-import { RouteService } from '../../shared/services/route.service';
-import { GLOBAL_CONFIG } from '../../../config';
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
import { ActivatedRoute, Router, UrlTree } from '@angular/router';
import { RequestService } from '../../core/data/request.service';
@@ -19,19 +15,19 @@ import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
import { Observable } from 'rxjs/Observable';
import { PaginatedSearchOptions } from '../paginated-search-options.model';
import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { SearchResult } from '../search-result.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { ResponseCacheEntry } from '../../core/cache/response-cache.reducer';
import { RequestEntry } from '../../core/data/request.reducer';
import { getMockRequestService } from '../../shared/mocks/mock-request.service';
import { getMockResponseCacheService } from '../../shared/mocks/mock-response-cache.service';
import {
- FacetConfigSuccessResponse, RestResponse,
+ FacetConfigSuccessResponse,
SearchSuccessResponse
} from '../../core/cache/response-cache.models';
import { SearchQueryResponse } from './search-query-response.model';
import { SearchFilterConfig } from './search-filter-config.model';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
@Component({ template: '' })
class DummyComponent {
@@ -60,6 +56,8 @@ describe('SearchService', () => {
{ provide: RequestService, useValue: getMockRequestService() },
{ provide: RemoteDataBuildService, useValue: {} },
{ provide: HALEndpointService, useValue: {} },
+ { provide: CommunityDataService, useValue: {}},
+ { provide: DSpaceObjectDataService, useValue: {}},
SearchService
],
});
@@ -115,6 +113,8 @@ describe('SearchService', () => {
{ provide: RequestService, useValue: getMockRequestService() },
{ provide: RemoteDataBuildService, useValue: remoteDataBuildService },
{ provide: HALEndpointService, useValue: halService },
+ { provide: CommunityDataService, useValue: {}},
+ { provide: DSpaceObjectDataService, useValue: {}},
SearchService
],
});
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts
index b51a9c834d..ac5f7a6169 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/+search-page/search-service/search.service.ts
@@ -1,13 +1,14 @@
import { Injectable, OnDestroy } from '@angular/core';
import {
- ActivatedRoute, NavigationExtras, PRIMARY_OUTLET, Router,
+ ActivatedRoute,
+ NavigationExtras,
+ PRIMARY_OUTLET,
+ Router,
UrlSegmentGroup
} from '@angular/router';
import { Observable } from 'rxjs/Observable';
-import { flatMap, map, tap } from 'rxjs/operators';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { flatMap, map, switchMap } from 'rxjs/operators';
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import {
FacetConfigSuccessResponse,
FacetValueSuccessResponse,
@@ -23,10 +24,9 @@ import { RequestService } from '../../core/data/request.service';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { GenericConstructor } from '../../core/shared/generic-constructor';
import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { configureRequest } from '../../core/shared/operators';
+import { configureRequest, getSucceededRemoteData } from '../../core/shared/operators';
import { URLCombiner } from '../../core/url-combiner/url-combiner';
import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { NormalizedSearchResult } from '../normalized-search-result.model';
import { SearchOptions } from '../search-options.model';
import { SearchResult } from '../search-result.model';
@@ -40,32 +40,48 @@ import { ListableObject } from '../../shared/object-collection/shared/listable-o
import { FacetValueResponseParsingService } from '../../core/data/facet-value-response-parsing.service';
import { FacetConfigResponseParsingService } from '../../core/data/facet-config-response-parsing.service';
import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { observable } from 'rxjs/symbol/observable';
+import { Community } from '../../core/shared/community.model';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { ResourceType } from '../../core/shared/resource-type';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+/**
+ * Service that performs all general actions that have to do with the search page
+ */
@Injectable()
export class SearchService implements OnDestroy {
+ /**
+ * Endpoint link path for retrieving general search results
+ */
private searchLinkPath = 'discover/search/objects';
- private facetValueLinkPathPrefix = 'discover/facets/';
- private facetConfigLinkPath = 'discover/facets';
+ /**
+ * Endpoint link path for retrieving facet config incl values
+ */
+ private facetLinkPathPrefix = 'discover/facets/';
+
+ /**
+ * Subscription to unsubscribe from
+ */
private sub;
- searchOptions: SearchOptions;
-
constructor(private router: Router,
private route: ActivatedRoute,
protected responseCache: ResponseCacheService,
protected requestService: RequestService,
private rdb: RemoteDataBuildService,
- private halService: HALEndpointService) {
- const pagination: PaginationComponentOptions = new PaginationComponentOptions();
- pagination.id = 'search-results-pagination';
- pagination.currentPage = 1;
- pagination.pageSize = 10;
- const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
- this.searchOptions = Object.assign(new SearchOptions(), { pagination: pagination, sort: sort });
+ private halService: HALEndpointService,
+ private communityService: CommunityDataService,
+ private dspaceObjectService: DSpaceObjectDataService
+ ) {
}
+ /**
+ * Method to retrieve a paginated list of search results from the server
+ * @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
+ * @returns {Observable>>>} Emits a paginated list with all search results found
+ */
search(searchOptions?: PaginatedSearchOptions): Observable>>> {
const requestObs = this.halService.getEndpoint(this.searchLinkPath).pipe(
map((url: string) => {
@@ -134,8 +150,13 @@ export class SearchService implements OnDestroy {
return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs);
}
+ /**
+ * Request the filter configuration for a given scope or the whole repository
+ * @param {string} scope UUID of the object for which config the filter config is requested, when no scope is provided the configuration for the whole repository is loaded
+ * @returns {Observable>} The found filter configuration
+ */
getConfig(scope?: string): Observable> {
- const requestObs = this.halService.getEndpoint(this.facetConfigLinkPath).pipe(
+ const requestObs = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
map((url: string) => {
const args: string[] = [];
@@ -175,13 +196,25 @@ export class SearchService implements OnDestroy {
return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, facetConfigObs);
}
- getFacetValuesFor(filterConfig: SearchFilterConfig, valuePage: number, searchOptions?: SearchOptions): Observable>> {
- const requestObs = this.halService.getEndpoint(this.facetValueLinkPathPrefix + filterConfig.name).pipe(
+ /**
+ * Method to request a single page of filter values for a given value
+ * @param {SearchFilterConfig} filterConfig The filter config for which we want to request filter values
+ * @param {number} valuePage The page number of the filter values
+ * @param {SearchOptions} searchOptions The search configuration for the current search
+ * @param {string} filterQuery The optional query used to filter out filter values
+ * @returns {Observable>>} Emits the given page of facet values
+ */
+ getFacetValuesFor(filterConfig: SearchFilterConfig, valuePage: number, searchOptions?: SearchOptions, filterQuery?: string): Observable>> {
+ const requestObs = this.halService.getEndpoint(this.facetLinkPathPrefix + filterConfig.name).pipe(
map((url: string) => {
const args: string[] = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`];
+ if (hasValue(filterQuery)) {
+ args.push(`prefix=${filterQuery}`);
+ }
if (hasValue(searchOptions)) {
url = searchOptions.toRestUrl(url, args);
}
+
const request = new GetRequest(this.requestService.generateRequestId(), url);
return Object.assign(request, {
getResponseParser(): GenericConstructor {
@@ -218,6 +251,45 @@ export class SearchService implements OnDestroy {
return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs);
}
+ /**
+ * Request a list of DSpaceObjects that can be used as a scope, based on the current scope
+ * @param {string} scopeId UUID of the current scope, if the scope is empty, the repository wide scopes will be returned
+ * @returns {Observable} Emits a list of DSpaceObjects which represent possible scopes
+ */
+ getScopes(scopeId?: string): Observable {
+
+ if (isEmpty(scopeId)) {
+ const top: Observable = this.communityService.findTop({ elementsPerPage: 9999 }).pipe(
+ map(
+ (communities: RemoteData>) => communities.payload.page
+ )
+ );
+ return top;
+ }
+
+ const scopeObject: Observable> = this.dspaceObjectService.findById(scopeId).pipe(getSucceededRemoteData());
+ const scopeList: Observable = scopeObject.pipe(
+ switchMap((dsoRD: RemoteData) => {
+ if (dsoRD.payload.type === ResourceType.Community) {
+ const community: Community = dsoRD.payload as Community;
+ return Observable.combineLatest(community.subcommunities, community.collections, (subCommunities, collections) => {
+ /*if this is a community, we also need to show the direct children*/
+ return [community, ...subCommunities.payload.page, ...collections.payload.page]
+ })
+ } else {
+ return Observable.of([dsoRD.payload]);
+ }
+ }
+ ));
+
+ return scopeList;
+
+ }
+
+ /**
+ * Requests the current view mode based on the current URL
+ * @returns {Observable} The current view mode
+ */
getViewMode(): Observable {
return this.route.queryParams.map((params) => {
if (isNotEmpty(params.view) && hasValue(params.view)) {
@@ -228,6 +300,10 @@ export class SearchService implements OnDestroy {
});
}
+ /**
+ * Changes the current view mode in the current URL
+ * @param {ViewMode} viewMode Mode to switch to
+ */
setViewMode(viewMode: ViewMode) {
const navigationExtras: NavigationExtras = {
queryParams: { view: viewMode },
@@ -237,12 +313,18 @@ export class SearchService implements OnDestroy {
this.router.navigate([this.getSearchLink()], navigationExtras);
}
+ /**
+ * @returns {string} The base path to the search page
+ */
getSearchLink(): string {
const urlTree = this.router.parseUrl(this.router.url);
const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
return '/' + g.toString();
}
+ /**
+ * Unsubscribe from the subscription
+ */
ngOnDestroy(): void {
if (this.sub !== undefined) {
this.sub.unsubscribe();
diff --git a/src/app/+search-page/search-settings/search-settings.component.html b/src/app/+search-page/search-settings/search-settings.component.html
index 18fd45caed..d693196dae 100644
--- a/src/app/+search-page/search-settings/search-settings.component.html
+++ b/src/app/+search-page/search-settings/search-settings.component.html
@@ -1,22 +1,24 @@
-{{ 'search.sidebar.settings.title' | translate}}
-
+
+ {{ 'search.sidebar.settings.title' | translate}}
+
{{ 'search.sidebar.settings.sort-by' | translate}}
-
- {{'sorting.' + sortDirection.key | translate}}
+
+ {{'sorting.' + sortOption.field + '.' + sortOption.direction | translate}}
-
+
-
{{ 'search.sidebar.settings.rpp' | translate}}
-
-
-
- {{pageSizeOption}}
-
-
-
+
+
{{ 'search.sidebar.settings.rpp' | translate}}
+
+
+ {{pageSizeOption}}
+
+
+
+
\ No newline at end of file
diff --git a/src/app/+search-page/search-settings/search-settings.component.spec.ts b/src/app/+search-page/search-settings/search-settings.component.spec.ts
index 2330b62669..5e6dc9b369 100644
--- a/src/app/+search-page/search-settings/search-settings.component.spec.ts
+++ b/src/app/+search-page/search-settings/search-settings.component.spec.ts
@@ -11,6 +11,10 @@ import { SearchSidebarService } from '../search-sidebar/search-sidebar.service';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
import { By } from '@angular/platform-browser';
+import { SearchFilterService } from '../search-filters/search-filter/search-filter.service';
+import { hot } from 'jasmine-marbles';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { SearchConfigurationService } from '../search-service/search-configuration.service';
describe('SearchSettingsComponent', () => {
@@ -23,13 +27,21 @@ describe('SearchSettingsComponent', () => {
pagination.currentPage = 1;
pagination.pageSize = 10;
const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
- const mockResults = [ 'test', 'data' ];
+ const mockResults = ['test', 'data'];
const searchServiceStub = {
searchOptions: { pagination: pagination, sort: sort },
search: () => mockResults
};
+
const queryParam = 'test query';
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
+ const paginatedSearchOptions = {
+ query: queryParam,
+ scope: scopeParam,
+ pagination,
+ sort
+ };
+
const activatedRouteStub = {
queryParams: Observable.of({
query: queryParam,
@@ -41,12 +53,12 @@ describe('SearchSettingsComponent', () => {
isCollapsed: Observable.of(true),
collapse: () => this.isCollapsed = Observable.of(true),
expand: () => this.isCollapsed = Observable.of(false)
- }
+ };
beforeEach(async(() => {
TestBed.configureTestingModule({
- imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ],
- declarations: [ SearchSettingsComponent, EnumKeysPipe ],
+ imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+ declarations: [SearchSettingsComponent, EnumKeysPipe, VarDirective],
providers: [
{ provide: SearchService, useValue: searchServiceStub },
@@ -55,8 +67,23 @@ describe('SearchSettingsComponent', () => {
provide: SearchSidebarService,
useValue: sidebarService
},
+ {
+ provide: SearchFilterService,
+ useValue: {}
+ },
+ {
+ provide: SearchConfigurationService,
+ useValue: {
+ paginatedSearchOptions: hot('a', {
+ a: paginatedSearchOptions
+ }),
+ getCurrentScope: hot('a', {
+ a: 'test-id'
+ }),
+ }
+ },
],
- schemas: [ NO_ERRORS_SCHEMA ]
+ schemas: [NO_ERRORS_SCHEMA]
}).compileComponents();
}));
@@ -74,30 +101,42 @@ describe('SearchSettingsComponent', () => {
});
it('it should show the order settings with the respective selectable options', () => {
- const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
- expect(orderSetting).toBeDefined();
- const childElements = orderSetting.query(By.css('.form-control')).children;
- expect(childElements.length).toEqual(2);
-
+ (comp as any).searchOptions$.first().subscribe((options) => {
+ fixture.detectChanges();
+ const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
+ expect(orderSetting).toBeDefined();
+ const childElements = orderSetting.query(By.css('.form-control')).children;
+ expect(childElements.length).toEqual(comp.searchOptionPossibilities.length);
+ });
});
it('it should show the size settings with the respective selectable options', () => {
- const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
- expect(pageSizeSetting).toBeDefined();
- const childElements = pageSizeSetting.query(By.css('.form-control')).children;
- expect(childElements.length).toEqual(7);
+ (comp as any).searchOptions$.first().subscribe((options) => {
+ fixture.detectChanges();
+ const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+ expect(pageSizeSetting).toBeDefined();
+ const childElements = pageSizeSetting.query(By.css('.form-control')).children;
+ expect(childElements.length).toEqual(options.pagination.pageSizeOptions.length);
+ }
+ )
});
it('should have the proper order value selected by default', () => {
- const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
- const childElementToBeSelected = orderSetting.query(By.css('.form-control option[value="0"][selected="selected"]'))
- expect(childElementToBeSelected).toBeDefined();
+ (comp as any).searchOptions$.first().subscribe((options) => {
+ fixture.detectChanges();
+ const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
+ const childElementToBeSelected = orderSetting.query(By.css('.form-control option[value="0"][selected="selected"]'));
+ expect(childElementToBeSelected).toBeDefined();
+ });
});
it('should have the proper rpp value selected by default', () => {
- const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
- const childElementToBeSelected = pageSizeSetting.query(By.css('.form-control option[value="10"][selected="selected"]'))
- expect(childElementToBeSelected).toBeDefined();
+ (comp as any).searchOptions$.first().subscribe((options) => {
+ fixture.detectChanges();
+ const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+ const childElementToBeSelected = pageSizeSetting.query(By.css('.form-control option[value="10"][selected="selected"]'));
+ expect(childElementToBeSelected).toBeDefined();
+ });
});
});
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 145b58e27b..81e2366e39 100644
--- a/src/app/+search-page/search-settings/search-settings.component.ts
+++ b/src/app/+search-page/search-settings/search-settings.component.ts
@@ -1,77 +1,75 @@
-import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { SearchService } from '../search-service/search.service';
-import { SearchOptions, ViewMode } from '../search-options.model';
-import { SortDirection } from '../../core/cache/models/sort-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { PaginatedSearchOptions } from '../paginated-search-options.model';
+import { SearchFilterService } from '../search-filters/search-filter/search-filter.service';
+import { Observable } from 'rxjs/Observable';
+import { SearchConfigurationService } from '../search-service/search-configuration.service';
@Component({
selector: 'ds-search-settings',
styleUrls: ['./search-settings.component.scss'],
templateUrl: './search-settings.component.html'
})
+
+/**
+ * This component represents the part of the search sidebar that contains the general search settings.
+ */
export class SearchSettingsComponent implements OnInit {
- @Input() searchOptions: PaginatedSearchOptions;
/**
- * Declare SortDirection enumeration to use it in the template
+ * The configuration for the current paginated search results
*/
- public sortDirections = SortDirection;
- /**
- * Number of items per page.
- */
- public pageSize;
- @Input() public pageSizeOptions;
+ searchOptions$: Observable;
- private sub;
- private scope: string;
- query: string;
- page: number;
- direction: SortDirection;
- currentParams = {};
+ /**
+ * All sort options that are shown in the settings
+ */
+ searchOptionPossibilities = [new SortOptions('score', SortDirection.DESC), new SortOptions('dc.title', SortDirection.ASC), new SortOptions('dc.title', SortDirection.DESC)];
constructor(private service: SearchService,
private route: ActivatedRoute,
- private router: Router) {
+ private router: Router,
+ private searchConfigurationService: SearchConfigurationService) {
}
+ /**
+ * Initialize paginated search options
+ */
ngOnInit(): void {
- this.searchOptions = this.service.searchOptions;
- this.pageSize = this.searchOptions.pagination.pageSize;
- this.pageSizeOptions = this.searchOptions.pagination.pageSizeOptions;
- this.sub = this.route
- .queryParams
- .subscribe((params) => {
- this.currentParams = params;
- this.query = params.query || '';
- this.scope = params.scope;
- this.page = +params.page || this.searchOptions.pagination.currentPage;
- this.pageSize = +params.pageSize || this.searchOptions.pagination.pageSize;
- this.direction = params.sortDirection || this.searchOptions.sort.direction;
- if (params.view === ViewMode.Grid) {
- this.pageSizeOptions = this.pageSizeOptions;
- } else {
- this.pageSizeOptions = this.pageSizeOptions;
- }
- });
+ this.searchOptions$ = this.searchConfigurationService.paginatedSearchOptions;
}
+ /**
+ * Method to change the current page size (results per page)
+ * @param {Event} event Change event containing the new page size value
+ */
reloadRPP(event: Event) {
const value = (event.target as HTMLInputElement).value;
const navigationExtras: NavigationExtras = {
- queryParams: Object.assign({}, this.currentParams, {
- pageSize: value
- })
+ queryParams: {
+ pageSize: value,
+ page: 1
+ },
+ queryParamsHandling: 'merge'
};
this.router.navigate([ '/search' ], navigationExtras);
}
+ /**
+ * Method to change the current sort field and direction
+ * @param {Event} event Change event containing the sort direction and sort field
+ */
reloadOrder(event: Event) {
- const value = (event.target as HTMLInputElement).value;
+ const values = (event.target as HTMLInputElement).value.split(',');
const navigationExtras: NavigationExtras = {
- queryParams: Object.assign({}, this.currentParams, {
- sortDirection: value
- })
+ queryParams: {
+ sortDirection: values[1],
+ sortField: values[0],
+ page: 1
+ },
+ queryParamsHandling: 'merge'
};
this.router.navigate([ '/search' ], navigationExtras);
}
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.actions.ts b/src/app/+search-page/search-sidebar/search-sidebar.actions.ts
index f393bc10b3..84a34b2790 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.actions.ts
+++ b/src/app/+search-page/search-sidebar/search-sidebar.actions.ts
@@ -17,14 +17,23 @@ export const SearchSidebarActionTypes = {
};
/* tslint:disable:max-classes-per-file */
+/**
+ * Used to collapse the sidebar
+ */
export class SearchSidebarCollapseAction implements Action {
type = SearchSidebarActionTypes.COLLAPSE;
}
+/**
+ * Used to expand the sidebar
+ */
export class SearchSidebarExpandAction implements Action {
type = SearchSidebarActionTypes.EXPAND;
}
+/**
+ * Used to collapse the sidebar when it's expanded and expand it when it's collapsed
+ */
export class SearchSidebarToggleAction implements Action {
type = SearchSidebarActionTypes.TOGGLE;
}
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.ts b/src/app/+search-page/search-sidebar/search-sidebar.component.ts
index 946048462a..8b68cda793 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.component.ts
+++ b/src/app/+search-page/search-sidebar/search-sidebar.component.ts
@@ -12,7 +12,18 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
templateUrl: './search-sidebar.component.html',
})
+/**
+ * Component representing the sidebar on the search page
+ */
export class SearchSidebarComponent {
+
+ /**
+ * The total amount of results
+ */
@Input() resultCount;
+
+ /**
+ * Emits event when the user clicks a button to open or close the sidebar
+ */
@Output() toggleSidebar = new EventEmitter();
}
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.effects.ts b/src/app/+search-page/search-sidebar/search-sidebar.effects.ts
index b65010b6e0..758ef2320b 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.effects.ts
+++ b/src/app/+search-page/search-sidebar/search-sidebar.effects.ts
@@ -5,6 +5,9 @@ import * as fromRouter from '@ngrx/router-store';
import { SearchSidebarCollapseAction } from './search-sidebar.actions';
import { URLBaser } from '../../core/url-baser/url-baser';
+/**
+ * Makes sure that if the user navigates to another route, the sidebar is collapsed
+ */
@Injectable()
export class SearchSidebarEffects {
private previousPath: string;
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.reducer.ts b/src/app/+search-page/search-sidebar/search-sidebar.reducer.ts
index 81d9069238..a01f0ff6d6 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.reducer.ts
+++ b/src/app/+search-page/search-sidebar/search-sidebar.reducer.ts
@@ -1,5 +1,8 @@
import { SearchSidebarAction, SearchSidebarActionTypes } from './search-sidebar.actions';
+/**
+ * Interface that represents the state of the sidebar
+ */
export interface SearchSidebarState {
sidebarCollapsed: boolean;
}
@@ -8,6 +11,12 @@ const initialState: SearchSidebarState = {
sidebarCollapsed: true
};
+/**
+ * Performs a search sidebar action on the current state
+ * @param {SearchSidebarState} state The state before the action is performed
+ * @param {SearchSidebarAction} action The action that should be performed
+ * @returns {SearchSidebarState} The state after the action is performed
+ */
export function sidebarReducer(state = initialState, action: SearchSidebarAction): SearchSidebarState {
switch (action.type) {
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.service.ts b/src/app/+search-page/search-sidebar/search-sidebar.service.ts
index 3a17dc87ab..8cf9339c5c 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.service.ts
+++ b/src/app/+search-page/search-sidebar/search-sidebar.service.ts
@@ -9,27 +9,47 @@ import { HostWindowService } from '../../shared/host-window.service';
const sidebarStateSelector = (state: AppState) => state.searchSidebar;
const sidebarCollapsedSelector = createSelector(sidebarStateSelector, (sidebar: SearchSidebarState) => sidebar.sidebarCollapsed);
+/**
+ * Service that performs all actions that have to do with the search sidebar
+ */
@Injectable()
export class SearchSidebarService {
+ /**
+ * Emits true is the current screen size is mobile
+ */
private isXsOrSm$: Observable;
- private isCollapsdeInStored: Observable;
+
+ /**
+ * Emits true is the sidebar's state in the store is currently collapsed
+ */
+ private isCollapsedInStore: Observable;
constructor(private store: Store, private windowService: HostWindowService) {
this.isXsOrSm$ = this.windowService.isXsOrSm();
- this.isCollapsdeInStored = this.store.select(sidebarCollapsedSelector);
+ this.isCollapsedInStore = this.store.select(sidebarCollapsedSelector);
}
+ /**
+ * Checks if the sidebar should currently be collapsed
+ * @returns {Observable} Emits true if the user's screen size is mobile or when the state in the store is currently collapsed
+ */
get isCollapsed(): Observable {
return Observable.combineLatest(
this.isXsOrSm$,
- this.isCollapsdeInStored,
+ this.isCollapsedInStore,
(mobile, store) => mobile ? store : true);
}
+ /**
+ * Dispatches a collapse action to the store
+ */
public collapse(): void {
this.store.dispatch(new SearchSidebarCollapseAction());
}
+ /**
+ * Dispatches an expand action to the store
+ */
public expand(): void {
this.store.dispatch(new SearchSidebarExpandAction());
}
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 00a3e56121..e4c51ae37b 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,5 +1,6 @@
@import '../styles/variables.scss';
@import '../../node_modules/bootstrap/scss/bootstrap.scss';
+@import '../../node_modules/nouislider/distribute/nouislider.min.css';
@import "../../node_modules/font-awesome/scss/font-awesome.scss";
html {
diff --git a/src/app/core/cache/models/normalized-community.model.ts b/src/app/core/cache/models/normalized-community.model.ts
index b1c2fe3cdd..4ab2408a53 100644
--- a/src/app/core/cache/models/normalized-community.model.ts
+++ b/src/app/core/cache/models/normalized-community.model.ts
@@ -46,4 +46,8 @@ export class NormalizedCommunity extends NormalizedDSpaceObject {
@relationship(ResourceType.Collection, true)
collections: string[];
+ @autoserialize
+ @relationship(ResourceType.Community, true)
+ subcommunities: string[];
+
}
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 8536169688..dabdfba0ab 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -62,6 +62,7 @@ import { RegistryMetadatafieldsResponseParsingService } from './data/registry-me
import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
import { NotificationsService } from '../shared/notifications/notifications.service';
import { UploaderService } from '../shared/uploader/uploader.service';
+import { DSpaceObjectDataService } from './data/dspace-object-data.service';
const IMPORTS = [
CommonModule,
@@ -124,6 +125,7 @@ const PROVIDERS = [
IntegrationResponseParsingService,
UploaderService,
UUIDService,
+ DSpaceObjectDataService,
// register AuthInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 88ad3a5287..3e31c62d25 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -1,7 +1,6 @@
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
-import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { NormalizedCommunity } from '../cache/models/normalized-community.model';
import { ObjectCacheService } from '../cache/object-cache.service';
@@ -11,10 +10,16 @@ import { Community } from '../shared/community.model';
import { ComColDataService } from './comcol-data.service';
import { RequestService } from './request.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { FindAllOptions, FindAllRequest } from './request.models';
+import { RemoteData } from './remote-data';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { Observable } from 'rxjs/Observable';
+import { PaginatedList } from './paginated-list';
@Injectable()
export class CommunityDataService extends ComColDataService {
protected linkPath = 'communities';
+ protected topLinkPath = 'communities/search/top';
protected cds = this;
constructor(
@@ -31,4 +36,19 @@ export class CommunityDataService extends ComColDataService>> {
+ const hrefObs = this.halService.getEndpoint(this.topLinkPath).filter((href: string) => isNotEmpty(href))
+ .flatMap((endpoint: string) => this.getFindAllHref(endpoint, options));
+
+ hrefObs
+ .filter((href: string) => hasValue(href))
+ .take(1)
+ .subscribe((href: string) => {
+ const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
+ this.requestService.configure(request);
+ });
+
+ return this.rdbService.buildList(hrefObs) as Observable>>;
+ }
}
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 06e7f25926..c7588a5231 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -80,8 +80,7 @@ export abstract class DataService
.map((endpoint: string) => this.getFindByIDHref(endpoint, id));
hrefObs
- .filter((href: string) => hasValue(href))
- .take(1)
+ .first((href: string) => hasValue(href))
.subscribe((href: string) => {
const request = new FindByIDRequest(this.requestService.generateRequestId(), href, id);
this.requestService.configure(request);
diff --git a/src/app/core/data/dspace-object-data.service.spec.ts b/src/app/core/data/dspace-object-data.service.spec.ts
new file mode 100644
index 0000000000..bb2bdc675d
--- /dev/null
+++ b/src/app/core/data/dspace-object-data.service.spec.ts
@@ -0,0 +1,73 @@
+import { cold, getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from '../../../../node_modules/rxjs';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { FindByIDRequest } from './request.models';
+import { RequestService } from './request.service';
+import { DSpaceObjectDataService } from './dspace-object-data.service';
+
+describe('DSpaceObjectDataService', () => {
+ let scheduler: TestScheduler;
+ let service: DSpaceObjectDataService;
+ let halService: HALEndpointService;
+ let requestService: RequestService;
+ let rdbService: RemoteDataBuildService;
+ const testObject = {
+ uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746'
+ } as DSpaceObject;
+ const dsoLink = 'https://rest.api/rest/api/dso/find{?uuid}';
+ const requestURL = `https://rest.api/rest/api/dso/find?uuid=${testObject.uuid}`;
+ const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
+
+ beforeEach(() => {
+ scheduler = getTestScheduler();
+
+ halService = jasmine.createSpyObj('halService', {
+ getEndpoint: cold('a', { a: dsoLink })
+ });
+ requestService = jasmine.createSpyObj('requestService', {
+ generateRequestId: requestUUID,
+ configure: true
+ });
+ rdbService = jasmine.createSpyObj('rdbService', {
+ buildSingle: cold('a', {
+ a: {
+ payload: testObject
+ }
+ })
+ });
+
+ service = new DSpaceObjectDataService(
+ requestService,
+ rdbService,
+ halService
+ )
+ });
+
+ describe('findById', () => {
+ it('should call HALEndpointService with the path to the dso endpoint', () => {
+ scheduler.schedule(() => service.findById(testObject.uuid));
+ scheduler.flush();
+
+ expect(halService.getEndpoint).toHaveBeenCalledWith('dso');
+ });
+
+ it('should configure the proper FindByIDRequest', () => {
+ scheduler.schedule(() => service.findById(testObject.uuid));
+ scheduler.flush();
+
+ expect(requestService.configure).toHaveBeenCalledWith(new FindByIDRequest(requestUUID, requestURL, testObject.uuid));
+ });
+
+ it('should return a RemoteData for the object with the given ID', () => {
+ const result = service.findById(testObject.uuid);
+ const expected = cold('a', {
+ a: {
+ payload: testObject
+ }
+ });
+ expect(result).toBeObservable(expected);
+ });
+ });
+});
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
new file mode 100644
index 0000000000..39feea4c30
--- /dev/null
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -0,0 +1,51 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs/Observable';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { NormalizedDSpaceObject } from '../cache/models/normalized-dspace-object.model';
+import { ResponseCacheService } from '../cache/response-cache.service';
+import { CoreState } from '../core.reducers';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DataService } from './data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+
+/* tslint:disable:max-classes-per-file */
+class DataServiceImpl extends DataService {
+ protected linkPath = 'dso';
+
+ constructor(
+ protected responseCache: ResponseCacheService,
+ protected requestService: RequestService,
+ protected rdbService: RemoteDataBuildService,
+ protected store: Store,
+ protected halService: HALEndpointService) {
+ super();
+ }
+
+ getScopedEndpoint(scope: string): Observable {
+ return undefined;
+ }
+
+ getFindByIDHref(endpoint, resourceID): string {
+ return endpoint.replace(/\{\?uuid\}/,`?uuid=${resourceID}`);
+ }
+}
+
+@Injectable()
+export class DSpaceObjectDataService {
+ protected linkPath = 'dso';
+ private dataService: DataServiceImpl;
+
+ constructor(
+ protected requestService: RequestService,
+ protected rdbService: RemoteDataBuildService,
+ protected halService: HALEndpointService) {
+ this.dataService = new DataServiceImpl(null, requestService, rdbService, null, halService);
+ }
+
+ findById(uuid: string): Observable> {
+ return this.dataService.findById(uuid);
+ }
+}
diff --git a/src/app/core/data/paginated-list.ts b/src/app/core/data/paginated-list.ts
index 21cc13f3fa..07d53739d0 100644
--- a/src/app/core/data/paginated-list.ts
+++ b/src/app/core/data/paginated-list.ts
@@ -8,7 +8,7 @@ export class PaginatedList {
}
get elementsPerPage(): number {
- if (hasValue(this.pageInfo)) {
+ if (hasValue(this.pageInfo) && hasValue(this.pageInfo.elementsPerPage)) {
return this.pageInfo.elementsPerPage;
}
return this.page.length;
@@ -19,7 +19,7 @@ export class PaginatedList {
}
get totalElements(): number {
- if (hasValue(this.pageInfo)) {
+ if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalElements)) {
return this.pageInfo.totalElements;
}
return this.page.length;
@@ -30,7 +30,7 @@ export class PaginatedList {
}
get totalPages(): number {
- if (hasValue(this.pageInfo)) {
+ if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalPages)) {
return this.pageInfo.totalPages;
}
return 1;
@@ -41,7 +41,7 @@ export class PaginatedList {
}
get currentPage(): number {
- if (hasValue(this.pageInfo)) {
+ if (hasValue(this.pageInfo) && hasValue(this.pageInfo.currentPage)) {
return this.pageInfo.currentPage;
}
return 1;
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
index 2620916070..1fe8b1e15f 100644
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.ts
+++ b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
@@ -1,15 +1,13 @@
import {
- RegistryMetadatafieldsSuccessResponse, RegistryMetadataschemasSuccessResponse,
+ RegistryMetadatafieldsSuccessResponse,
RestResponse
} from '../cache/response-cache.models';
import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
import { RestRequest } from './request.models';
import { ResponseParsingService } from './parsing.service';
-import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
import { DSOResponseParsingService } from './dso-response-parsing.service';
import { Injectable } from '@angular/core';
-import { forEach } from '@angular/router/src/utils/collection';
import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
@Injectable()
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index c7456aa2f9..4039b8f761 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -5,8 +5,7 @@ import { ResponseParsingService } from './parsing.service';
import { RestRequest } from './request.models';
import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { PageInfo } from '../shared/page-info.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { hasValue } from '../../shared/empty.util';
import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
import { Metadatum } from '../shared/metadatum.model';
@@ -16,7 +15,7 @@ export class SearchResponseParsingService implements ResponseParsingService {
}
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
- const payload = data.payload;
+ const payload = data.payload._embedded.searchResult;
const hitHighlights = payload._embedded.objects
.map((object) => object.hitHighlights)
.map((hhObject) => {
@@ -56,6 +55,6 @@ export class SearchResponseParsingService implements ResponseParsingService {
}));
payload.objects = objects;
const deserialized = new DSpaceRESTv2Serializer(SearchQueryResponse).deserialize(payload);
- return new SearchSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload));
+ return new SearchSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(payload));
}
}
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 39fb454ac5..cf597195e9 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -26,7 +26,7 @@ import { Metadatum } from '../shared/metadatum.model';
import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
import { BitstreamFormat } from '../shared/bitstream-format.model';
-import { hasValue } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
@Injectable()
export class MetadataService {
@@ -269,11 +269,9 @@ export class MetadataService {
private setCitationPdfUrlTag(): void {
if (this.currentObject.value instanceof Item) {
const item = this.currentObject.value as Item;
- // NOTE: Observable resolves many times with same data
- // taking only two, fist one is empty array
- item.getFiles().take(2).subscribe((bitstreams: Bitstream[]) => {
+ item.getFiles().filter((files) => isNotEmpty(files)).first().subscribe((bitstreams: Bitstream[]) => {
for (const bitstream of bitstreams) {
- bitstream.format.take(1)
+ bitstream.format.first()
.map((rd: RemoteData) => rd.payload)
.filter((format: BitstreamFormat) => hasValue(format))
.subscribe((format: BitstreamFormat) => {
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index 8fd55d312f..20bd50f4a9 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -61,4 +61,6 @@ export class Community extends DSpaceObject {
collections: Observable>>;
+ subcommunities: Observable>>;
+
}
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index c0b9be3fbf..af41c9c56b 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,5 +1,5 @@
import { Observable } from 'rxjs/Observable';
-import { filter, flatMap, map, tap } from 'rxjs/operators';
+import { filter, first, flatMap, map, tap } from 'rxjs/operators';
import { hasValueOperator } from '../../shared/empty.util';
import { DSOSuccessResponse } from '../cache/response-cache.models';
import { ResponseCacheEntry } from '../cache/response-cache.reducer';
@@ -45,3 +45,7 @@ export const configureRequest = (requestService: RequestService) =>
export const getRemoteDataPayload = () =>
(source: Observable>): Observable =>
source.pipe(map((remoteData: RemoteData) => remoteData.payload));
+
+export const getSucceededRemoteData = () =>
+ (source: Observable>): Observable> =>
+ source.pipe(first((rd: RemoteData) => rd.hasSucceeded));
diff --git a/src/app/core/shared/view-mode.model.ts b/src/app/core/shared/view-mode.model.ts
new file mode 100644
index 0000000000..b026d68431
--- /dev/null
+++ b/src/app/core/shared/view-mode.model.ts
@@ -0,0 +1,8 @@
+/**
+ * This enumeration represents all possible ways of representing a group of objects in the UI
+ */
+
+export enum ViewMode {
+ List = 'list',
+ Grid = 'grid'
+}
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html
new file mode 100644
index 0000000000..bbe090dac0
--- /dev/null
+++ b/src/app/shared/input-suggestions/input-suggestions.component.html
@@ -0,0 +1,21 @@
+
\ No newline at end of file
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.scss b/src/app/shared/input-suggestions/input-suggestions.component.scss
new file mode 100644
index 0000000000..bea74cf7af
--- /dev/null
+++ b/src/app/shared/input-suggestions/input-suggestions.component.scss
@@ -0,0 +1,17 @@
+.autocomplete {
+ width: 100%;
+ .dropdown-item {
+ white-space: normal;
+ word-break: break-word;
+ &:focus {
+ outline: none;
+ }
+ }
+}
+
+form {
+ position: relative;
+ .dropdown-menu {
+ position: absolute;
+ }
+}
\ No newline at end of file
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
new file mode 100644
index 0000000000..8b6cdd2aa5
--- /dev/null
+++ b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
@@ -0,0 +1,306 @@
+import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+
+import { TranslateModule } from '@ngx-translate/core';
+import { InputSuggestionsComponent } from './input-suggestions.component';
+import { By } from '@angular/platform-browser';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+
+describe('InputSuggestionsComponent', () => {
+
+ let comp: InputSuggestionsComponent;
+ let fixture: ComponentFixture;
+ let de: DebugElement;
+ let el: HTMLElement;
+ const suggestions = [{displayValue: 'suggestion uno', value: 'suggestion uno'}, {displayValue: 'suggestion dos', value: 'suggestion dos'}, {displayValue: 'suggestion tres', value: 'suggestion tres'}];
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
+ declarations: [InputSuggestionsComponent],
+ providers: [],
+ schemas: [NO_ERRORS_SCHEMA]
+ }).overrideComponent(InputSuggestionsComponent, {
+ set: { changeDetection: ChangeDetectionStrategy.Default }
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(InputSuggestionsComponent);
+
+ comp = fixture.componentInstance; // LoadingComponent test instance
+ comp.suggestions = suggestions;
+ // query for the message by CSS element selector
+ de = fixture.debugElement;
+ el = de.nativeElement;
+ comp.show.next(true);
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(comp).toBeTruthy();
+ });
+
+ describe('when the input field is in focus', () => {
+
+ beforeEach(() => {
+ const inputElement = de.query(By.css('.suggestion_input'));
+ inputElement.nativeElement.focus();
+ fixture.detectChanges();
+
+ });
+
+ it('should not have any element in focus', () => {
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement.nodeName.toLowerCase()).not.toEqual('a');
+ });
+
+ describe('when key up is pressed', () => {
+ beforeEach(() => {
+ spyOn(comp, 'shiftFocusUp');
+ const form = de.query(By.css('form'));
+ form.triggerEventHandler('keydown.arrowup', {});
+ fixture.detectChanges();
+ });
+
+ it('should call shiftFocusUp()', () => {
+ expect(comp.shiftFocusUp).toHaveBeenCalled();
+ });
+ });
+
+ describe('when shiftFocusUp() is triggered', () => {
+ beforeEach(() => {
+ comp.shiftFocusUp(new KeyboardEvent('keydown.arrowup'));
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the last element ', () => {
+ const lastLink = de.query(By.css('.list-unstyled > li:last-child a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(lastLink.nativeElement);
+ });
+ });
+
+ describe('when key down is pressed', () => {
+ beforeEach(() => {
+ spyOn(comp, 'shiftFocusDown');
+ const form = de.query(By.css('form'));
+ form.triggerEventHandler('keydown.arrowdown', {});
+ fixture.detectChanges();
+ });
+
+ it('should call shiftFocusDown()', () => {
+ expect(comp.shiftFocusDown).toHaveBeenCalled();
+ });
+ });
+
+ describe('when shiftFocusDown() is triggered', () => {
+ beforeEach(() => {
+ comp.shiftFocusDown(new KeyboardEvent('keydown.arrowdown'));
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the first element ', () => {
+ const firstLink = de.query(By.css('.list-unstyled > li:first-child a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(firstLink.nativeElement);
+ });
+ });
+
+ describe('when changeFocus() is triggered when selectedIndex is 1', () => {
+ beforeEach(() => {
+ comp.selectedIndex = 1;
+ comp.changeFocus();
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the second element', () => {
+ const secondLink = de.query(By.css('.list-unstyled > li:nth-child(2) a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(secondLink.nativeElement);
+ });
+ });
+ });
+
+ describe('when the first element is in focus', () => {
+ beforeEach(() => {
+ const firstLink = de.query(By.css('.list-unstyled > li:first-child a'));
+ firstLink.nativeElement.focus();
+ comp.selectedIndex = 0;
+ fixture.detectChanges();
+
+ });
+
+ describe('when shiftFocusUp() is triggered', () => {
+ beforeEach(() => {
+ comp.shiftFocusUp(new KeyboardEvent('keydown.arrowup'));
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the last element ', () => {
+ const lastLink = de.query(By.css('.list-unstyled > li:last-child a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(lastLink.nativeElement);
+ });
+ });
+
+ describe('when shiftFocusDown() is triggered', () => {
+ beforeEach(() => {
+ comp.shiftFocusDown(new KeyboardEvent('keydown.arrowdown'));
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the second element ', () => {
+ const secondLink = de.query(By.css('.list-unstyled > li:nth-child(2) a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(secondLink.nativeElement);
+ });
+ });
+ });
+
+ describe('when the last element is in focus', () => {
+ beforeEach(() => {
+ const lastLink = de.query(By.css('.list-unstyled > li:last-child a'));
+ lastLink.nativeElement.focus();
+ comp.selectedIndex = suggestions.length - 1;
+ fixture.detectChanges();
+
+ });
+
+ describe('when shiftFocusUp() is triggered', () => {
+ beforeEach(() => {
+ comp.shiftFocusUp(new KeyboardEvent('keydown.arrowup'));
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the second last element ', () => {
+ const secondLastLink = de.query(By.css('.list-unstyled > li:nth-last-child(2) a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(secondLastLink.nativeElement);
+ });
+ });
+
+ describe('when shiftFocusDown() is triggered', () => {
+ beforeEach(() => {
+ comp.shiftFocusDown(new KeyboardEvent('keydown.arrowdown'));
+ fixture.detectChanges();
+ });
+
+ it('should put the focus on the first element ', () => {
+ const firstLink = de.query(By.css('.list-unstyled > li:first-child a'));
+ const activeElement = el.ownerDocument.activeElement;
+ expect(activeElement).toEqual(firstLink.nativeElement);
+ });
+ });
+
+ describe('when any key but is pressed in the form', () => {
+ beforeEach(() => {
+ spyOn(comp, 'onKeydown');
+ const form = de.query(By.css('form'));
+ form.triggerEventHandler('keydown', { key: 'Shift' });
+ fixture.detectChanges();
+ });
+
+ it('should call onKeydown', () => {
+ expect(comp.onKeydown).toHaveBeenCalled();
+ fixture.detectChanges();
+ })
+ });
+ describe('when onKeydown is triggered with the Enter key', () => {
+ beforeEach(() => {
+ spyOn(comp.queryInput.nativeElement, 'focus');
+ comp.onKeydown(new KeyboardEvent('keydown', {key: 'Enter'}));
+ fixture.detectChanges();
+ });
+
+ it('should not change the focus', () => {
+ expect(comp.queryInput.nativeElement.focus).not.toHaveBeenCalled();
+ });
+
+ });
+
+ describe('when onKeydown is triggered with the any other (not-Enter) key', () => {
+ beforeEach(() => {
+ spyOn(comp.queryInput.nativeElement, 'focus');
+ comp.onKeydown(new KeyboardEvent('keydown', {key: 'Shift'}));
+ fixture.detectChanges();
+ });
+
+ it('should change the focus', () => {
+ expect(comp.queryInput.nativeElement.focus).toHaveBeenCalled();
+ });
+
+ });
+ });
+
+ describe('when the suggestions list is not empty and show is true', () => {
+ beforeEach(() => {
+ comp.show.next(true);
+ fixture.detectChanges();
+ });
+ it('should contain an .autocomplete list with a \'show\' class', () => {
+ const autocomplete = de.query(By.css('div.autocomplete'));
+ expect(autocomplete.nativeElement.classList).toContain('show');
+ });
+ });
+
+ describe('when the suggestions list is not empty and show is false', () => {
+ beforeEach(() => {
+ comp.show.next(false);
+ fixture.detectChanges();
+ });
+ it('should contain an .autocomplete list without a \'show\' class', () => {
+ const autocomplete = de.query(By.css('div.autocomplete'));
+ expect(autocomplete.nativeElement.classList).not.toContain('show');
+ });
+ });
+
+ describe('when the suggestions list is empty and show is false', () => {
+ beforeEach(() => {
+ comp.suggestions = [];
+ comp.show.next(false);
+ fixture.detectChanges();
+ });
+ it('should contain an .autocomplete list without a \'show\' class', () => {
+ const autocomplete = de.query(By.css('div.autocomplete'));
+ expect(autocomplete.nativeElement.classList).not.toContain('show');
+ });
+ });
+ describe('when the suggestions list is empty and show is true', () => {
+ beforeEach(() => {
+ comp.suggestions = [];
+ comp.show.next(true);
+ fixture.detectChanges();
+ });
+ it('should contain an .autocomplete list without a \'show\' class', () => {
+ const autocomplete = de.query(By.css('div.autocomplete'));
+ expect(autocomplete.nativeElement.classList).not.toContain('show');
+ });
+ });
+ describe('when the variable \'show\' is set to true and close() is called', () => {
+ beforeEach(() => {
+ comp.show.next(true);
+ comp.close();
+ fixture.detectChanges();
+ });
+ it('should set \'show\' to false', () => {
+ expect(comp.show.getValue()).toBeFalsy();
+ });
+ });
+
+ describe('when an element is clicked', () => {
+ const clickedIndex = 0;
+ beforeEach(() => {
+ spyOn(comp, 'onClickSuggestion');
+ const clickedLink = de.query(By.css('.list-unstyled > li:nth-child(' + (clickedIndex + 1) + ') a'));
+ clickedLink.triggerEventHandler('click', {} );
+ fixture.detectChanges();
+ });
+ it('should call onClickSuggestion() with the suggestion as a parameter', () => {
+ expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value);
+ });
+ });
+
+});
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
new file mode 100644
index 0000000000..eb28583eaa
--- /dev/null
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -0,0 +1,191 @@
+import {
+ Component,
+ ElementRef, EventEmitter,
+ Input,
+ Output,
+ QueryList, SimpleChanges,
+ ViewChild,
+ ViewChildren
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { hasValue, isNotEmpty } from '../empty.util';
+
+@Component({
+ selector: 'ds-input-suggestions',
+ styleUrls: ['./input-suggestions.component.scss'],
+ templateUrl: './input-suggestions.component.html'
+})
+
+/**
+ * Component representing a form with a autocomplete functionality
+ */
+export class InputSuggestionsComponent {
+ /**
+ * The suggestions that should be shown
+ */
+ @Input() suggestions: any[] = [];
+
+ /**
+ * The time waited to detect if any other input will follow before requesting the suggestions
+ */
+ @Input() debounceTime = 500;
+
+ /**
+ * Placeholder attribute for the input field
+ */
+ @Input() placeholder = '';
+
+ /**
+ * Action attribute for the form
+ */
+ @Input() action;
+
+ /**
+ * Name attribute for the input field
+ */
+ @Input() name;
+
+ /**
+ * Value of the input field
+ */
+ @Input() ngModel;
+
+ /**
+ * Output for when the input field's value changes
+ */
+ @Output() ngModelChange = new EventEmitter();
+
+ /**
+ * Output for when the form is submitted
+ */
+ @Output() submitSuggestion = new EventEmitter();
+
+ /**
+ * Output for when a suggestion is clicked
+ */
+ @Output() clickSuggestion = new EventEmitter();
+
+ /**
+ * Output for when new suggestions should be requested
+ */
+ @Output() findSuggestions = new EventEmitter();
+
+ /**
+ * Emits true when the list of suggestions should be shown
+ */
+ show = new BehaviorSubject(false);
+
+ /**
+ * Index of the currently selected suggestion
+ */
+ selectedIndex = -1;
+
+ /**
+ * True when the dropdown should not reopen
+ */
+ blockReopen = false;
+
+ /**
+ * Reference to the input field component
+ */
+ @ViewChild('inputField') queryInput: ElementRef;
+ /**
+ * Reference to the suggestion components
+ */
+ @ViewChildren('suggestion') resultViews: QueryList;
+
+ /**
+ * When any of the inputs change, check if we should still show the suggestions
+ */
+ ngOnChanges(changes: SimpleChanges) {
+ if (hasValue(changes.suggestions)) {
+ this.show.next(isNotEmpty(changes.suggestions.currentValue));
+ }
+ }
+
+ /**
+ * Move the focus on one of the suggestions up to the previous suggestion
+ * When no suggestion is currently in focus OR the first suggestion is in focus: shift to the last suggestion
+ */
+ shiftFocusUp(event: KeyboardEvent) {
+ event.preventDefault();
+ if (this.selectedIndex > 0) {
+ this.selectedIndex--;
+ this.selectedIndex = (this.selectedIndex + this.resultViews.length) % this.resultViews.length; // Prevent negative modulo outcome
+ } else {
+ this.selectedIndex = this.resultViews.length - 1;
+ }
+ this.changeFocus();
+ }
+
+ /**
+ * Move the focus on one of the suggestions up to the next suggestion
+ * When no suggestion is currently in focus OR the last suggestion is in focus: shift to the first suggestion
+ */
+ shiftFocusDown(event: KeyboardEvent) {
+ event.preventDefault();
+ if (this.selectedIndex >= 0) {
+ this.selectedIndex++;
+ this.selectedIndex %= this.resultViews.length;
+ } else {
+ this.selectedIndex = 0;
+ }
+ this.changeFocus();
+ }
+
+ /**
+ * Perform the change of focus to the current selectedIndex
+ */
+ changeFocus() {
+ if (this.resultViews.length > 0) {
+ this.resultViews.toArray()[this.selectedIndex].nativeElement.focus();
+ }
+ }
+
+ /**
+ * When any key is pressed (except for the Enter button) the query input should move to the input field
+ * @param {KeyboardEvent} event The keyboard event
+ */
+ onKeydown(event: KeyboardEvent) {
+ if (event.key !== 'Enter') {
+ this.queryInput.nativeElement.focus();
+ }
+ }
+
+ /**
+ * Changes the show variable so the suggestion dropdown closes
+ */
+ close() {
+ this.show.next(false);
+ }
+
+ /**
+ * For usage of the isNotEmpty function in the template
+ */
+ isNotEmpty(data) {
+ return isNotEmpty(data);
+ }
+
+ /**
+ * Make sure that if a suggestion is clicked, the suggestions dropdown closes, does not reopen and the focus moves to the input field
+ */
+ onClickSuggestion(data) {
+ this.clickSuggestion.emit(data);
+ this.close();
+ this.blockReopen = true;
+ this.queryInput.nativeElement.focus();
+ return false;
+ }
+
+ /**
+ * Finds new suggestions when necessary
+ * @param data The query value to emit
+ */
+ find(data) {
+ if (!this.blockReopen) {
+ this.findSuggestions.emit(data);
+ }
+ this.blockReopen = false;
+ }
+
+}
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index 4f6b1a34fa..c628f75f7b 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,5 +1,5 @@
-
{{ message }}
+
{{ message }}
diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
index aca9673282..3c58fa3e9e 100644
--- a/src/app/shared/loading/loading.component.spec.ts
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -34,7 +34,8 @@ describe('LoadingComponent (inline template)', () => {
fixture = TestBed.createComponent(LoadingComponent);
comp = fixture.componentInstance; // LoadingComponent test instance
-
+ comp.message = 'test message';
+ fixture.detectChanges();
// query for the message
by CSS element selector
de = fixture.debugElement.query(By.css('label'));
el = de.nativeElement;
diff --git a/src/app/shared/mocks/mock-active-router.ts b/src/app/shared/mocks/mock-active-router.ts
index 391b9c3426..183d6c13d0 100644
--- a/src/app/shared/mocks/mock-active-router.ts
+++ b/src/app/shared/mocks/mock-active-router.ts
@@ -29,6 +29,6 @@ export class MockActivatedRoute {
// ActivatedRoute.snapshot.params
get snapshot() {
- return { params: this.testParams };
+ return { params: this.testParams, queryParams: this.testParams };
}
}
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index 561e10263c..b35d6dee59 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -1,4 +1,4 @@
-
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index c433cd1e4d..1c8f0ae17c 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -1,5 +1,11 @@
@import '../../../../styles/variables.scss';
+.alert {
+ display: inline-block;
+ min-width: $modal-sm;
+ text-align: left;
+}
+
.close {
outline: none !important
}
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.html b/src/app/shared/notifications/notifications-board/notifications-board.component.html
index d660444632..15f5044bc4 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.html
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.html
@@ -1,5 +1,6 @@
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.scss b/src/app/shared/notifications/notifications-board/notifications-board.component.scss
index 0dd1584c4e..47b1dba0c3 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.scss
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.scss
@@ -2,24 +2,28 @@
@import '../../../../styles/mixins';
.notifications-wrapper {
- width: 300px;
- z-index: 1051;
+ z-index: $zindex-popover;
+ text-align: right;
+ @include word-wrap;
+ .notification {
+ display: block;
+ }
}
.notifications-wrapper.left {
- left: 20px;
+ left: 0;
}
.notifications-wrapper.top {
- top: 20px;
+ top:0;
}
.notifications-wrapper.right {
- right: 20px;
+ right: 0;
}
.notifications-wrapper.bottom {
- bottom: 20px;
+ bottom: 0;
}
.notifications-wrapper.center {
@@ -39,7 +43,7 @@
@media screen and (max-width: map-get($grid-breakpoints, sm)) {
.notifications-wrapper {
width: auto;
- left: 20px;
- right: 20px;
+ left: 0;
+ right: 0;
}
}
diff --git a/src/app/shared/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts
index b27a342eac..0548efc967 100644
--- a/src/app/shared/object-collection/object-collection.component.spec.ts
+++ b/src/app/shared/object-collection/object-collection.component.spec.ts
@@ -1,13 +1,11 @@
import { ObjectCollectionComponent } from './object-collection.component';
-import { ViewMode } from '../../+search-page/search-options.model';
-import { element } from 'protractor';
import { By } from '@angular/platform-browser';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Config } from '../../../config/config.interface';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { RouterStub } from '../testing/router-stub';
+import { ViewMode } from '../../core/shared/view-mode.model';
describe('ObjectCollectionComponent', () => {
let fixture: ComponentFixture
;
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 3af92443c1..b4a436c5de 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -14,8 +14,8 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { ListableObject } from './shared/listable-object.model';
-import { ViewMode } from '../../+search-page/search-options.model';
import { hasValue, isNotEmpty } from '../empty.util';
+import { ViewMode } from '../../core/shared/view-mode.model';
@Component({
selector: 'ds-viewable-collection',
diff --git a/src/app/shared/object-collection/shared/dso-element-decorator.spec.ts b/src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
index 9f54bebed9..9243d13b8e 100644
--- a/src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
+++ b/src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
@@ -1,6 +1,6 @@
-import { ViewMode } from '../../../+search-page/search-options.model';
import { renderElementsFor } from './dso-element-decorator';
import { Item } from '../../../core/shared/item.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
describe('ElementDecorator', () => {
const gridDecorator = renderElementsFor(Item, ViewMode.Grid);
diff --git a/src/app/shared/object-collection/shared/dso-element-decorator.ts b/src/app/shared/object-collection/shared/dso-element-decorator.ts
index 51aa57bc50..98650fd25b 100644
--- a/src/app/shared/object-collection/shared/dso-element-decorator.ts
+++ b/src/app/shared/object-collection/shared/dso-element-decorator.ts
@@ -1,6 +1,6 @@
import { GenericConstructor } from '../../../core/shared/generic-constructor';
import { ListableObject } from './listable-object.model';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
const dsoElementMap = new Map();
export function renderElementsFor(listable: GenericConstructor, viewMode: ViewMode) {
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index f383367e3f..a690037619 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -2,8 +2,8 @@ import { Component, Inject } from '@angular/core';
import { Collection } from '../../../core/shared/collection.model';
import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../../+search-page/search-options.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-collection-grid-element',
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index 21d73ff0fa..4df9ab9555 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, Inject } from '@angular/core';
import { Community } from '../../../core/shared/community.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-community-grid-element',
diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
index 5a8d46f1f2..7a679fef25 100644
--- a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, Inject } from '@angular/core';
import { Item } from '../../../core/shared/item.model';
import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-item-grid-element',
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index 7f8a3bb9fd..c1f27bee4f 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
import { renderElementsFor} from '../../../object-collection/shared/dso-element-decorator';
import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
import { Collection } from '../../../../core/shared/collection.model';
-import { ViewMode } from '../../../../+search-page/search-options.model';
import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
@Component({
selector: 'ds-collection-search-result-grid-element',
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index 7c34207f5e..8fac11a6a4 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
import { Community } from '../../../../core/shared/community.model';
import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { ViewMode } from '../../../../+search-page/search-options.model';
import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
@Component({
selector: 'ds-community-search-result-grid-element',
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
index 518fc23a44..232c161779 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
@@ -4,8 +4,8 @@ import { renderElementsFor } from '../../../object-collection/shared/dso-element
import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
import { Item } from '../../../../core/shared/item.model';
import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ViewMode } from '../../../../+search-page/search-options.model';
import { focusShadow } from '../../../../shared/animations/focus';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
@Component({
selector: 'ds-item-search-result-grid-element',
diff --git a/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
index f807542e76..e16aac6799 100644
--- a/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
+++ b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
@@ -1,8 +1,8 @@
import { Component, Injector, Input, OnInit } from '@angular/core';
-import { ViewMode } from '../../../+search-page/search-options.model';
import { GenericConstructor } from '../../../core/shared/generic-constructor';
import { rendersDSOType } from '../../object-collection/shared/dso-element-decorator';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-wrapper-grid-element',
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index f95c087d5c..b4e9de16b7 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -2,8 +2,8 @@ import { Component, Inject } from '@angular/core';
import { Collection } from '../../../core/shared/collection.model';
import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../../+search-page/search-options.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-collection-list-element',
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
index e92c080a31..8f6870db7e 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,9 +1,9 @@
-import { Component, Input, Inject } from '@angular/core';
+import { Component } from '@angular/core';
import { Community } from '../../../core/shared/community.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-community-list-element',
diff --git a/src/app/shared/object-list/item-list-element/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-list-element.component.ts
index e4efbd6b08..bc77b513fb 100644
--- a/src/app/shared/object-list/item-list-element/item-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.ts
@@ -1,9 +1,9 @@
-import { Component, Input, Inject } from '@angular/core';
+import { Component } from '@angular/core';
import { Item } from '../../../core/shared/item.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
@Component({
selector: 'ds-item-list-element',
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 746e700f05..264f9ce1a9 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -4,8 +4,8 @@ import { renderElementsFor } from '../../../object-collection/shared/dso-element
import { SearchResultListElementComponent } from '../search-result-list-element.component';
import { Collection } from '../../../../core/shared/collection.model';
-import { ViewMode } from '../../../../+search-page/search-options.model';
import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
@Component({
selector: 'ds-collection-search-result-list-element',
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index 2ca89fc9c5..227ff9a45d 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -4,8 +4,8 @@ import { renderElementsFor } from '../../../object-collection/shared/dso-element
import { SearchResultListElementComponent } from '../search-result-list-element.component';
import { Community } from '../../../../core/shared/community.model';
-import { ViewMode } from '../../../../+search-page/search-options.model';
import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
@Component({
selector: 'ds-community-search-result-list-element',
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
index e1f559dd66..584d476e73 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
@@ -5,7 +5,7 @@
(,
-
+
{{'search.form.search_dspace' | translate}}
{{scopeOption?.name ? scopeOption.name : 'search.form.search_dspace' | translate}}
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 5fd984a731..21a90daed4 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,8 +1,8 @@
import { Component, Input } from '@angular/core';
-import { SearchService } from '../../+search-page/search-service/search.service';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { Router } from '@angular/router';
-import { isNotEmpty, hasValue, isEmpty, hasNoValue } from '../empty.util';
+import { hasValue, isNotEmpty } from '../empty.util';
+import { QueryParamsHandling } from '@angular/router/src/config';
/**
* This component renders a simple item page.
@@ -15,36 +15,67 @@ import { isNotEmpty, hasValue, isEmpty, hasNoValue } from '../empty.util';
styleUrls: ['./search-form.component.scss'],
templateUrl: './search-form.component.html'
})
-export class SearchFormComponent {
- @Input() query: string;
- selectedId = '';
- @Input() currentUrl: string;
- @Input() scopes: DSpaceObject[];
+/**
+ * Component that represents the search form
+ */
+export class SearchFormComponent {
+ /**
+ * The search query
+ */
+ @Input() query: string;
+
+ /**
+ * The currently selected scope object's UUID
+ */
@Input()
- set scope(id: string) {
- this.selectedId = id;
- }
+ scope = '';
+
+ @Input() currentUrl: string;
+
+ /**
+ * The available scopes
+ */
+ @Input() scopes: DSpaceObject[];
constructor(private router: Router) {
}
+ /**
+ * Updates the search when the form is submitted
+ * @param data Values submitted using the form
+ */
onSubmit(data: any) {
this.updateSearch(data);
}
+ /**
+ * Updates the search when the current scope has been changed
+ * @param {string} scope The new scope
+ */
+ onScopeChange(scope: string) {
+ this.updateSearch({ scope });
+ }
+
+ /**
+ * Updates the search URL
+ * @param data Updated parameters
+ */
updateSearch(data: any) {
- const newUrl = hasValue(this.currentUrl) ? this.currentUrl : 'search';
+ const newUrl = hasValue(this.currentUrl) ? this.currentUrl : '/search';
+ let handling: QueryParamsHandling = '' ;
+ if (this.currentUrl === '/search') {
+ handling = 'merge';
+ }
this.router.navigate([newUrl], {
- queryParams: {
- query: data.query,
- scope: data.scope || undefined,
- page: data.page || 1
- },
- queryParamsHandling: 'merge'
+ queryParams: Object.assign({}, { page: 1 }, data),
+ queryParamsHandling: handling
});
}
+ /**
+ * For usage of the isNotEmpty function in the template
+ */
isNotEmpty(object: any) {
return isNotEmpty(object);
}
diff --git a/src/app/shared/services/route.service.ts b/src/app/shared/services/route.service.ts
index aa683a6403..7c24c6f6c1 100644
--- a/src/app/shared/services/route.service.ts
+++ b/src/app/shared/services/route.service.ts
@@ -38,6 +38,7 @@ export class RouteService {
params[key] = [...map.getAll(key)];
});
return params;
- }).distinctUntilChanged();
+ })
+ .distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b));
}
}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 57ba7dec4d..bc8292d6bb 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NouisliderModule } from 'ng2-nouislider';
import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
@@ -72,6 +73,13 @@ import { NumberPickerComponent } from './number-picker/number-picker.component';
import { DsDatePickerComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
import { DsDynamicLookupComponent } from './form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
import { MockAdminGuard } from './mocks/mock-admin-guard.service';
+import { DebounceDirective } from './utils/debounce.directive';
+import { ClickOutsideDirective } from './utils/click-outside.directive';
+import { EmphasizePipe } from './utils/emphasize.pipe';
+import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
+import { CapitalizePipe } from './utils/capitalize.pipe';
+import { MomentModule } from 'angular2-moment';
+import { ObjectKeysPipe } from './utils/object-keys-pipe';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -90,6 +98,8 @@ const MODULES = [
ReactiveFormsModule,
RouterModule,
TranslateModule,
+ NouisliderModule,
+ MomentModule,
TextMaskModule
];
@@ -99,6 +109,9 @@ const PIPES = [
FileSizePipe,
SafeUrlPipe,
TruncatePipe,
+ EmphasizePipe,
+ CapitalizePipe,
+ ObjectKeysPipe,
ConsolePipe
];
@@ -139,6 +152,7 @@ const COMPONENTS = [
ViewModeSwitchComponent,
TruncatableComponent,
TruncatablePartComponent,
+ InputSuggestionsComponent
];
const ENTRY_COMPONENTS = [
@@ -160,7 +174,9 @@ const PROVIDERS = [
const DIRECTIVES = [
VarDirective,
- DragClickDirective
+ DragClickDirective,
+ DebounceDirective,
+ ClickOutsideDirective
];
@NgModule({
@@ -187,6 +203,10 @@ const DIRECTIVES = [
...ENTRY_COMPONENTS
]
})
+
+/**
+ * This module handles all components and pipes that need to be shared among multiple other modules
+ */
export class SharedModule {
}
diff --git a/src/app/shared/testing/active-router-stub.ts b/src/app/shared/testing/active-router-stub.ts
index 35c966d72a..22c4060855 100644
--- a/src/app/shared/testing/active-router-stub.ts
+++ b/src/app/shared/testing/active-router-stub.ts
@@ -21,7 +21,10 @@ export class ActivatedRouteStub {
}
// Test parameters
- get testParams() { return this._testParams; }
+ get testParams() {
+ return this._testParams;
+ }
+
set testParams(params: {}) {
this._testParams = params;
this.subject.next(params);
@@ -29,6 +32,9 @@ export class ActivatedRouteStub {
// ActivatedRoute.snapshot.params
get snapshot() {
- return { params: this.testParams };
+ return {
+ params: this.testParams,
+ queryParamMap: convertToParamMap(this.testParams)
+ }
}
}
diff --git a/src/app/shared/testing/hal-endpoint-service-stub.ts b/src/app/shared/testing/hal-endpoint-service-stub.ts
index e7dbe8bea1..a1764df009 100644
--- a/src/app/shared/testing/hal-endpoint-service-stub.ts
+++ b/src/app/shared/testing/hal-endpoint-service-stub.ts
@@ -1,6 +1,4 @@
import { Observable } from 'rxjs/Observable';
-import { ViewMode } from '../../+search-page/search-options.model';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
export class HALEndpointServiceStub {
diff --git a/src/app/shared/testing/search-service-stub.ts b/src/app/shared/testing/search-service-stub.ts
index 7ad0d871ce..b9c1d7533f 100644
--- a/src/app/shared/testing/search-service-stub.ts
+++ b/src/app/shared/testing/search-service-stub.ts
@@ -1,6 +1,6 @@
import { Observable } from 'rxjs/Observable';
-import { ViewMode } from '../../+search-page/search-options.model';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { ViewMode } from '../../core/shared/view-mode.model';
export class SearchServiceStub {
@@ -37,4 +37,8 @@ export class SearchServiceStub {
getSearchLink() {
return this.searchLink;
}
+
+ getFilterLabels() {
+ return Observable.of([]);
+ }
}
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 0f695625ec..fef5d7d098 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -1,5 +1,6 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { TruncatableService } from '../truncatable.service';
+import { hasValue } from '../../empty.util';
@Component({
selector: 'ds-truncatable-part',
@@ -7,22 +8,59 @@ import { TruncatableService } from '../truncatable.service';
styleUrls: ['./truncatable-part.component.scss']
})
+/**
+ * Component that truncates/clamps a piece of text
+ * It needs a TruncatableComponent parent to identify it's current state
+ */
export class TruncatablePartComponent implements OnInit, OnDestroy {
+ /**
+ * Number of lines shown when the part is collapsed
+ */
@Input() minLines: number;
+
+ /**
+ * Number of lines shown when the part is expanded. -1 indicates no limit
+ */
@Input() maxLines = -1;
+
+ /**
+ * The identifier of the parent TruncatableComponent
+ */
@Input() id: string;
+
+ /**
+ * Type of text, can be a h4 for headers or any other class you want to add
+ */
@Input() type: string;
+
+ /**
+ * True if the minimal height of the part should at least be as high as it's minimum amount of lines
+ */
@Input() fixedHeight = false;
+
+ /**
+ * Current amount of lines shown of this part
+ */
lines: string;
+
+ /**
+ * Subscription to unsubscribe from
+ */
private sub;
public constructor(private service: TruncatableService) {
}
+ /**
+ * Initialize lines variable
+ */
ngOnInit() {
this.setLines();
}
+ /**
+ * Subscribe to the current state to determine how much lines should be shown of this part
+ */
private setLines() {
this.sub = this.service.isCollapsed(this.id).subscribe((collapsed: boolean) => {
if (collapsed) {
@@ -33,7 +71,12 @@ export class TruncatablePartComponent implements OnInit, OnDestroy {
});
}
+ /**
+ * Unsubscribe from the subscription
+ */
ngOnDestroy(): void {
- this.sub.unsubscribe();
+ if (hasValue(this.sub)) {
+ this.sub.unsubscribe();
+ }
}
}
diff --git a/src/app/shared/truncatable/truncatable.actions.ts b/src/app/shared/truncatable/truncatable.actions.ts
index 9d3a51219b..9f85d55afe 100644
--- a/src/app/shared/truncatable/truncatable.actions.ts
+++ b/src/app/shared/truncatable/truncatable.actions.ts
@@ -16,22 +16,43 @@ export const TruncatableActionTypes = {
};
export class TruncatableAction implements Action {
+ /**
+ * UUID of the truncatable component the action is performed on, used to identify the filter
+ */
id: string;
+
+ /**
+ * Type of action that will be performed
+ */
type;
- constructor(name: string) {
- this.id = name;
+
+ /**
+ * Initialize with the truncatable component's UUID
+ * @param {string} id of the filter
+ */
+ constructor(id: string) {
+ this.id = id;
}
}
/* tslint:disable:max-classes-per-file */
+/**
+ * Used to collapse a truncatable component when it's expanded and expand it when it's collapsed
+ */
export class TruncatableToggleAction extends TruncatableAction {
type = TruncatableActionTypes.TOGGLE;
}
+/**
+ * Used to collapse a truncatable component
+ */
export class TruncatableCollapseAction extends TruncatableAction {
type = TruncatableActionTypes.COLLAPSE;
}
+/**
+ * Used to expand a truncatable component
+ */
export class TruncatableExpandAction extends TruncatableAction {
type = TruncatableActionTypes.EXPAND;
}
diff --git a/src/app/shared/truncatable/truncatable.component.ts b/src/app/shared/truncatable/truncatable.component.ts
index 81ad2b3cff..e22ce4441e 100644
--- a/src/app/shared/truncatable/truncatable.component.ts
+++ b/src/app/shared/truncatable/truncatable.component.ts
@@ -9,14 +9,32 @@ import { TruncatableService } from './truncatable.service';
styleUrls: ['./truncatable.component.scss'],
})
+
+/**
+ * Component that represents a section with one or more truncatable parts that all listen to this state
+ */
export class TruncatableComponent {
+ /**
+ * Is true when all truncatable parts in this truncatable should be expanded on loading
+ */
@Input() initialExpand = false;
+
+ /**
+ * The unique identifier of this truncatable component
+ */
@Input() id: string;
+
+ /**
+ * Is true when the truncatable should expand on both hover as click
+ */
@Input() onHover = false;
public constructor(private service: TruncatableService) {
}
+ /**
+ * Set the initial state
+ */
ngOnInit() {
if (this.initialExpand) {
this.service.expand(this.id);
@@ -25,18 +43,27 @@ export class TruncatableComponent {
}
}
+ /**
+ * If onHover is true, collapses the truncatable
+ */
public hoverCollapse() {
if (this.onHover) {
this.service.collapse(this.id);
}
}
+ /**
+ * If onHover is true, expands the truncatable
+ */
public hoverExpand() {
if (this.onHover) {
this.service.expand(this.id);
}
}
+ /**
+ * Expands the truncatable when it's collapsed, collapses it when it's expanded
+ */
public toggle() {
this.service.toggle(this.id);
}
diff --git a/src/app/shared/truncatable/truncatable.reducer.ts b/src/app/shared/truncatable/truncatable.reducer.ts
index d9a2111682..11b4ac758d 100644
--- a/src/app/shared/truncatable/truncatable.reducer.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.ts
@@ -1,15 +1,27 @@
import { TruncatableAction, TruncatableActionTypes } from './truncatable.actions';
+/**
+ * Interface that represents the state of a single truncatable
+ */
export interface TruncatableState {
collapsed: boolean;
}
+/**
+ * Interface that represents the state of all truncatable
+ */
export interface TruncatablesState {
[id: string]: TruncatableState
}
const initialState: TruncatablesState = Object.create(null);
+/**
+ * Performs a truncatable action on the current state
+ * @param {TruncatablesState} state The state before the action is performed
+ * @param {TruncatableAction} action The action that should be performed
+ * @returns {TruncatablesState} The state after the action is performed
+ */
export function truncatableReducer(state = initialState, action: TruncatableAction): TruncatablesState {
switch (action.type) {
diff --git a/src/app/shared/truncatable/truncatable.service.ts b/src/app/shared/truncatable/truncatable.service.ts
index 5f36c6a60d..2f707d6609 100644
--- a/src/app/shared/truncatable/truncatable.service.ts
+++ b/src/app/shared/truncatable/truncatable.service.ts
@@ -7,12 +7,20 @@ import { hasValue } from '../empty.util';
const truncatableStateSelector = (state: TruncatablesState) => state.truncatable;
+/**
+ * Service responsible for truncating/clamping text and performing actions on truncatable elements
+ */
@Injectable()
export class TruncatableService {
constructor(private store: Store) {
}
+ /**
+ * Checks if a trunctable component should currently be collapsed
+ * @param {string} id The UUID of the truncatable component
+ * @returns {Observable} Emits true if the state in the store is currently collapsed for the given truncatable component
+ */
isCollapsed(id: string): Observable {
return this.store.select(truncatableByIdSelector(id))
.map((object: TruncatableState) => {
@@ -24,14 +32,26 @@ export class TruncatableService {
});
}
+ /**
+ * Dispatches a toggle action to the store for a given truncatable component
+ * @param {string} id The identifier of the truncatable for which the action is dispatched
+ */
public toggle(id: string): void {
this.store.dispatch(new TruncatableToggleAction(id));
}
+ /**
+ * Dispatches a collapse action to the store for a given truncatable component
+ * @param {string} id The identifier of the truncatable for which the action is dispatched
+ */
public collapse(id: string): void {
this.store.dispatch(new TruncatableCollapseAction(id));
}
+ /**
+ * Dispatches an expand action to the store for a given truncatable component
+ * @param {string} id The identifier of the truncatable for which the action is dispatched
+ */
public expand(id: string): void {
this.store.dispatch(new TruncatableExpandAction(id));
}
diff --git a/src/app/shared/utils/capitalize.pipe.ts b/src/app/shared/utils/capitalize.pipe.ts
new file mode 100644
index 0000000000..03ad25ed6e
--- /dev/null
+++ b/src/app/shared/utils/capitalize.pipe.ts
@@ -0,0 +1,22 @@
+import { Pipe, PipeTransform } from '@angular/core'
+
+@Pipe({
+ name: 'dsCapitalize'
+})
+
+/**
+ * Pipe for capizalizing a string
+ */
+export class CapitalizePipe implements PipeTransform {
+ /**
+ * @param {string} value String to be capitalized
+ * @returns {string} Capitalized version of the input value
+ */
+ transform(value: string): string {
+ if (value) {
+ return value.charAt(0).toUpperCase() + value.slice(1);
+ }
+ return value;
+ }
+
+}
diff --git a/src/app/shared/utils/click-outside.directive.ts b/src/app/shared/utils/click-outside.directive.ts
new file mode 100644
index 0000000000..e8efdf2d7a
--- /dev/null
+++ b/src/app/shared/utils/click-outside.directive.ts
@@ -0,0 +1,26 @@
+import { Directive, ElementRef, Output, EventEmitter, HostListener } from '@angular/core';
+
+@Directive({
+ selector: '[dsClickOutside]'
+})
+/**
+ * Directive to detect when the users clicks outside of the element the directive was put on
+ */
+export class ClickOutsideDirective {
+ /**
+ * Emits null when the user clicks outside of the element
+ */
+ @Output()
+ public dsClickOutside = new EventEmitter();
+
+ constructor(private _elementRef: ElementRef) {
+ }
+
+ @HostListener('document:click', ['$event.target'])
+ public onClick(targetElement) {
+ const clickedInside = this._elementRef.nativeElement.contains(targetElement);
+ if (!clickedInside) {
+ this.dsClickOutside.emit(null);
+ }
+ }
+}
diff --git a/src/app/shared/utils/debounce.directive.ts b/src/app/shared/utils/debounce.directive.ts
new file mode 100644
index 0000000000..6a39a598c0
--- /dev/null
+++ b/src/app/shared/utils/debounce.directive.ts
@@ -0,0 +1,67 @@
+import { Directive, Input, Output, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { NgControl } from '@angular/forms';
+import 'rxjs/add/operator/debounceTime';
+import 'rxjs/add/operator/distinctUntilChanged';
+import 'rxjs/add/operator/takeUntil';
+import { Subject } from 'rxjs/Subject';
+
+@Directive({
+ selector: '[ngModel][dsDebounce]',
+})
+/**
+ * Directive for setting a debounce time on an input field
+ * It will emit the input field's value when no changes were made to this value in a given debounce time
+ */
+export class DebounceDirective implements OnInit, OnDestroy {
+
+ /**
+ * Emits a value when nothing has changed in dsDebounce milliseconds
+ */
+ @Output()
+ public onDebounce = new EventEmitter();
+
+ /**
+ * The debounce time in milliseconds
+ */
+ @Input()
+ public dsDebounce = 500;
+
+ /**
+ * True if no changes have been made to the input field's value
+ */
+ private isFirstChange = true;
+
+ /**
+ * Subject to unsubscribe from
+ */
+ private subject: Subject = new Subject();
+
+ constructor(public model: NgControl) {
+ }
+
+ /**
+ * Start listening to changes of the input field's value changes
+ * Emit it when the debounceTime is over without new changes
+ */
+ ngOnInit() {
+ this.model.valueChanges
+ .takeUntil(this.subject)
+ .debounceTime(this.dsDebounce)
+ .distinctUntilChanged()
+ .subscribe((modelValue) => {
+ if (this.isFirstChange) {
+ this.isFirstChange = false;
+ } else {
+ this.onDebounce.emit(modelValue);
+ }
+ });
+ }
+
+ /**
+ * Close subject
+ */
+ ngOnDestroy() {
+ this.subject.next();
+ this.subject.complete();
+ }
+}
diff --git a/src/app/shared/utils/drag-click.directive.ts b/src/app/shared/utils/drag-click.directive.ts
index ec9b02dea5..3ba9eb5986 100644
--- a/src/app/shared/utils/drag-click.directive.ts
+++ b/src/app/shared/utils/drag-click.directive.ts
@@ -3,15 +3,36 @@ import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
@Directive({
selector: '[dsDragClick]'
})
+
+/**
+ * Directive for preventing drag events being misinterpret as clicks
+ * The difference is made using the time the mouse button is pushed down
+ */
export class DragClickDirective {
+ /**
+ * The start time of the mouse down event in milliseconds
+ */
private start;
+
+ /**
+ * Emits a click event when the click is perceived as an actual click and not a drag
+ */
@Output() actualClick = new EventEmitter();
+ /**
+ * When the mouse button is pushed down, register the start time
+ * @param event Mouse down event
+ */
@HostListener('mousedown', ['$event'])
mousedownEvent(event) {
this.start = new Date();
}
+ /**
+ * When the mouse button is let go of, check how long if it was down for
+ * If the mouse button was down for more than 250ms, don't emit a click event
+ * @param event Mouse down event
+ */
@HostListener('mouseup', ['$event'])
mouseupEvent(event) {
const end: any = new Date();
diff --git a/src/app/shared/utils/emphasize.pipe.ts b/src/app/shared/utils/emphasize.pipe.ts
new file mode 100644
index 0000000000..613074a308
--- /dev/null
+++ b/src/app/shared/utils/emphasize.pipe.ts
@@ -0,0 +1,56 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({ name: 'dsEmphasize' })
+/**
+ * Pipe for emphasizing a part of a string by surrounding it with tags
+ */
+export class EmphasizePipe implements PipeTransform {
+ /**
+ * Characters that should be escaped
+ */
+ specials = [
+ // order matters for these
+ '-'
+ , '['
+ , ']'
+ // order doesn't matter for any of these
+ , '/'
+ , '{'
+ , '}'
+ , '('
+ , ')'
+ , '*'
+ , '+'
+ , '?'
+ , '.'
+ , '\\'
+ , '^'
+ , '$'
+ , '|'
+ ];
+ /**
+ * Regular expression for escaping the string we're trying to find
+ */
+ regex = RegExp('[' + this.specials.join('\\') + ']', 'g');
+
+ /**
+ *
+ * @param haystack The string which we want to partly highlight
+ * @param needle The string that should become emphasized in the haystack string
+ * @returns {any} Transformed haystack with the needle emphasized
+ */
+ transform(haystack, needle): any {
+ const escaped = this.escapeRegExp(needle);
+ const reg = new RegExp(escaped, 'gi');
+ return haystack.replace(reg, '$& ');
+ }
+
+ /**
+ *
+ * @param str Escape special characters in the string we're looking for
+ * @returns {any} The escaped version of the input string
+ */
+ escapeRegExp(str) {
+ return str.replace(this.regex, '\\$&');
+ }
+}
diff --git a/src/app/shared/utils/enum-keys-pipe.ts b/src/app/shared/utils/enum-keys-pipe.ts
index 82893b886f..0a4a445c02 100644
--- a/src/app/shared/utils/enum-keys-pipe.ts
+++ b/src/app/shared/utils/enum-keys-pipe.ts
@@ -1,8 +1,16 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({ name: 'dsKeys' })
+/**
+ * Pipe for parsing all values of an enumeration to an array of key-value pairs
+ */
export class EnumKeysPipe implements PipeTransform {
- transform(value, args: string[]): any {
+
+ /**
+ * @param value An enumeration
+ * @returns {any} Array with all keys and values of the input enumeration
+ */
+ transform(value): any {
const keys = [];
for (const enumMember in value) {
if (!isNaN(parseInt(enumMember, 10))) {
diff --git a/src/app/shared/utils/object-keys-pipe.ts b/src/app/shared/utils/object-keys-pipe.ts
new file mode 100644
index 0000000000..fd3d018b88
--- /dev/null
+++ b/src/app/shared/utils/object-keys-pipe.ts
@@ -0,0 +1,18 @@
+import { PipeTransform, Pipe } from '@angular/core';
+
+@Pipe({name: 'dsObjectKeys'})
+/**
+ * Pipe for parsing all keys of an object to an array of key-value pairs
+ */
+export class ObjectKeysPipe implements PipeTransform {
+
+ /**
+ * @param value An object
+ * @returns {any} Array with all keys the input object
+ */
+ transform(value, args:string[]): any {
+ const keys = [];
+ Object.keys(value).forEach((k) => keys.push(k));
+ return keys;
+ }
+}
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
index 1b4bf6da46..1211b4bc88 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
@@ -8,8 +8,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
import { SearchService } from '../../+search-page/search-service/search.service';
import { ViewModeSwitchComponent } from './view-mode-switch.component';
-import { ViewMode } from '../../+search-page/search-options.model';
import { SearchServiceStub } from '../testing/search-service-stub';
+import { ViewMode } from '../../core/shared/view-mode.model';
@Component({ template: '' })
class DummyComponent { }
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index f6e04816fb..d34a4b4d60 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -1,7 +1,7 @@
import { Subscription } from 'rxjs/Subscription';
import { Component, OnInit, OnDestroy } from '@angular/core';
-import { ViewMode } from '../../+search-page/search-options.model';
import { SearchService } from './../../+search-page/search-service/search.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
/**
* Component to switch between list and grid views.
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index a57d2deddf..ea89a3a0d5 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -34,3 +34,4 @@ $navbar-light-color: rgba(black, .5) !default;
$navbar-dark-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-dark-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E");
$navbar-light-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-light-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E");
+$enable-shadows: true !default;
diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss
index 564ffc7755..2155396164 100644
--- a/src/styles/_mixins.scss
+++ b/src/styles/_mixins.scss
@@ -1,3 +1,15 @@
@import '../../node_modules/bootstrap/scss/functions.scss';
@import '../../node_modules/bootstrap/scss/mixins.scss';
-@import '../../node_modules/bootstrap/scss/variables.scss';
\ No newline at end of file
+@import '../../node_modules/bootstrap/scss/variables.scss';
+
+@mixin word-wrap() {
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+ -ms-word-break: break-all;
+ word-break: break-all;
+ word-break: break-word;
+ -ms-hyphens: auto;
+ -moz-hyphens: auto;
+ -webkit-hyphens: auto;
+ hyphens: auto;
+}
diff --git a/webpack/webpack.test.js b/webpack/webpack.test.js
index 66a1454a08..210c33e66c 100644
--- a/webpack/webpack.test.js
+++ b/webpack/webpack.test.js
@@ -74,12 +74,8 @@ module.exports = function (options) {
enforce: 'pre',
test: /\.js$/,
loader: 'source-map-loader',
- exclude: [
- // these packages have problems with their sourcemaps
- root('node_modules/@angular'),
- root('node_modules/@nguniversal'),
- root('node_modules/rxjs')
- ]
+ exclude: [/node_modules/],
+
},
/**
diff --git a/yarn.lock b/yarn.lock
index 3207959415..344093d446 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -437,6 +437,12 @@ angular-idle-preload@2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-2.0.4.tgz#7b177c0f52918c090e5c345480b922297cd59a0d"
+angular2-moment@^1.9.0:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/angular2-moment/-/angular2-moment-1.9.0.tgz#d198a4d9bc825f61de19106ac7ea07a78569f5a1"
+ dependencies:
+ moment "^2.19.3"
+
angular-sortablejs@^2.5.0:
version "2.5.2"
resolved "https://registry.yarnpkg.com/angular-sortablejs/-/angular-sortablejs-2.5.2.tgz#ffd651e47cc93a191db4c023f617db3789fd9af5"
@@ -1064,9 +1070,9 @@ boom@5.x.x:
dependencies:
hoek "4.x.x"
-bootstrap@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
+bootstrap@4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"
boxen@^1.2.1:
version "1.3.0"
@@ -5525,6 +5531,10 @@ module-deps@^4.0.8:
through2 "^2.0.0"
xtend "^4.0.0"
+moment@^2.19.3, moment@^2.22.1:
+ version "2.22.1"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+
morgan@1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"
@@ -5625,6 +5635,10 @@ ng2-file-upload@1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.2.1.tgz#5563c5dfd6f43fbfbe815c206e343464a0a6a197"
+ng2-nouislider@^1.7.11:
+ version "1.7.11"
+ resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.7.11.tgz#b8ba5e3d2ffc23e1e32dfe54dd1726e2b4be316b"
+
ngrx-store-freeze@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ngrx-store-freeze/-/ngrx-store-freeze-0.2.1.tgz#04fb29db33cafda0f2d6ea32adeaac4891b1b27b"
@@ -5848,6 +5862,10 @@ normalize-url@^1.4.0:
query-string "^4.1.0"
sort-keys "^1.0.0"
+nouislider@^11.0.0:
+ version "11.1.0"
+ resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-11.1.0.tgz#1768eb5b854917325d41b96f2dc4eb3757d73381"
+
npm-run-all@4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"