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

[DURACOM-234] Fixes after migrating to functional guards

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-04-02 18:45:57 +02:00
parent 026e16ffd9
commit b8c26a71c3
2 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/item-page/edit-item-page/edit-item-page.component.ts
View File

@@ -9,6 +9,7 @@ import {
Component,
Injector,
OnInit,
runInInjectionContext,
} from '@angular/core';
import {
ActivatedRoute,
@@ -28,7 +29,6 @@ import {
import { map } from 'rxjs/operators';
import { RemoteData } from '../../core/data/remote-data';
import { GenericConstructor } from '../../core/shared/generic-constructor';
import { Item } from '../../core/shared/item.model';
import {
fadeIn,
@@ -88,15 +88,10 @@ export class EditItemPageComponent implements OnInit {
.map((child: Route) => {
let enabled = observableOf(true);
if (isNotEmpty(child.canActivate)) {
enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<{
canActivate: CanActivateFn;
}>) => {
const guard: {
canActivate: CanActivateFn;
} = this.injector.get<{
canActivate: CanActivateFn;
}>(guardConstructor);
return guard.canActivate(this.route.snapshot, this.router.routerState.snapshot);
enabled = observableCombineLatest(child.canActivate.map((guardFn: CanActivateFn) => {
return runInInjectionContext(this.injector, () => {
return guardFn(this.route.snapshot, this.router.routerState.snapshot);
});
}),
).pipe(
map((canActivateOutcomes: any[]) => canActivateOutcomes.every((e) => e === true)),