Merge remote-tracking branch 'remotes/upstreamatmire/Search-optimizations' into mydspace

# Conflicts:
#	resources/i18n/en.json
#	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filters.component.html
#	src/app/+search-page/search-filters/search-filters.component.ts
#	src/app/+search-page/search-page.component.ts
#	src/app/+search-page/search-page.module.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/core/cache/builders/remote-data-build.service.ts
#	src/app/core/core.module.ts
#	src/app/core/data/paginated-list.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2019-03-26 10:01:57 +01:00
93 changed files with 2805 additions and 730 deletions

View File

@@ -79,6 +79,7 @@ import { NormalizedObjectBuildService } from './cache/builders/normalized-object
import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service';
import { SearchService } from '../+search-page/search-service/search.service';
import { RoleService } from './roles/role.service';
import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
@@ -169,6 +170,7 @@ const PROVIDERS = [
CSSVariableService,
MenuService,
ObjectUpdatesService,
SearchService,
MyDSpaceGuard,
RoleService,
MessageResponseParsingService,