LUT-30668 : SiteMap by template page cycle fix

Author: evdngsl

src/java/fr/paris/lutece/portal/web/menu/MenuItem.java

@@ -1,6 +1,7 @@
 package fr.paris.lutece.portal.web.menu;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -260,15 +261,20 @@ public static List<MenuItem> buildTree( List<MenuItem> nodes )
         {
             Map<Integer, MenuItem> nodeMap = new HashMap<>( );
             List<MenuItem> roots = new ArrayList<>( );
-
+            int root = 0;
+            
             for ( MenuItem node : nodes )
             {
                 nodeMap.put( node.getPageId( ), node );
             }
+            if ( !nodeMap.isEmpty( ) && !nodeMap.containsKey( root ) )
+            {
+                root = Collections.min( nodeMap.entrySet( ), Map.Entry.comparingByKey( ) ).getKey( );
+            }
 
             for ( MenuItem node : nodes )
             {
-                if ( 0 == node.getParentId( ) )
+                if ( root == node.getParentId( ) )
                 {
                     roots.add( node );
                 }

src/java/fr/paris/lutece/portal/web/xpages/SiteMapApp.java

@@ -343,7 +343,7 @@ public String buildPageContentTemplate( int nMode, HttpServletRequest request )
         int nLevel = 0;
 
         List<MenuItem> mapItems = new ArrayList<MenuItem>( );
-        buildMenu( request, mapItems, PortalService.getRootPageId( ), nLevel );
+        buildMenu( request, mapItems, PortalService.getRootPageId( ), nLevel, new HashSet<>( ) );
 
         Map<String, Object> model = new HashMap<>( );
         model.put( MARK_MAP_ITEMS, MenuTreeBuilder.buildTree( mapItems ) );
@@ -353,9 +353,14 @@ public String buildPageContentTemplate( int nMode, HttpServletRequest request )
 
         return t.getHtml();
     }
-    
-    private void buildMenu( HttpServletRequest request, List<MenuItem> flatMenu, int nPageId, int nLevel )
+
+    private void buildMenu( HttpServletRequest request, List<MenuItem> flatMenu, int nPageId, int nLevel, Set<Integer> seenPages )
     {
+        if ( !seenPages.add( nPageId ) )
+        {
+            AppLogService.error( "SiteMapApp : A cycle exists in pages; page id {} was already processed", nPageId );
+            return;
+        }
         Page page = PageHome.getPage( nPageId );
 
         if ( page.isVisible( request ) )
@@ -368,7 +373,7 @@ private void buildMenu( HttpServletRequest request, List<MenuItem> flatMenu, int
 
             for ( Page pageChild : PageHome.getChildPagesMinimalData( nPageId ) )
             {
-                buildMenu( request, flatMenu, pageChild.getId( ), nLevel + 1 );
+                buildMenu( request, flatMenu, pageChild.getId( ), nLevel + 1, seenPages );
             }
         }
     }