@elderbyte/ngx-starter 15.6.2 → 15.6.4

package/fesm2020/elderbyte-ngx-starter.mjs

@@ -6,7 +6,7 @@ import * as i1 from '@angular/platform-browser';
 import { Duration, Period, TemporalQueries, LocalTime, Instant, LocalDate, nativeJs, ZoneId, ZonedDateTime, Temporal } from '@js-joda/core';
 import { LoggerFactory } from '@elderbyte/ts-logger';
 import { BehaviorSubject, Subject, EMPTY, combineLatest, merge, of, forkJoin, throwError, mergeWith, switchMap as switchMap$1, Observable, ReplaySubject, fromEvent, NEVER } from 'rxjs';
-import { distinctUntilChanged, map, filter, takeUntil, debounceTime, catchError, first, take, switchMap, mergeMap, takeWhile, tap, expand, reduce, startWith, skip, delay, share, throttleTime, combineLatestWith, timeout, skipWhile } from 'rxjs/operators';
+import { distinctUntilChanged, map, filter, takeUntil, debounceTime, catchError, first, take, switchMap, mergeMap, tap, takeWhile, expand, reduce, startWith, skip, delay, share, throttleTime, combineLatestWith, timeout, skipWhile } from 'rxjs/operators';
 import * as i1$2 from '@angular/common/http';
 import { HttpParams, HttpEventType, HttpRequest, HttpClient, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { DataSource } from '@angular/cdk/collections';
@@ -3002,87 +3002,13 @@ class TokenChunkRequest {
     }
 }
 
