@elite.framework/ng.core 2.0.26 → 2.0.28

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

@@ -708,6 +708,12 @@ class ConfigStateService {
             return undefined;
         }, this.store.state);
     }
+    getNavigation() {
+        return this.store.state?.navigation || null;
+    }
+    getNavigation$() {
+        return this.store.sliceState(state => state?.navigation || null);
+    }
     getFeature(key) {
         return this.store.state.features?.values?.[key];
     }
@@ -2238,13 +2244,55 @@ class AbstractNavTreeService extends AbstractTreeService {
         this.injector = injector;
         // TODO Merge Dynamic Nav Too!
         const configState = this.injector.get(ConfigStateService);
-        this.subscription = configState
-            .createOnUpdateStream((state) => state)
-            .subscribe(() => this.refresh());
+        // this.subscription = configState
+        //   .createOnUpdateStream((state:any) => state)
+        //   .subscribe(() => this.refresh());
+        this.subscription = configState.getAll$().pipe(map$1(appState => appState?.navigation)).subscribe(navigation => {
+            if (navigation?.menus) {
+                // Convert NavigationMenuItem to Route format
+                const dynamicRoutes = this.convertNavigationToRoutes(navigation.menus);
+                // Merge with existing routes
+                this.add(dynamicRoutes);
+            }
+        });
         this.permissionService = injector.get(PermissionCheckerService);
         this.othersGroup = injector.get(OTHERS_GROUP);
         this.compareFunc = injector.get(SORT_COMPARE_FUNC);
     }
+    // Add helper method to convert NavigationMenuItem to Route
+    convertNavigationToRoutes(menuItems, parentName) {
+        return menuItems
+            .filter(item => item.isEnabled && item.isVisible)
+            .map(item => {
+            const route = {
+                name: item.name,
+                parentName: parentName,
+                path: this.extractPathFromUrl(item.url) || item.name.toLowerCase(),
+                requiredPolicy: item.permission || undefined,
+                order: item.order,
+                invisible: !item.isVisible,
+                iconClass: item.icon || undefined,
+                children: [], // سيتم ملؤها إذا كان هناك عناصر فرعية
+            };
+            // Recursively convert children if exist
+            if (item.items?.length) {
+                route.children = this.convertNavigationToRoutes(item.items, item.name);
+            }
+            return route;
+        });
+    }
+    extractPathFromUrl(url) {
+        if (!url)
+            return null;
+        try {
+            // Extract path from URL, remove domain/hash/query params
+            const urlObj = new URL(url, window.location.origin);
+            return urlObj.pathname || null;
+        }
+        catch {
+            return url; // Return as-is if not a valid URL
+        }
+    }
     isGranted({ requiredPolicy }) {
         return this.permissionService.getGrantedPolicy(requiredPolicy);
     }