@stemy/ngx-utils 19.9.1 → 19.9.3

package/fesm2022/stemy-ngx-utils.mjs

@@ -831,6 +831,29 @@ class StateService {
     subscribe(osOrNext) {
         return this.$observable.subscribe(osOrNext);
     }
+    getConfig(route, path = []) {
+        return this.getConfigRecursive(route, this.routerConfig, path) || [];
+    }
+    getConfigRecursive(route, config, path) {
+        if (!config)
+            return null;
+        const match = config.findIndex(t => t == route);
+        if (match >= 0)
+            return config;
+        for (const subConfig of config) {
+            if (subConfig.path)
+                path.push(subConfig.path);
+            const loadedChildren = (subConfig["_loadedConfig"] || { routes: null }).routes || subConfig["_loadedRoutes"];
+            const match = this.getConfigRecursive(route, subConfig.children || loadedChildren, path);
+            if (!match) {
+                if (subConfig.path)
+                    path.length -= 1;
+                continue;
+            }
+            return match;
+        }
+        return null;
+    }
     openInNewWindow(tree, target) {
         if (!this.universal.isBrowser)
             return false;
@@ -956,26 +979,6 @@ class AuthGuard {
             });
         });
     }
-    getConfig(route, config, path) {
-        if (!config)
-            return null;
-        const match = config.findIndex(t => t == route);
-        if (match >= 0)
-            return config;
-        for (const subConfig of config) {
-            if (subConfig.path)
-                path.push(subConfig.path);
-            const loadedChildren = (subConfig["_loadedConfig"] || { routes: null }).routes || subConfig["_loadedRoutes"];
-            const match = this.getConfig(route, subConfig.children || loadedChildren, path);
-            if (!match) {
-                if (subConfig.path)
-                    path.length -= 1;
-                continue;
-            }
-            return match;
-        }
-        return null;
-    }
     getReturnState(route) {
         if (!route)
             return Promise.resolve(null);
@@ -983,7 +986,7 @@ class AuthGuard {
             return Promise.resolve(route.data.returnState);
         }
         const path = [];
-        const config = this.getConfig(route, this.state.routerConfig, path);
+        const config = this.state.getConfig(route, path);
         return new Promise(resolve => {
             this.getReturnStateRecursive(config).then(rs => {
                 if (!ObjectUtils.isArray(rs)) {
@@ -2727,7 +2730,7 @@ function diffEntities(current, incoming) {
     const incomingIds = new Set(incoming.map(item => item.id).filter(Boolean));
     return {
         // 1. Removed: Was in current, but ID is missing from incoming
-        removed: current.filter(item => !incomingIds.has(item.id)),
+        removed: current.filter(item => !incomingIds.has(item.id) && item.id),
         // 2. Added: ID is missing entirely (new record)
         added: incoming.filter(item => !item.id),
         // 3. Updated: ID exists in both lists
@@ -3207,36 +3210,35 @@ class AclService {
         this.state = state;
         this.events = events;
         this.components = [];
-        this.events.userChanged.subscribe(() => {
+        this.events.userChanged.subscribe(async () => {
             this.components.forEach(t => t.dirty = true);
             const info = this.getStateInfo();
-            const check = info && info.guard instanceof AuthGuard ? info.guard.checkRoute(info.route) : Promise.resolve(true);
-            check.then(result => {
-                if (result) {
-                    if (!info || !info.dirty)
-                        return;
-                    info.dirty = false;
-                    const component = info.component;
-                    if (!info.component)
-                        return;
-                    if (info.first) {
-                        if (ObjectUtils.isFunction(component.onUserInitialized)) {
-                            component.onUserInitialized();
-                        }
-                        info.first = false;
-                        return;
-                    }
-                    if (ObjectUtils.isFunction(component.onUserChanged)) {
-                        component.onUserChanged();
+            const result = info && info.guard instanceof AuthGuard
+                ? await info.guard.checkRoute(info.route)
+                : true;
+            if (result) {
+                if (!info || !info.dirty)
+                    return;
+                info.dirty = false;
+                const component = info.component;
+                if (!info.component)
+                    return;
+                if (info.first) {
+                    if (ObjectUtils.isFunction(component.onUserInitialized)) {
+                        component.onUserInitialized();
                     }
+                    info.first = false;
                     return;
                 }
-                info.guard.getReturnState(info.route).then(returnState => {
-                    if (!returnState)
-                        return;
-                    this.state.navigate(returnState);
-                });
-            });
+                if (ObjectUtils.isFunction(component.onUserChanged)) {
+                    component.onUserChanged();
+                }
+                return;
+            }
+            const returnState = await info.guard.getReturnState(info.route);
+            if (!returnState)
+                return;
+            await this.state.navigate(returnState);
         });
         this.state.subscribe(() => {
             const info = this.getStateInfo();
@@ -3249,6 +3251,25 @@ class AclService {
             info.first = false;
         });
     }
+    async getCurrentMenu() {
+        const path = [];
+        const config = this.state.getConfig(this.state.route, path);
+        const checks = await Promise.all(config.map(async (route) => {
+            const guard = (route.canActivate || []).find(g => g instanceof AuthGuard);
+            return guard ? await guard.checkRoute(route) : ObjectUtils.isStringWithValue(route.data?.name);
+        }));
+        const basePath = path.join("/").replace(/^([a-z]+)/gi, `/$1`);
+        return config.map((route, index) => {
+            return !checks[index] ? null : {
+                path: `${basePath}/${route.path}`,
+                page: route.data.page || route.data.id,
+                label: route.data.name,
+                side: route.data.side || `left`,
+                external: false,
+                data: route.data
+            };
+        }).filter(Boolean);
+    }
     getStateInfo() {
         const route = this.state.route;
         if (!route)