@ecodev/natural 63.3.3 → 63.5.0

package/fesm2022/ecodev-natural.mjs

@@ -2497,10 +2497,16 @@ class NaturalAbstractDetail extends NaturalAbstractPanel {
                     return EMPTY;
                 }
                 else {
-                    const defaultRoute = ['../../' + kebabCase(this.key)];
-                    return this.router.navigate(redirectionRoute ? redirectionRoute : defaultRoute, {
-                        relativeTo: this.route,
-                    });
+                    let commands = ['../../' + kebabCase(this.key)];
+                    let extras = { relativeTo: this.route };
+                    if (redirectionRoute && 'extras' in redirectionRoute) {
+                        commands = redirectionRoute.commands;
+                        extras = { ...extras, ...redirectionRoute.extras };
+                    }
+                    else if (redirectionRoute) {
+                        commands = redirectionRoute;
+                    }
+                    return this.router.navigate(commands, extras);
                 }
             }));
         }), finalize(() => this.form.enable()))
@@ -3807,17 +3813,18 @@ class NaturalAbstractList extends NaturalAbstractPanel {
         this.variablesManager.defaults('sorting', { sorting: this.defaultSorting });
         this.dataSource = new NaturalDataSource(this.getDataObservable());
         this.selection.clear();
+        this.handleHistoryNavigation();
+    }
+    handleHistoryNavigation() {
         // Update natural search when history changes (back/forward buttons)
         // History state is detectable only on NavigationStart (popstate trigger)
         // But we need parameters from url after NavigationEnd. So proceed in two steps with a flag.
         let isPopState = false;
         this.router.events
             .pipe(takeUntilDestroyed(this.destroyRef), filter(event => event instanceof NavigationStart && event.navigationTrigger === 'popstate'))
-            .subscribe(() => {
-            isPopState = true;
-        });
+            .subscribe(() => (isPopState = true));
         this.router.events
-            .pipe(takeUntilDestroyed(this.destroyRef), filter(event => event instanceof NavigationEnd && isPopState))
+            .pipe(takeUntilDestroyed(this.destroyRef), filter(event => event instanceof NavigationEnd && isPopState), filter(() => this.historyNavigationFilter()))
             .subscribe(() => {
             isPopState = false; // reset flag
             const selections = fromUrl(this.persistenceService.getFromUrl('ns', this.route));
@@ -3825,6 +3832,9 @@ class NaturalAbstractList extends NaturalAbstractPanel {
             this.search(selections);
         });
     }
+    historyNavigationFilter() {
+        return true;
+    }
     /**
      * Persist search and then launch whatever is required to refresh the list
      */