+
{{collection.name}}
{{collection.shortDescription}}
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index fc69719896..aed2b69a30 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -6,6 +6,7 @@ import { Collection } from '../../core/shared/collection.model';
import { Community } from '../../core/shared/community.model';
import { fadeIn } from '../../shared/animations/fade';
+import { PaginatedList } from '../../core/data/paginated-list';
@Component({
selector: 'ds-community-page-sub-collection-list',
@@ -15,7 +16,7 @@ import { fadeIn } from '../../shared/animations/fade';
})
export class CommunityPageSubCollectionListComponent implements OnInit {
@Input() community: Community;
- subCollectionsRDObs: Observable
{{collection?.name}}
diff --git a/src/app/+item-page/field-components/collections/collections.component.spec.ts b/src/app/+item-page/field-components/collections/collections.component.spec.ts
new file mode 100644
index 0000000000..871018a9d8
--- /dev/null
+++ b/src/app/+item-page/field-components/collections/collections.component.spec.ts
@@ -0,0 +1,74 @@
+import { CollectionsComponent } from './collections.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { Collection } from '../../../core/shared/collection.model';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/mock-remote-data-build.service';
+import { Item } from '../../../core/shared/item.model';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../../core/data/remote-data';
+import { TranslateModule } from '@ngx-translate/core';
+
+let collectionsComponent: CollectionsComponent;
+let fixture: ComponentFixture
';
+
+ }));
+
+ describe('When the requested item request has succeeded', () => {
+ beforeEach(() => {
+ collectionsComponent.item = succeededMockItem;
+ fixture.detectChanges();
+ });
+
+ it('should show the collection', () => {
+ const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
+ expect(collectionField).not.toBeNull();
+ });
+ });
+
+ describe('When the requested item request has failed', () => {
+ beforeEach(() => {
+ collectionsComponent.item = failedMockItem;
+ fixture.detectChanges();
+ });
+
+ it('should not show the collection', () => {
+ const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
+ expect(collectionField).toBeNull();
+ });
+ });
+});
diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/+item-page/field-components/collections/collections.component.ts
index 8b7b5d7f58..83bb0d464d 100644
--- a/src/app/+item-page/field-components/collections/collections.component.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.ts
@@ -38,4 +38,8 @@ export class CollectionsComponent implements OnInit {
this.collections = this.item.owner.map((rd: RemoteData
+
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
new file mode 100644
index 0000000000..47e7d6c34e
--- /dev/null
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
@@ -0,0 +1,54 @@
+import { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Component, DebugElement } from '@angular/core';
+
+import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.component';
+
+@Component({
+ selector: 'ds-component-with-content',
+ template: '{{ label }}
-
-
+
+
+
\n' +
+ ' \n' +
+ '
+
-
+
-
+
{{metadatum.key}}
{{metadatum.value}}
{{metadatum.language}}
diff --git a/src/app/+item-page/full/full-item-page.component.scss b/src/app/+item-page/full/full-item-page.component.scss
index 65b9262338..4fe93bbb7a 100644
--- a/src/app/+item-page/full/full-item-page.component.scss
+++ b/src/app/+item-page/full/full-item-page.component.scss
@@ -1,7 +1,10 @@
@import '../../../styles/variables.scss';
+
:host {
div.simple-view-link {
text-align: center;
- margin: 20px;
+ a {
+ min-width: 25%;
+ }
}
}
\ No newline at end of file
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index aa1fc4cc78..dafecd748e 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -30,9 +30,9 @@ import { hasValue } from '../../shared/empty.util';
})
export class FullItemPageComponent extends ItemPageComponent implements OnInit {
- itemRDObs: Observable
+
+
+
+
diff --git a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
new file mode 100644
index 0000000000..030184640e
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
@@ -0,0 +1,25 @@
+@import '../../../../../styles/variables.scss';
+@import '../../../../../styles/mixins.scss';
+
+.filters {
+ a {
+ color: $body-color;
+ &:hover, &focus {
+ text-decoration: none;
+ }
+ span.badge {
+ vertical-align: text-top;
+ }
+ }
+ .toggle-more-filters a {
+ color: $link-color;
+ text-decoration: underline;
+ cursor: pointer;
+ }
+}
+::ng-deep em {
+ font-weight: bold;
+ font-style: normal;
+}
+
+
diff --git a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
new file mode 100644
index 0000000000..5deaa34d29
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { FilterType } from '../../../search-service/filter-type.model';
+import { renderFacetFor } from '../search-filter-type-decorator';
+import {
+ facetLoad,
+ SearchFacetFilterComponent
+} from '../search-facet-filter/search-facet-filter.component';
+
+@Component({
+ selector: 'ds-search-boolean-filter',
+ styleUrls: ['./search-boolean-filter.component.scss'],
+ templateUrl: './search-boolean-filter.component.html',
+ animations: [facetLoad]
+})
+
+/**
+ * Component that represents a boolean facet for a specific filter configuration
+ */
+@renderFacetFor(FilterType.boolean)
+export class SearchBooleanFilterComponent extends SearchFacetFilterComponent implements OnInit {
+}
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html b/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
new file mode 100644
index 0000000000..b7e03af473
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
@@ -0,0 +1 @@
+
-
-
-
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 03b760318f..49141c2b68 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -1,10 +1,8 @@
import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
import { TranslateModule } from '@ngx-translate/core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFacetFilterComponent } from './search-facet-filter.component';
-import { SearchFilterService } from '../search-filter.service';
+import { FILTER_CONFIG, SearchFilterService } from '../search-filter.service';
import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
import { FilterType } from '../../../search-service/filter-type.model';
import { FacetValue } from '../../../search-service/facet-value.model';
@@ -14,11 +12,12 @@ import { SearchService } from '../../../search-service/search.service';
import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
import { RemoteData } from '../../../../core/data/remote-data';
import { PaginatedList } from '../../../../core/data/paginated-list';
-import { SearchOptions } from '../../../search-options.model';
import { RouterStub } from '../../../../shared/testing/router-stub';
import { Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchFacetFilterComponent } from './search-facet-filter.component';
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
describe('SearchFacetFilterComponent', () => {
let comp: SearchFacetFilterComponent;
@@ -65,18 +64,21 @@ describe('SearchFacetFilterComponent', () => {
providers: [
{ provide: SearchService, useValue: new SearchServiceStub(searchLink) },
{ provide: Router, useValue: new RouterStub() },
+ { provide: FILTER_CONFIG, useValue: new SearchFilterConfig() },
+ { provide: RemoteDataBuildService, useValue: {aggregate: () => Observable.of({})} },
+ { provide: SearchConfigurationService, useValue: {searchOptions: Observable.of({})} },
{
provide: SearchFilterService, useValue: {
- isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
- getPage: (paramName: string) => page,
- /* tslint:disable:no-empty */
- incrementPage: (filterName: string) => {
- },
- resetPage: (filterName: string) => {
- },
- getSearchOptions: () => Observable.of({}),
- /* tslint:enable:no-empty */
- }
+ getSelectedValuesForFilter: () => Observable.of(selectedValues),
+ isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
+ getPage: (paramName: string) => page,
+ /* tslint:disable:no-empty */
+ incrementPage: (filterName: string) => {
+ },
+ resetPage: (filterName: string) => {
+ }
+ /* tslint:enable:no-empty */
+ }
}
],
schemas: [NO_ERRORS_SCHEMA]
@@ -89,9 +91,6 @@ describe('SearchFacetFilterComponent', () => {
fixture = TestBed.createComponent(SearchFacetFilterComponent);
comp = fixture.componentInstance; // SearchPageComponent test instance
comp.filterConfig = mockFilterConfig;
- comp.filterValues = [mockValues];
- comp.filterValues$ = new BehaviorSubject(comp.filterValues);
- comp.selectedValues = selectedValues;
filterService = (comp as any).filterService;
searchService = (comp as any).searchService;
spyOn(searchService, 'getFacetValuesFor').and.returnValue(mockValues);
@@ -124,14 +123,14 @@ describe('SearchFacetFilterComponent', () => {
describe('when the getAddParams method is called wih a value', () => {
it('should return the selectedValue list with the new parameter value', () => {
const result = comp.getAddParams(value3);
- expect(result[mockFilterConfig.paramName]).toEqual([value1, value2, value3]);
+ result.subscribe((r) => expect(r[mockFilterConfig.paramName]).toEqual([value1, value2, value3]));
});
});
describe('when the getRemoveParams method is called wih a value', () => {
it('should return the selectedValue list with the parameter value left out', () => {
const result = comp.getRemoveParams(value1);
- expect(result[mockFilterConfig.paramName]).toEqual([value2]);
+ result.subscribe((r) => expect(r[mockFilterConfig.paramName]).toEqual([value2]));
});
});
@@ -169,7 +168,7 @@ describe('SearchFacetFilterComponent', () => {
});
describe('when the getCurrentUrl method is called', () => {
- const url = 'test.url/test'
+ const url = 'test.url/test';
beforeEach(() => {
router.navigateByUrl(url);
});
@@ -182,7 +181,7 @@ describe('SearchFacetFilterComponent', () => {
describe('when the onSubmit method is called with data', () => {
const searchUrl = '/search/path';
const testValue = 'test';
- const data = { [mockFilterConfig.paramName]: testValue };
+ const data = testValue;
beforeEach(() => {
spyOn(comp, 'getSearchLink').and.returnValue(searchUrl);
comp.onSubmit(data);
@@ -197,46 +196,26 @@ describe('SearchFacetFilterComponent', () => {
});
describe('when updateFilterValueList is called', () => {
- const cPage = 10;
- const searchOptions = new SearchOptions();
beforeEach(() => {
- // spyOn(searchService, 'getFacetValuesFor'); Already spied upon
- comp.currentPage = Observable.of(cPage);
- comp.updateFilterValueList(searchOptions);
+ spyOn(comp, 'showFirstPageOnly');
+ comp.updateFilterValueList()
});
- it('should call getFacetValuesFor on the searchService with the correct parameters', () => {
- expect(searchService.getFacetValuesFor).toHaveBeenCalledWith(mockFilterConfig, cPage, searchOptions);
+ it('should call showFirstPageOnly and empty the filter', () => {
+ expect(comp.animationState).toEqual('loading');
+ expect((comp as any).collapseNextUpdate).toBeTruthy();
+ expect(comp.filter).toEqual('');
});
});
- describe('when updateFilterValueList is called and pageChange is set to true', () => {
- const searchOptions = new SearchOptions();
+ describe('when findSuggestions is called with query \'test\'', () => {
+ const query = 'test';
beforeEach(() => {
- comp.pageChange = true;
- spyOn(comp, 'showFirstPageOnly');
- comp.updateFilterValueList(searchOptions);
+ comp.findSuggestions(query);
});
- it('should not call showFirstPageOnly on the component', () => {
- expect(comp.showFirstPageOnly).not.toHaveBeenCalled();
- });
-
- it('should set pageChange to false', () => {
- expect(comp.pageChange).toBeFalsy();
- });
- });
-
- describe('when updateFilterValueList is called and pageChange is set to false', () => {
- const searchOptions = new SearchOptions();
- beforeEach(() => {
- comp.pageChange = false;
- spyOn(comp, 'showFirstPageOnly');
- comp.updateFilterValueList(searchOptions);
- });
-
- it('should call showFirstPageOnly on the component', () => {
- expect(comp.showFirstPageOnly).toHaveBeenCalled();
+ it('should call getFacetValuesFor on the component\'s SearchService with the right query', () => {
+ expect((comp as any).searchService.getFacetValuesFor).toHaveBeenCalledWith(comp.filterConfig, 1, {}, query);
});
});
});
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 5f8111c87b..e0500b555e 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -1,125 +1,289 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { animate, state, style, transition, trigger } from '@angular/animations';
+import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { Observable } from 'rxjs/Observable';
+import { Subject } from 'rxjs/Subject';
+import { Subscription } from 'rxjs/Subscription';
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../../shared/empty.util';
+import { EmphasizePipe } from '../../../../shared/utils/emphasize.pipe';
+import { SearchOptions } from '../../../search-options.model';
import { FacetValue } from '../../../search-service/facet-value.model';
import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-import { SearchFilterService } from '../search-filter.service';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
import { SearchService } from '../../../search-service/search.service';
-import { SearchOptions } from '../../../search-options.model';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Subscription } from 'rxjs/Subscription';
-
-/**
- * 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.
- */
+import { FILTER_CONFIG, SearchFilterService } from '../search-filter.service';
+import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
+import { getSucceededRemoteData } from '../../../../core/shared/operators';
+import { map } from 'rxjs/operators';
@Component({
selector: 'ds-search-facet-filter',
- styleUrls: ['./search-facet-filter.component.scss'],
- templateUrl: './search-facet-filter.component.html'
+ template: ``,
})
+/**
+ * Super class for all different representations of facets
+ */
export class SearchFacetFilterComponent implements OnInit, OnDestroy {
- @Input() filterConfig: SearchFilterConfig;
- @Input() selectedValues: string[];
- filterValues: Array
- {{'search.filters.filter.' + filter.name + '.head'| translate}}
-
\ No newline at end of file
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-filter.component.scss
index f694e9e167..6e49172a48 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss
+++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.scss
@@ -3,7 +3,7 @@
:host {
border: 1px solid map-get($theme-colors, light);
- .search-filter-wrapper {
+ .search-filter-wrapper.closed {
overflow: hidden;
}
.filter-toggle {
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
index be26075d25..bd3c9f7a0c 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
@@ -1,18 +1,9 @@
import { Component, Input, OnInit } from '@angular/core';
import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { SearchService } from '../../search-service/search.service';
-import { RemoteData } from '../../../core/data/remote-data';
-import { FacetValue } from '../../search-service/facet-value.model';
import { SearchFilterService } from './search-filter.service';
import { Observable } from 'rxjs/Observable';
import { slide } from '../../../shared/animations/slide';
-import { PaginatedList } from '../../../core/data/paginated-list';
-
-/**
- * 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.
- */
+import { isNotEmpty } from '../../../shared/empty.util';
@Component({
selector: 'ds-search-filter',
@@ -21,15 +12,31 @@ import { PaginatedList } from '../../../core/data/paginated-list';
animations: [slide],
})
+/**
+ * Represents a part of the filter section for a single type of filter
+ */
export class SearchFilterComponent implements OnInit {
+ /**
+ * The filter config for this component
+ */
@Input() filter: SearchFilterConfig;
+ /**
+ * True when the filter is 100% collapsed in the UI
+ */
+ collapsed;
+
constructor(private filterService: SearchFilterService) {
}
+ /**
+ * Requests the current set values for this filter
+ * If the filter config is open by default OR the filter has at least one value, the filter should be initially expanded
+ * Else, the filter should initially be collapsed
+ */
ngOnInit() {
- this.filterService.isFilterActive(this.filter.paramName).first().subscribe((isActive) => {
- if (this.filter.isOpenByDefault || isActive) {
+ this.getSelectedValues().first().subscribe((isActive) => {
+ if (this.filter.isOpenByDefault || isNotEmpty(isActive)) {
this.initialExpand();
} else {
this.initialCollapse();
@@ -37,23 +44,61 @@ export class SearchFilterComponent implements OnInit {
});
}
+ /**
+ * Changes the state for this filter to collapsed when it's expanded and to expanded it when it's collapsed
+ */
toggle() {
this.filterService.toggle(this.filter.name);
}
+ /**
+ * Checks if the filter is currently collapsed
+ * @returns {Observable
+
+
diff --git a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
new file mode 100644
index 0000000000..9ec0f61541
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
@@ -0,0 +1,23 @@
+@import '../../../../../styles/variables.scss';
+@import '../../../../../styles/mixins.scss';
+
+.filters {
+ a {
+ color: $body-color;
+ &:hover, &focus {
+ text-decoration: none;
+ }
+ span.badge {
+ vertical-align: text-top;
+ }
+ }
+ .toggle-more-filters a {
+ color: $link-color;
+ text-decoration: underline;
+ cursor: pointer;
+ }
+}
+::ng-deep em {
+ font-weight: bold;
+ font-style: normal;
+}
diff --git a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
new file mode 100644
index 0000000000..b048a9ccd0
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { FilterType } from '../../../search-service/filter-type.model';
+import { renderFacetFor } from '../search-filter-type-decorator';
+import {
+ facetLoad,
+ SearchFacetFilterComponent
+} from '../search-facet-filter/search-facet-filter.component';
+
+@Component({
+ selector: 'ds-search-hierarchy-filter',
+ styleUrls: ['./search-hierarchy-filter.component.scss'],
+ templateUrl: './search-hierarchy-filter.component.html',
+ animations: [facetLoad]
+})
+
+/**
+ * Component that represents a hierarchy facet for a specific filter configuration
+ */
+@renderFacetFor(FilterType.hierarchy)
+export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
+}
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html
new file mode 100644
index 0000000000..352c1710c0
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -0,0 +1,40 @@
+
+
+
+ {{value}}
+
+
+
+
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
new file mode 100644
index 0000000000..c45302b162
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -0,0 +1,42 @@
+@import '../../../../../styles/variables.scss';
+@import '../../../../../styles/mixins.scss';
+
+
+.filters {
+ a {
+ color: $link-color;
+ &:hover {
+ text-decoration: underline;
+ color: $link-hover-color;
+
+ }
+ span.badge {
+ vertical-align: text-top;
+ }
+ }
+ .toggle-more-filters a {
+ color: $link-color;
+ text-decoration: underline;
+ cursor: pointer;
+ }
+ }
+
+$slider-handle-width: 18px;
+::ng-deep
+{
+ html:not([dir=rtl]) .noUi-horizontal .noUi-handle {
+ right: -$slider-handle-width/2;
+ }
+ .noUi-horizontal .noUi-handle {
+ width: $slider-handle-width;
+ &:before {
+ left: ($slider-handle-width - 2)/2 - 2;
+ }
+ &:after {
+ left: ($slider-handle-width - 2)/2 + 2;
+ }
+ &:focus {
+ outline: none;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
new file mode 100644
index 0000000000..4e555459d6
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -0,0 +1,138 @@
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { FILTER_CONFIG, SearchFilterService } from '../search-filter.service';
+import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
+import { FilterType } from '../../../search-service/filter-type.model';
+import { FacetValue } from '../../../search-service/facet-value.model';
+import { FormsModule } from '@angular/forms';
+import { Observable } from 'rxjs/Observable';
+import { SearchService } from '../../../search-service/search.service';
+import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { RouterStub } from '../../../../shared/testing/router-stub';
+import { Router } from '@angular/router';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchRangeFilterComponent } from './search-range-filter.component';
+import { RouteService } from '../../../../shared/services/route.service';
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
+
+describe('SearchRangeFilterComponent', () => {
+ let comp: SearchRangeFilterComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
similarity index 66%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.scss
rename to src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
index 595b2aefb8..33e354f2d8 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.scss
+++ b/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
@@ -2,17 +2,22 @@
@import '../../../../../styles/mixins.scss';
.filters {
- margin-top: $spacer/2;
- margin-bottom: $spacer/2;
a {
color: $body-color;
- &:hover {
+ &:hover, &focus {
text-decoration: none;
}
+ span.badge {
+ vertical-align: text-top;
+ }
}
.toggle-more-filters a {
color: $link-color;
text-decoration: underline;
cursor: pointer;
}
-}
\ No newline at end of file
+}
+::ng-deep em {
+ font-weight: bold;
+ font-style: normal;
+}
diff --git a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
new file mode 100644
index 0000000000..9e603184e8
--- /dev/null
+++ b/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -0,0 +1,29 @@
+import { animate, state, style, transition, trigger } from '@angular/animations';
+import { Component, HostBinding, OnInit } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import { FilterType } from '../../../search-service/filter-type.model';
+import {
+ facetLoad,
+ SearchFacetFilterComponent
+} from '../search-facet-filter/search-facet-filter.component';
+import { renderFacetFor } from '../search-filter-type-decorator';
+
+/**
+ * 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-text-filter',
+ styleUrls: ['./search-text-filter.component.scss'],
+ templateUrl: './search-text-filter.component.html',
+ animations: [facetLoad]
+})
+
+/**
+ * Component that represents a text facet for a specific filter configuration
+ */
+@renderFacetFor(FilterType.text)
+export class SearchTextFilterComponent extends SearchFacetFilterComponent implements OnInit {
+}
diff --git a/src/app/+search-page/search-filters/search-filters.component.html b/src/app/+search-page/search-filters/search-filters.component.html
index 566450b7f5..0522c1fba0 100644
--- a/src/app/+search-page/search-filters/search-filters.component.html
+++ b/src/app/+search-page/search-filters/search-filters.component.html
@@ -1,7 +1,7 @@
+
+
+ {{value}}
+
+
+
+
+ {{"search.filters.head" | translate}}
-
-
{{"search.filters.reset" | translate}}
\ No newline at end of file
diff --git a/src/app/+search-page/search-filters/search-filters.component.spec.ts b/src/app/+search-page/search-filters/search-filters.component.spec.ts
index 64c2ea5332..7f0d4ad748 100644
--- a/src/app/+search-page/search-filters/search-filters.component.spec.ts
+++ b/src/app/+search-page/search-filters/search-filters.component.spec.ts
@@ -8,6 +8,7 @@ import { SearchFilterService } from './search-filter/search-filter.service';
import { SearchFiltersComponent } from './search-filters.component';
import { SearchService } from '../search-service/search.service';
import { Observable } from 'rxjs/Observable';
+import { SearchConfigurationService } from '../search-service/search-configuration.service';
describe('SearchFiltersComponent', () => {
let comp: SearchFiltersComponent;
@@ -23,8 +24,14 @@ describe('SearchFiltersComponent', () => {
}
/* tslint:enable:no-empty */
};
- const searchFilterServiceStub = jasmine.createSpyObj('SearchFilterService', {
- getCurrentFilters: Observable.of({})
+
+ const searchFiltersStub = {
+ getSelectedValuesForFilter: (filter) =>
+ []
+ };
+
+ const searchConfigServiceStub = jasmine.createSpyObj('SearchConfigurationService', {
+ getCurrentFrontendFilters: Observable.of({})
});
beforeEach(async(() => {
@@ -33,7 +40,8 @@ describe('SearchFiltersComponent', () => {
declarations: [SearchFiltersComponent],
providers: [
{ provide: SearchService, useValue: searchServiceStub },
- { provide: SearchFilterService, useValue: searchFilterServiceStub },
+ { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
+ { provide: SearchFilterService, useValue: searchFiltersStub },
],
schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/+search-page/search-filters/search-filters.component.ts b/src/app/+search-page/search-filters/search-filters.component.ts
index 517b2e1e59..1da4e5860d 100644
--- a/src/app/+search-page/search-filters/search-filters.component.ts
+++ b/src/app/+search-page/search-filters/search-filters.component.ts
@@ -3,13 +3,10 @@ import { SearchService } from '../search-service/search.service';
import { RemoteData } from '../../core/data/remote-data';
import { SearchFilterConfig } from '../search-service/search-filter-config.model';
import { Observable } from 'rxjs/Observable';
+import { SearchConfigurationService } from '../search-service/search-configuration.service';
+import { isNotEmpty } from '../../shared/empty.util';
import { SearchFilterService } from './search-filter/search-filter.service';
-
-/**
- * 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.
- */
+import { getSucceededRemoteData } from '../../core/shared/operators';
@Component({
selector: 'ds-search-filters',
@@ -17,15 +14,63 @@ import { SearchFilterService } from './search-filter/search-filter.service';
templateUrl: './search-filters.component.html',
})
+/**
+ * This component represents the part of the search sidebar that contains filters.
+ */
export class SearchFiltersComponent {
+ /**
+ * An observable containing configuration about which filters are shown and how they are shown
+ */
filters: Observable
+
-
+
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index 96820e8a0b..3ca18ce4c5 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,10 +37,11 @@ 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';
@@ -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,4 @@ describe('SearchPageComponent', () => {
});
});
-});
+})
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 63e72960d8..da862ee7fc 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,11 @@ 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';
+import { getSucceededRemoteData } from '../core/shared/operators';
/**
* This component renders a simple item page.
@@ -28,54 +30,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
-
-
-
-
-
-
-
+
-
+
+
+
+
+ {{ 'search.sidebar.settings.title' | translate}}
-
+
-{{ 'search.sidebar.settings.title' | translate}}
+
+ {{ 'search.sidebar.settings.sort-by' | translate}}
-
-
+ {{ 'search.sidebar.settings.rpp' | translate}}
-
-
-
+
+
\ 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{{ 'search.sidebar.settings.rpp' | translate}}
+
+
+