-class SortContext {
-    constructor() {
-        /***************************************************************************
-         *                                                                         *
-         * Fields                                                                  *
-         *                                                                         *
-         **************************************************************************/
-        this._sorts = new BehaviorSubject([]);
-        /***************************************************************************
-         *                                                                         *
-         * Private methods                                                         *
-         *                                                                         *
-         **************************************************************************/
-    }
-    /***************************************************************************
-     *                                                                         *
-     * Read API                                                                *
-     *                                                                         *
-     **************************************************************************/
-    get sorts() {
-        return this._sorts.asObservable();
-    }
-    get sortsSnapshot() {
-        return this._sorts.getValue();
-    }
-    findSortDirection(prop) {
-        const f = this.findSort(prop);
-        return f ? f.dir : undefined;
-    }
-    findSort(prop) {
-        return this.sortsSnapshot
-            .filter(f => f.prop === prop)
-            .find(first => true);
-    }
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/
-    /**
-     * This method updatees / adds the given sort, leaving
-     * existing ones untouched.
-     * @param updatedSort
-     */
-    updateSort(updatedSort) {
-        if (updatedSort) {
-            this.updateSorts([updatedSort]);
-        }
-    }
-    /**
-     * This method updates / adds the given filters, leaving
-     * existing ones untouched.
-     * @param updatedSorts
-     */
-    updateSorts(updatedSorts) {
-        if (updatedSorts && updatedSorts.length > 0) {
-            const sortMap = new Map();
-            this.sortsSnapshot.forEach(s => sortMap.set(s.prop, s));
-            updatedSorts.forEach(s => sortMap.set(s.prop, s));
-            this.replaceSorts(Array.from(updatedSorts.values()));
-        }
-    }
-    /**
-     * Replace all existing filters with the given new ones.
-     * @param newSorts
-     */
-    replaceSorts(newSorts) {
-        this._sorts.next(newSorts || []);
-    }
-    clear() {
-        this.replaceSorts([]);
-    }
-}
-
 class IndexedEntities {
     /***************************************************************************
      *                                                                         *
      * Constructor                                                             *
      *                                                                         *
      **************************************************************************/
-    constructor(idFn, localSortFn, sortContext = new SortContext()) {
+    constructor(idFn, localSortFn, sortContext) {
         this.idFn = idFn;
         this.localSortFn = localSortFn;
         this.sortContext = sortContext;
@@ -3292,6 +3218,80 @@ function isActivePagedDataContext(object) {
     return object.setActivePage !== undefined;
 }
 
+class SortContext {
+    constructor() {
+        /***************************************************************************
+         *                                                                         *
+         * Fields                                                                  *
+         *                                                                         *
+         **************************************************************************/
+        this._sorts = new BehaviorSubject([]);
+        /***************************************************************************
+         *                                                                         *
+         * Private methods                                                         *
+         *                                                                         *
+         **************************************************************************/
+    }
+    /***************************************************************************
+     *                                                                         *
+     * Read API                                                                *
+     *                                                                         *
+     **************************************************************************/
+    get sorts() {
+        return this._sorts.asObservable();
+    }
+    get sortsSnapshot() {
+        return this._sorts.getValue();
+    }
+    findSortDirection(prop) {
+        const f = this.findSort(prop);
+        return f ? f.dir : undefined;
+    }
+    findSort(prop) {
+        return this.sortsSnapshot
+            .filter(f => f.prop === prop)
+            .find(first => true);
+    }
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+    /**
+     * This method updatees / adds the given sort, leaving
+     * existing ones untouched.
+     * @param updatedSort
+     */
+    updateSort(updatedSort) {
+        if (updatedSort) {
+            this.updateSorts([updatedSort]);
+        }
+    }
+    /**
+     * This method updates / adds the given filters, leaving
+     * existing ones untouched.
+     * @param updatedSorts
+     */
+    updateSorts(updatedSorts) {
+        if (updatedSorts && updatedSorts.length > 0) {
+            const sortMap = new Map();
+            this.sortsSnapshot.forEach(s => sortMap.set(s.prop, s));
+            updatedSorts.forEach(s => sortMap.set(s.prop, s));
+            this.replaceSorts(Array.from(updatedSorts.values()));
+        }
+    }
+    /**
+     * Replace all existing filters with the given new ones.
+     * @param newSorts
+     */
+    replaceSorts(newSorts) {
+        this._sorts.next(newSorts || []);
+    }
+    clear() {
+        this.replaceSorts([]);
+    }
+}
+
 class DataContextBase extends DataSource {
     /***************************************************************************
      *                                                                         *
@@ -3319,7 +3319,7 @@ class DataContextBase extends DataSource {
         this._reloadQueue = new Subject();
         this.unsubscribe$ = new Subject();
         this._dataSource = dataSource;
-        this._data = new IndexedEntities(e => dataSource.getId(e), _localSort);
+        this._data = new IndexedEntities(e => dataSource.getId(e), _localSort, this._sort);
         this._loading = this._status.pipe(map(status => status.loading));
         this._filter.filters.pipe(filter(() => this.started), takeUntil(this.unsubscribe$)).subscribe(filters => this.onFiltersChanged(filters));
         this._sort.sorts.pipe(filter(() => this.started), takeUntil(this.unsubscribe$)).subscribe(sorts => this.onSortsChanged(sorts));
@@ -4385,8 +4385,10 @@ class DataContextAutoStarter extends DataContextLifeCycleBinding {
      *                                                                         *
      **************************************************************************/
     subscribe() {
-        if (this._autoStartConditionFulfilled$) {
-            this._subscription = this._autoStartConditionFulfilled$.pipe(filter(fulfilled => !!fulfilled)).subscribe(() => this.startDataContext());
+        const hasRequiredFilters = !!this._autoStartConditionFulfilled$;
+        if (hasRequiredFilters) {
+            const startedTrue$ = this._dataContext.isStarted$.pipe(filter(t => t));
+            this._subscription = this._autoStartConditionFulfilled$.pipe(takeUntil(startedTrue$), tap(fulfilled => this.logger.debug(`Got fulfilled event: ${fulfilled}`)), filter(fulfilled => !!fulfilled)).subscribe(() => this.startDataContext());
         }
     }
     /***************************************************************************