diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index 9847f0b2b5..874d486d35 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -2,31 +2,27 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { dataService } from '../cache/builders/build-decorators'; +import { dataService } from './base/data-service.decorator'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { DataService } from './data.service'; +import { BaseDataService } from './base/base-data.service'; import { RequestService } from './request.service'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; import { CoreState } from '../core-state.model'; -import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model'; -import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type'; import { Observable } from 'rxjs'; import { RemoteData } from './remote-data'; import { Item } from '../shared/item.model'; -import {IDENTIFIERS} from '../../shared/object-list/identifier-data/identifier-data.resource-type'; -import {IdentifierData} from '../../shared/object-list/identifier-data/identifier-data.model'; -import {getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload} from '../shared/operators'; -import {map, startWith} from 'rxjs/operators'; +import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type'; +import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model'; +import { getFirstCompletedRemoteData } from '../shared/operators'; +import { map } from 'rxjs/operators'; import {ConfigurationProperty} from '../shared/configuration-property.model'; import {ConfigurationDataService} from './configuration-data.service'; @Injectable() @dataService(IDENTIFIERS) -export class IdentifierDataService extends DataService { - - protected linkPath = 'identifiers'; +export class IdentifierDataService extends BaseDataService { constructor( protected comparator: DefaultChangeAnalyzer, @@ -38,8 +34,9 @@ export class IdentifierDataService extends DataService { protected requestService: RequestService, protected store: Store, private configurationService: ConfigurationDataService, + protected linkPath = 'identifiers', ) { - super(); + super(linkPath, requestService, rdbService, objectCache, halService); } /** diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts index d7941f3bb5..9f0bb280c7 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts @@ -16,7 +16,6 @@ import { By } from '@angular/platform-browser'; import { ItemRegisterDoiComponent } from './item-registerdoi.component'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; let comp: ItemRegisterDoiComponent; let fixture: ComponentFixture;