From 93584596a546b9b2b2a04f1beaae52808211ae23 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 19 Jul 2018 14:21:59 +0200 Subject: [PATCH] added label text --- resources/i18n/en.json | 7 +++++++ .../search-labels/search-labels.component.html | 2 +- .../search-service/search.service.spec.ts | 12 ++---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index a58c03a142..f9eb1c5e1d 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -114,6 +114,13 @@ "filters": { "head": "Filters", "reset": "Reset filters", + "applied": { + "f.author": "Author", + "f.dateIssued.min": "Start date", + "f.dateIssued.max": "End date", + "f.subject": "Subject", + "f.has_content_in_original_bundle": "Has files" + }, "filter": { "show-more": "Show more", "show-less": "Collapse", diff --git a/src/app/+search-page/search-labels/search-labels.component.html b/src/app/+search-page/search-labels/search-labels.component.html index e6d77c0e64..5113e764ff 100644 --- a/src/app/+search-page/search-labels/search-labels.component.html +++ b/src/app/+search-page/search-labels/search-labels.component.html @@ -4,7 +4,7 @@ - {{values}} + {{('search.filters.applied.' + key) | translate}}: {{values}} × 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 3e9176a828..083758e22b 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,11 @@ -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,21 +16,16 @@ 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 { FilterLabel } from './filter-label.model'; -import createSpyObj = jasmine.createSpyObj; @Component({ template: '' }) class DummyComponent {