Merge branch 'master' into browse-by-features

Conflicts:
	src/app/core/core.module.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts

src/app/core/data/dspace-object-data.service.ts

@@ -0,0 +1,52 @@
+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';
+import { FindAllOptions } from './request.models';
+
+/* tslint:disable:max-classes-per-file */
+class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject> {
+  protected linkPath = 'dso';
+
+  constructor(
+    protected responseCache: ResponseCacheService,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected halService: HALEndpointService) {
+    super();
+  }
+
+  getBrowseEndpoint(options: FindAllOptions): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  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<RemoteData<DSpaceObject>> {
+    return this.dataService.findById(uuid);
+  }
+}