Skip to content

Commit ec0de59

Browse files
FrancescoMolinarosteph-ieffam
authored andcommitted
Merged in DSC-1596-porting-version-link-fix (pull request DSpace#1486)
[CST-14280] fix version item link resolution Approved-by: Stefano Maffei
2 parents 1e5d008 + b6312bf commit ec0de59

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/app/item-page/item-page-routing-paths.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export function getEntityEditRoute(entityType: string, itemId: string) {
5353
* @param versionId the ID of the version for which the route will be retrieved
5454
*/
5555
export function getItemVersionRoute(versionId: string) {
56-
return new URLCombiner(getItemModuleRoute(), ITEM_VERSION_PATH, versionId).toString();
56+
return new URLCombiner(getItemModuleRoute(), versionId).toString();
5757
}
5858

5959

src/app/item-page/versions/item-versions.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h2 *ngIf="displayTitle">{{"item.version.history.head" | translate}}</h2>
3434

3535
<span *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
3636
<ng-template #versionNumberWithLink>
37-
<a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
37+
<a [routerLink]="getVersionRoute(version) | async">{{version.version}}</a>
3838
</ng-template>
3939
<ng-template #versionNumberWithoutLink>
4040
{{version.version}}

src/app/item-page/versions/item-versions.component.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,14 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
222222

223223
/**
224224
* Get the route to the specified version
225-
* @param versionId the ID of the version for which the route will be retrieved
225+
* @param version the version for which the route will be retrieved
226226
*/
227-
getVersionRoute(versionId: string) {
228-
return getItemVersionRoute(versionId);
227+
getVersionRoute(version: Version): Observable<string> {
228+
return version.item.pipe(
229+
getFirstCompletedRemoteData(),
230+
map(data => data.payload),
231+
map(item => getItemVersionRoute(item.uuid))
232+
);
229233
}
230234

231235
/**

0 commit comments

Comments
 (0)