@ecodev/natural 45.4.1 → 45.4.2

package/fesm2020/ecodev-natural.mjs

@@ -1,11 +1,11 @@
 import '@angular/localize/init';
 import * as i0 from '@angular/core';
 import { Directive, Component, Inject, Injectable, HostBinding, HostListener, InjectionToken, Optional, Input, NgModule, EventEmitter, ChangeDetectionStrategy, Output, ContentChildren, Pipe, TemplateRef, ViewEncapsulation, ViewChild, Injector, Self, ContentChild, createEnvironmentInjector, createComponent, PLATFORM_ID, ErrorHandler } from '@angular/core';
-import { Subject, BehaviorSubject, of, timer, switchMap as switchMap$1, endWith, last, EMPTY, Observable, first as first$1, combineLatest, ReplaySubject, debounceTime as debounceTime$1, raceWith, take as take$1, mergeMap, shareReplay as shareReplay$1, catchError, forkJoin, map as map$1, merge as merge$1, tap as tap$1, asyncScheduler, takeUntil as takeUntil$1 } from 'rxjs';
+import { Subject, BehaviorSubject, of, timer, switchMap as switchMap$1, endWith, last, EMPTY, Observable, first as first$1, combineLatest, catchError, ReplaySubject, debounceTime as debounceTime$1, raceWith, take as take$1, mergeMap, shareReplay as shareReplay$1, forkJoin, map as map$1, merge as merge$1, tap as tap$1, asyncScheduler, takeUntil as takeUntil$1 } from 'rxjs';
 import * as i3 from '@angular/forms';
 import { FormGroup, FormArray, Validators, UntypedFormGroup, UntypedFormArray, UntypedFormControl, FormsModule, FormControl, FormControlDirective, FormControlName, ReactiveFormsModule } from '@angular/forms';
 import * as i2$1 from '@angular/router';
-import { Router, ActivatedRoute, NavigationEnd, RouterModule, NavigationError, DefaultUrlSerializer } from '@angular/router';
+import { Router, ActivatedRoute, NavigationStart, NavigationEnd, RouterModule, NavigationError, DefaultUrlSerializer } from '@angular/router';
 import { merge, isObject, isArray, pickBy, isEmpty, cloneDeep, uniq, groupBy, mergeWith, defaultsDeep, omit, kebabCase, clone, pick, isEqual, defaults, intersection, flatten, differenceWith } from 'lodash-es';
 import * as i1 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
@@ -3061,6 +3061,21 @@ class NaturalAbstractList extends NaturalAbstractPanel {
         this.variablesManager.defaults('sorting', { sorting: this.defaultSorting });
         this.dataSource = new NaturalDataSource(this.getDataObservable());
         this.selection.clear();
+        // 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(takeUntil(this.ngUnsubscribe), filter(event => event instanceof NavigationStart && event.navigationTrigger === 'popstate'))
+            .subscribe(() => {
+            isPopState = true;
+        });
+        this.router.events
+            .pipe(takeUntil(this.ngUnsubscribe), filter(event => event instanceof NavigationEnd && isPopState))
+            .subscribe(() => {
+            isPopState = false; // reset flag
+            this.naturalSearchSelections = fromUrl(this.persistenceService.getFromUrl('ns', this.route));
+        });
     }
     /**
      * Persist search and then launch whatever is required to refresh the list
@@ -3735,7 +3750,7 @@ class NaturalAbstractModelService {
                 variables: manager.variables.value,
                 fetchPolicy: fetchPolicy,
             })
-                .valueChanges.pipe(filter(r => !!r.data), this.mapAll());
+                .valueChanges.pipe(catchError(() => EMPTY), filter(r => !!r.data), this.mapAll());
         }));
     }
     /**
@@ -9613,8 +9628,11 @@ class NaturalRelationsComponent extends NaturalAbstractController {
             return;
         }
         this.loading = true;
-        const queryRef = this.service.watchAll(this.variablesManager).pipe(takeUntil(this.ngUnsubscribe));
-        queryRef.pipe(finalize(() => (this.loading = false))).subscribe(() => (this.loading = false));
+        const queryRef = this.service.watchAll(this.variablesManager).pipe(takeUntil(this.ngUnsubscribe), tap$1({
+            next: () => (this.loading = false),
+            complete: () => (this.loading = false),
+            error: () => (this.loading = false),
+        }));
         this.dataSource = new NaturalDataSource(queryRef);
     }
     getSelectKey() {