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

run ng update @angular/core@16 @angular/cli@16 --force

Browse Source
This commit is contained in:
Andrea Barbasso
2024-02-12 16:22:22 +01:00
parent a98039c687
commit 9b213b6381
51 changed files with 2187 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { fadeIn, fadeInOut } from '../../shared/animations/fade';
import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
import { ActivatedRoute, CanActivate, Route, Router, RouterLink, RouterOutlet } from '@angular/router';
import { ActivatedRoute, Route, Router, RouterLink, RouterOutlet, CanActivateFn } from '@angular/router';
import { RemoteData } from '../../core/data/remote-data';
import { Item } from '../../core/shared/item.model';
import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
@@ -63,8 +63,14 @@ export class EditItemPageComponent implements OnInit {
.map((child: Route) => {
let enabled = observableOf(true);
if (isNotEmpty(child.canActivate)) {
enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<CanActivate>) => {
const guard: CanActivate = this.injector.get<CanActivate>(guardConstructor);
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);
})
).pipe(