@wolkabout/commons 0.0.48 → 0.0.50

package/fesm2022/wolkabout-commons.mjs

@@ -460,9 +460,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.0", ngImpor
                 }]
         }] });
 
-const createGlobalPermissionsGuard = (availableRoutesGetter, fallbackRoute, parentRoutes) => {
+const createGlobalPermissionsGuard = (fallbackRoute) => {
     let checkedRoutes = [];
-    const permissionsGuard = (permissions) => (route, state) => {
+    const permissionsGuard = (permissions) => (route) => {
         const router = inject(Router);
         const permissionService = inject(PermissionsService);
         const permissionsToCheck = Array.isArray(permissions) ? permissions : [permissions];
@@ -471,16 +471,20 @@ const createGlobalPermissionsGuard = (availableRoutesGetter, fallbackRoute, pare
                 checkedRoutes = [];
                 return true;
             }
-            const currentRoute = route.routeConfig?.path;
-            if (!currentRoute) {
+            const currentPath = route.routeConfig?.path;
+            if (!currentPath) {
                 checkedRoutes = [];
                 return router.createUrlTree(fallbackRoute);
             }
-            checkedRoutes.push(currentRoute);
-            const availableRoutes = availableRoutesGetter()?.filter(route => route.path !== '**');
-            const nextRoute = availableRoutes?.find((route) => route.path !== currentRoute && !checkedRoutes.includes(route.path));
+            checkedRoutes.push(currentPath);
+            const siblings = route.parent?.routeConfig?.children?.filter((route) => !!route.path && route.path !== '**' && !checkedRoutes.includes(route.path)) ?? [];
+            const parentUrl = route.parent?.pathFromRoot
+                .flatMap((route) => route.url)
+                .map((url) => url.path)
+                .filter(Boolean) ?? [];
+            const nextRoute = siblings[0];
             if (nextRoute) {
-                return router.createUrlTree(parentRoutes ? [...parentRoutes, nextRoute.path] : [nextRoute.path]);
+                return router.createUrlTree([...parentUrl, nextRoute.path]);
             }
             checkedRoutes = [];
             return router.createUrlTree(fallbackRoute);