Resolving item version page routing by using config nameSpace #4358

Author: aseyedia

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

@@ -4,48 +4,71 @@ import { isNotEmpty } from '../shared/empty.util';
 
 export const ITEM_MODULE_PATH = 'items';
 
-export function getItemModuleRoute() {
-  return `/${ITEM_MODULE_PATH}`;
-}
 
 export const ENTITY_MODULE_PATH = 'entities';
 
+/**
+ * Normalize a namespace by ensuring it starts with '/' and doesn't end with '/'
+ */
+function normalizeNamespace(namespace?: string): string {
+  if (!namespace || namespace === '/') {
+    return '';
+  }
+
+  let normalized = namespace;
+  if (!normalized.startsWith('/')) {
+    normalized = '/' + normalized;
+  }
+  if (normalized.endsWith('/')) {
+    normalized = normalized.slice(0, -1);
+  }
+  return normalized;
+}
+
+export function getItemModuleRoute(namespace?: string) {
+  const normalizedNamespace = normalizeNamespace(namespace);
+  return `${normalizedNamespace}/${ITEM_MODULE_PATH}`;
+}
+
 /**
  * Get the route to an item's page
  * Depending on the item's entity type, the route will either start with /items or /entities
- * @param item  The item to retrieve the route for
+ * @param item      The item to retrieve the route for
+ * @param namespace Optional namespace to prepend to the route
  */
-export function getItemPageRoute(item: Item) {
+export function getItemPageRoute(item: Item, namespace?: string) {
   const type = item.firstMetadataValue('dspace.entity.type');
-  return getEntityPageRoute(type, item.uuid);
+  return getEntityPageRoute(type, item.uuid, namespace);
 }
 
-export function getItemEditRoute(item: Item) {
-  return new URLCombiner(getItemPageRoute(item), ITEM_EDIT_PATH).toString();
+export function getItemEditRoute(item: Item, namespace?: string) {
+  return new URLCombiner(getItemPageRoute(item, namespace), ITEM_EDIT_PATH).toString();
 }
 
-export function getItemEditVersionhistoryRoute(item: Item) {
-  return new URLCombiner(getItemPageRoute(item), ITEM_EDIT_PATH, ITEM_EDIT_VERSIONHISTORY_PATH).toString();
+export function getItemEditVersionhistoryRoute(item: Item, namespace?: string) {
+  return new URLCombiner(getItemPageRoute(item, namespace), ITEM_EDIT_PATH, ITEM_EDIT_VERSIONHISTORY_PATH).toString();
 }
 
-export function getEntityPageRoute(entityType: string, itemId: string) {
+export function getEntityPageRoute(entityType: string, itemId: string, namespace?: string) {
+  const normalizedNamespace = normalizeNamespace(namespace);
   if (isNotEmpty(entityType)) {
-    return new URLCombiner('/entities', encodeURIComponent(entityType.toLowerCase()), itemId).toString();
+    return new URLCombiner(`${normalizedNamespace}/entities`, encodeURIComponent(entityType.toLowerCase()), itemId).toString();
   } else {
-    return new URLCombiner(getItemModuleRoute(), itemId).toString();
+    return new URLCombiner(getItemModuleRoute(namespace), itemId).toString();
   }
 }
 
-export function getEntityEditRoute(entityType: string, itemId: string) {
-  return new URLCombiner(getEntityPageRoute(entityType, itemId), ITEM_EDIT_PATH).toString();
+export function getEntityEditRoute(entityType: string, itemId: string, namespace?: string) {
+  return new URLCombiner(getEntityPageRoute(entityType, itemId, namespace), ITEM_EDIT_PATH).toString();
 }
 
 /**
  * Get the route to an item's version
  * @param versionId the ID of the version for which the route will be retrieved
+ * @param namespace Optional namespace to prepend to the route
  */
-export function getItemVersionRoute(versionId: string) {
-  return new URLCombiner(getItemModuleRoute(), ITEM_VERSION_PATH, versionId).toString();
+export function getItemVersionRoute(versionId: string, namespace?: string) {
+  return new URLCombiner(getItemModuleRoute(namespace), ITEM_VERSION_PATH, versionId).toString();
 }
 
 export const ITEM_EDIT_PATH = 'edit';

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

@@ -1,6 +1,10 @@
-import { AsyncPipe } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
+  inject,
   Input,
   OnInit,
 } from '@angular/core';
@@ -16,6 +20,7 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
+import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { RemoteData } from '../../../core/data/remote-data';
 import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
 import { Item } from '../../../core/shared/item.model';
@@ -39,8 +44,9 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
   templateUrl: './item-versions-notice.component.html',
   standalone: true,
   imports: [
-    AlertComponent,
-    AsyncPipe,
+    NgIf, 
+    AlertComponent, 
+    AsyncPipe, 
     TranslateModule,
   ],
 })
@@ -85,6 +91,8 @@ export class ItemVersionsNoticeComponent implements OnInit {
    */
   public AlertTypeEnum = AlertType;
 
+  private appConfig = inject(APP_CONFIG);
+
   constructor(private versionHistoryService: VersionHistoryDataService) {
   }
 
@@ -134,7 +142,7 @@ export class ItemVersionsNoticeComponent implements OnInit {
    */
   getItemPage(item: Item): string {
     if (hasValue(item)) {
-      return getItemPageRoute(item);
+      return getItemPageRoute(item, this.appConfig.ui.nameSpace);
     }
   }
 }