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

Merge remote-tracking branch 'upstream/main' into w2p-112970_added-missing-breadcrumbs_contribute-main

Browse Source 
# Conflicts:
#	src/app/collection-page/collection-page-routes.ts
#	src/app/community-page/community-page-routes.ts
#	src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
#	src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
#	src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
#	src/app/core/submission/resolver/submission-object.resolver.ts
#	src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
#	src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
#	src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts
#	src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
#	src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
#	src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
This commit is contained in:
Alexandre Vryghem
2024-04-10 22:21:07 +02:00
parent d9a6f6d018 26ecc03584
commit 5f8033a111
230 changed files with 7780 additions and 7476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/app/core/submission/resolver/submission-object.resolver.ts
View File

@@ -1,7 +1,5 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
Resolve,
RouterStateSnapshot,
} from '@angular/router';
import { Observable } from 'rxjs';
@@ -9,36 +7,31 @@ import { switchMap } from 'rxjs/operators';
import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
import { RemoteData } from '../../data/remote-data';
import { Item } from '../../shared/item.model';
import { getFirstCompletedRemoteData } from '../../shared/operators';
import { SubmissionObject } from '../models/submission-object.model';
import { SUBMISSION_LINKS_TO_FOLLOW } from './submission-links-to-follow';
/**
* This class represents a resolver that requests a specific item before the route is activated
* Method for resolving an item based on the parameters in the current route
* @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
* @param {RouterStateSnapshot} state The current RouterStateSnapshot
* @param {IdentifiableDataService<SubmissionObject> } dataService
* @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
* or an error if something went wrong
*/
@Injectable({ providedIn: 'root' })
export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
constructor(
protected dataService: IdentifiableDataService<any>,
) {
}
/**
* Method for resolving an item based on the parameters in the current route
* @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
* @param {RouterStateSnapshot} state The current RouterStateSnapshot
* @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
* or an error if something went wrong
*/
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<T>> {
const itemRD$ = this.dataService.findById(route.params.id,
true,
false,
...SUBMISSION_LINKS_TO_FOLLOW,
).pipe(
getFirstCompletedRemoteData(),
switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
getFirstCompletedRemoteData(),
);
return itemRD$;
}
}
export const SubmissionObjectResolver: (route: ActivatedRouteSnapshot, state: RouterStateSnapshot, dataService: IdentifiableDataService<SubmissionObject>) => Observable<RemoteData<Item>> = (
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot,
dataService: IdentifiableDataService<SubmissionObject>,
): Observable<RemoteData<Item>> => {
return dataService.findById(route.params.id,
true,
false,
...SUBMISSION_LINKS_TO_FOLLOW,
).pipe(
getFirstCompletedRemoteData(),
switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<Item>>),
getFirstCompletedRemoteData(),
);
};