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

[DURACOM-191] Fix resource-policy-target.resolver which still used getDataServiceFor decorator

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-03-18 16:03:43 +01:00
parent 8c55e89b3d
commit b28f99f6bf
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
View File

@@ -1,5 +1,7 @@
import { import {
Inject,
Injectable, Injectable,
InjectionToken,
Injector, Injector,
} from '@angular/core'; } from '@angular/core';
import { import {
@@ -9,10 +11,15 @@ import {
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { getDataServiceFor } from '../../../core/data/base/data-service.decorator'; import {
APP_DATA_SERVICES_MAP,
LazyDataServicesMap,
} from '../../../../config/app-config.interface';
import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service'; import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
import { RemoteData } from '../../../core/data/remote-data'; import { RemoteData } from '../../../core/data/remote-data';
import { lazyService } from '../../../core/lazy-service';
import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
import { ResourceType } from '../../../core/shared/resource-type'; import { ResourceType } from '../../../core/shared/resource-type';
@@ -23,12 +30,11 @@ import { isEmpty } from '../../empty.util';
*/ */
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceObject>> { export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceObject>> {
/**
* The data service used to make request.
*/
private dataService: IdentifiableDataService<DSpaceObject>;
constructor(private parentInjector: Injector, private router: Router) { constructor(
private parentInjector: Injector,
private router: Router,
@Inject(APP_DATA_SERVICES_MAP) private dataServiceMap: InjectionToken<LazyDataServicesMap>) {
} }
/** /**
@@ -46,13 +52,13 @@ export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceOb
this.router.navigateByUrl('/404', { skipLocationChange: true }); this.router.navigateByUrl('/404', { skipLocationChange: true });
} }
const provider = getDataServiceFor(new ResourceType(targetType)); const resourceType: ResourceType = new ResourceType(targetType);
this.dataService = Injector.create({ const lazyProvider$: Observable<IdentifiableDataService<DSpaceObject>> = lazyService(this.dataServiceMap[resourceType.value], this.parentInjector);
providers: [],
parent: this.parentInjector,
}).get(provider);
return this.dataService.findById(policyTargetId).pipe( return lazyProvider$.pipe(
switchMap((dataService: IdentifiableDataService<DSpaceObject>) => {
return dataService.findById(policyTargetId);
}),
getFirstCompletedRemoteData(), getFirstCompletedRemoteData(),
); );
} }