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

fix issue where create com/col guards would redirect to 404 for the wrong reason

Browse Source
This commit is contained in:
Art Lowel
2020-07-02 18:28:30 +02:00
parent c36877ae3a
commit fe785f6d2f
2 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/+collection-page/create-collection-page/create-collection-page.guard.ts
View File

@@ -5,8 +5,7 @@ import { hasNoValue, hasValue } from '../../shared/empty.util';
import { CommunityDataService } from '../../core/data/community-data.service'; import { CommunityDataService } from '../../core/data/community-data.service';
import { RemoteData } from '../../core/data/remote-data'; import { RemoteData } from '../../core/data/remote-data';
import { Community } from '../../core/shared/community.model'; import { Community } from '../../core/shared/community.model';
import { getFinishedRemoteData } from '../../core/shared/operators'; import { map, tap, find } from 'rxjs/operators';
import { map, tap } from 'rxjs/operators';
import { Observable, of as observableOf } from 'rxjs'; import { Observable, of as observableOf } from 'rxjs';
/** /**
@@ -29,18 +28,15 @@ export class CreateCollectionPageGuard implements CanActivate {
this.router.navigate(['/404']); this.router.navigate(['/404']);
return observableOf(false); return observableOf(false);
} }
const parent: Observable<RemoteData<Community>> = this.communityService.findById(parentID) return this.communityService.findById(parentID)
.pipe( .pipe(
getFinishedRemoteData(), find((communityRD: RemoteData<Community>) => hasValue(communityRD.payload) || hasValue(communityRD.error)),
); map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)),
tap((isValid: boolean) => {
return parent.pipe( if (!isValid) {
map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)), this.router.navigate(['/404']);
tap((isValid: boolean) => { }
if (!isValid) { })
this.router.navigate(['/404']);
}
})
); );
} }
} }

21
src/app/+community-page/create-community-page/create-community-page.guard.ts
View File

@@ -5,8 +5,7 @@ import { hasNoValue, hasValue } from '../../shared/empty.util';
import { CommunityDataService } from '../../core/data/community-data.service'; import { CommunityDataService } from '../../core/data/community-data.service';
import { RemoteData } from '../../core/data/remote-data'; import { RemoteData } from '../../core/data/remote-data';
import { Community } from '../../core/shared/community.model'; import { Community } from '../../core/shared/community.model';
import { getFinishedRemoteData } from '../../core/shared/operators'; import { map, tap, find } from 'rxjs/operators';
import { map, tap } from 'rxjs/operators';
import { Observable, of as observableOf } from 'rxjs'; import { Observable, of as observableOf } from 'rxjs';
/** /**
@@ -29,18 +28,16 @@ export class CreateCommunityPageGuard implements CanActivate {
return observableOf(true); return observableOf(true);
} }
const parent: Observable<RemoteData<Community>> = this.communityService.findById(parentID) return this.communityService.findById(parentID)
.pipe( .pipe(
getFinishedRemoteData(), find((communityRD: RemoteData<Community>) => hasValue(communityRD.payload) || hasValue(communityRD.error)),
); map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)),
tap((isValid: boolean) => {
return parent.pipe( if (!isValid) {
map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)), this.router.navigate(['/404']);
tap((isValid: boolean) => { }
if (!isValid) {
this.router.navigate(['/404']);
} }
}) )
); );
} }
} }