feat: added check to update only internal menuitem urls (onecx#59)

* feat: added check to update only internal menuitem urls * fix: boolean expression
JordenReuter · Apr 18, 2024 · 54905a0 · 54905a0
1 parent 5bee8cf
commit 54905a0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/user/mappers/UserMenuMapper.java
@@ -43,7 +43,7 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection<Me
         }
         items.forEach(menuItem -> {
             if (menuItem.getUrl() != null) {
-                menuItem.setUrl(workspace.getBaseUrl() + menuItem.getUrl());
+                menuItem.setUrl(updateInternalUrl(workspace.getBaseUrl(), menuItem.getUrl(), menuItem.isExternal()));
             }
             menuItem = updateUrl(menuItem, workspace.getBaseUrl());
         });
@@ -54,13 +54,21 @@ default UserWorkspaceMenuStructureDTO mapTree(Workspace workspace, Collection<Me
     default MenuItem updateUrl(MenuItem menuItem, String workspaceUrl) {
         if (!menuItem.getChildren().isEmpty()) {
             menuItem.getChildren().forEach(menuItemChild -> {
-                menuItemChild.setUrl(workspaceUrl + menuItemChild.getUrl());
+                menuItemChild.setUrl(updateInternalUrl(workspaceUrl, menuItemChild.getUrl(), menuItemChild.isExternal()));
                 updateUrl(menuItemChild, workspaceUrl);
             });
         }
         return menuItem;
     }
 
+    default String updateInternalUrl(String workspaceUrl, String menuItemUrl, Boolean isExternal) {
+        if (Boolean.TRUE.equals(isExternal)) {
+            return menuItemUrl;
+        } else {
+            return workspaceUrl + menuItemUrl;
+        }
+    }
+
     default Set<MenuItem> filterMenu(Set<MenuItem> items, Map<String, Set<String>> mapping, Set<String> roles) {
         Set<MenuItem> tmp = new HashSet<>(items);
         tmp.forEach(m -> {