54472: Post-merge error fixes

This commit is contained in:
Kristof De Langhe
2018-09-07 14:32:43 +02:00
parent da3627e614
commit 7a2e0ae851

View File

@@ -10,6 +10,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
import { DataService } from './data.service'; import { DataService } from './data.service';
import { RemoteData } from './remote-data'; import { RemoteData } from './remote-data';
import { RequestService } from './request.service'; import { RequestService } from './request.service';
import { AuthService } from '../auth/auth.service';
/* tslint:disable:max-classes-per-file */ /* tslint:disable:max-classes-per-file */
class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject> { class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject> {
@@ -20,7 +21,8 @@ class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject>
protected requestService: RequestService, protected requestService: RequestService,
protected rdbService: RemoteDataBuildService, protected rdbService: RemoteDataBuildService,
protected store: Store<CoreState>, protected store: Store<CoreState>,
protected halService: HALEndpointService) { protected halService: HALEndpointService,
protected authService: AuthService) {
super(); super();
} }
@@ -31,6 +33,10 @@ class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject>
getFindByIDHref(endpoint, resourceID): string { getFindByIDHref(endpoint, resourceID): string {
return endpoint.replace(/\{\?uuid\}/,`?uuid=${resourceID}`); return endpoint.replace(/\{\?uuid\}/,`?uuid=${resourceID}`);
} }
buildCreateParams(dso: DSpaceObject): Observable<string> {
return undefined;
}
} }
@Injectable() @Injectable()
@@ -41,8 +47,9 @@ export class DSpaceObjectDataService {
constructor( constructor(
protected requestService: RequestService, protected requestService: RequestService,
protected rdbService: RemoteDataBuildService, protected rdbService: RemoteDataBuildService,
protected halService: HALEndpointService) { protected halService: HALEndpointService,
this.dataService = new DataServiceImpl(null, requestService, rdbService, null, halService); protected authService: AuthService) {
this.dataService = new DataServiceImpl(null, requestService, rdbService, null, halService, authService);
} }
findById(uuid: string): Observable<RemoteData<DSpaceObject>> { findById(uuid: string): Observable<RemoteData<DSpaceObject>> {