hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TLC-249] Update data service usage since rebasing

Browse Source
This commit is contained in:
Kim Shepherd
2022-09-16 13:19:07 +12:00
parent 8d70e1788b
commit ed5ab710a3
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/core/data/identifier-data.service.ts
View File

@@ -2,31 +2,27 @@ import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { NotificationsService } from '../../shared/notifications/notifications.service'; 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 { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { ObjectCacheService } from '../cache/object-cache.service'; import { ObjectCacheService } from '../cache/object-cache.service';
import { HALEndpointService } from '../shared/hal-endpoint.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 { RequestService } from './request.service';
import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
import { CoreState } from '../core-state.model'; 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 { Observable } from 'rxjs';
import { RemoteData } from './remote-data'; import { RemoteData } from './remote-data';
import { Item } from '../shared/item.model'; import { Item } from '../shared/item.model';
import {IDENTIFIERS} from '../../shared/object-list/identifier-data/identifier-data.resource-type'; import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
import {IdentifierData} from '../../shared/object-list/identifier-data/identifier-data.model'; import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
import {getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload} from '../shared/operators'; import { getFirstCompletedRemoteData } from '../shared/operators';
import {map, startWith} from 'rxjs/operators'; import { map } from 'rxjs/operators';
import {ConfigurationProperty} from '../shared/configuration-property.model'; import {ConfigurationProperty} from '../shared/configuration-property.model';
import {ConfigurationDataService} from './configuration-data.service'; import {ConfigurationDataService} from './configuration-data.service';
@Injectable() @Injectable()
@dataService(IDENTIFIERS) @dataService(IDENTIFIERS)
export class IdentifierDataService extends DataService<IdentifierData> { export class IdentifierDataService extends BaseDataService<IdentifierData> {
protected linkPath = 'identifiers';
constructor( constructor(
protected comparator: DefaultChangeAnalyzer<IdentifierData>, protected comparator: DefaultChangeAnalyzer<IdentifierData>,
@@ -38,8 +34,9 @@ export class IdentifierDataService extends DataService<IdentifierData> {
protected requestService: RequestService, protected requestService: RequestService,
protected store: Store<CoreState>, protected store: Store<CoreState>,
private configurationService: ConfigurationDataService, private configurationService: ConfigurationDataService,
protected linkPath = 'identifiers',
) { ) {
super(); super(linkPath, requestService, rdbService, objectCache, halService);
} }
/** /**

1
src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts
View File

@@ -16,7 +16,6 @@ import { By } from '@angular/platform-browser';
import { ItemRegisterDoiComponent } from './item-registerdoi.component'; import { ItemRegisterDoiComponent } from './item-registerdoi.component';
import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { IdentifierDataService } from '../../../core/data/identifier-data.service'; import { IdentifierDataService } from '../../../core/data/identifier-data.service';
import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
let comp: ItemRegisterDoiComponent; let comp: ItemRegisterDoiComponent;
let fixture: ComponentFixture<ItemRegisterDoiComponent>; let fixture: ComponentFixture<ItemRegisterDoiComponent>;