hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities

Browse Source 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
lotte
2019-01-24 12:58:05 +01:00
parent f0cc24ff9b c4004eaaa2
commit a733eb5834
81 changed files with 2424 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/core/data/comcol-data.service.spec.ts
View File

@@ -16,8 +16,8 @@ import { RequestEntry } from './request.reducer';
import { of as observableOf } from 'rxjs';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { HttpClient } from '@angular/common/http';
import { DataBuildService } from '../cache/builders/data-build.service';
import { DSOUpdateComparator } from './dso-update-comparator';
import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
const LINK_NAME = 'test';
@@ -30,7 +30,7 @@ class TestService extends ComColDataService<NormalizedTestObject, any> {
constructor(
protected requestService: RequestService,
protected rdbService: RemoteDataBuildService,
protected dataBuildService: DataBuildService,
protected dataBuildService: NormalizedObjectBuildService,
protected store: Store<CoreState>,
protected EnvConfig: GlobalConfig,
protected cds: CommunityDataService,
@@ -38,7 +38,7 @@ class TestService extends ComColDataService<NormalizedTestObject, any> {
protected halService: HALEndpointService,
protected notificationsService: NotificationsService,
protected http: HttpClient,
protected comparator: DSOUpdateComparator,
protected comparator: DSOChangeAnalyzer,
protected linkPath: string
) {
super();
@@ -61,7 +61,7 @@ describe('ComColDataService', () => {
const notificationsService = {} as NotificationsService;
const http = {} as HttpClient;
const comparator = {} as any;
const dataBuildService = {} as DataBuildService;
const dataBuildService = {} as NormalizedObjectBuildService;
const scopeID = 'd9d30c0c-69b7-4369-8397-ca67c888974d';
const options = Object.assign(new FindAllOptions(), {