From 23b5d52623aceefa7d98e701c1cb34955a15d456 Mon Sep 17 00:00:00 2001
From: Nona Luypaert <nona.luypaert@atmire.com>
Date: Tue, 30 May 2023 14:50:25 +0200
Subject: [PATCH] 101623: Fix request being sent with uuid=undefined if not
 going to a DSO page

---
 .../shared/dso-page/dso-edit-menu.resolver.ts | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
index 749d5580a4..80a69c2830 100644
--- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
@@ -50,27 +50,32 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
     if (hasNoValue(id) && hasValue(route.queryParams.scope)) {
       id = route.queryParams.scope;
     }
-    return this.dSpaceObjectDataService.findById(id, true, false).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((dsoRD) => {
-        if (dsoRD.hasSucceeded) {
-          const dso = dsoRD.payload;
-          return combineLatest(this.getDsoMenus(dso, route, state)).pipe(
-            // Menu sections are retrieved as an array of arrays and flattened into a single array
-            map((combinedMenus) => [].concat.apply([], combinedMenus)),
-            map((menus) => this.addDsoUuidToMenuIDs(menus, dso)),
-            map((menus) => {
-              return {
-                ...route.data?.menu,
-                [MenuID.DSO_EDIT]: menus
-              };
-            })
-          );
-        } else {
-          return observableOf({...route.data?.menu});
-        }
-      })
-    );
+    if (hasNoValue(id)) {
+      // If there's no ID, we're not on a DSO homepage, so pass on any pre-existing menu route data
+      return observableOf({ ...route.data?.menu });
+    } else {
+      return this.dSpaceObjectDataService.findById(id, true, false).pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((dsoRD) => {
+          if (dsoRD.hasSucceeded) {
+            const dso = dsoRD.payload;
+            return combineLatest(this.getDsoMenus(dso, route, state)).pipe(
+              // Menu sections are retrieved as an array of arrays and flattened into a single array
+              map((combinedMenus) => [].concat.apply([], combinedMenus)),
+              map((menus) => this.addDsoUuidToMenuIDs(menus, dso)),
+              map((menus) => {
+                return {
+                  ...route.data?.menu,
+                  [MenuID.DSO_EDIT]: menus
+                };
+              })
+            );
+          } else {
+            return observableOf({...route.data?.menu});
+          }
+        })
+      );
+    }
   }
 
   /**