@elite.framework/ng.core 2.0.27 → 2.0.28

package/fesm2022/elite.framework-ng.core-services.mjs

@@ -2263,24 +2263,22 @@ class AbstractNavTreeService extends AbstractTreeService {
     convertNavigationToRoutes(menuItems, parentName) {
         return menuItems
             .filter(item => item.isEnabled && item.isVisible)
-            .flatMap(item => {
+            .map(item => {
             const route = {
                 name: item.name,
+                parentName: parentName,
                 path: this.extractPathFromUrl(item.url) || item.name.toLowerCase(),
-                // parentName: parentName || null,
                 requiredPolicy: item.permission || undefined,
-                iconClass: item.icon || undefined,
                 order: item.order,
                 invisible: !item.isVisible,
-                // You can add other properties based on your Route interface
+                iconClass: item.icon || undefined,
+                children: [], // سيتم ملؤها إذا كان هناك عناصر فرعية
             };
-            const routes = [route];
-            // Recursively add children
+            // Recursively convert children if exist
             if (item.items?.length) {
-                const childRoutes = this.convertNavigationToRoutes(item.items, item.name);
-                routes.push(...childRoutes);
+                route.children = this.convertNavigationToRoutes(item.items, item.name);
             }
-            return routes;
+            return route;
         });
     }
     extractPathFromUrl(url) {