@elderbyte/ngx-starter 13.7.5 → 13.7.6

package/fesm2020/elderbyte-ngx-starter.mjs

@@ -2156,7 +2156,7 @@ class CollectionUtil {
         return false;
     }
     /**
-     * Moves the given item up in the given array - if not already at the bottom
+     * Moves the given item up in the given array - if not already at the top
      * @param items
      * @param toMove
      */
@@ -3822,7 +3822,7 @@ class MatTableDataContextBinding {
         }
     }
     bindDataContextToMatSortsUntil(matSorts$, destroy$) {
-        const dcSorts$ = this._dataContext$.pipe(switchMap(dc => dc.sort.sorts));
+        const dcSorts$ = this._dataContext$.pipe(filter(dc => !!dc), switchMap(dc => dc.sort.sorts));
         combineLatest([dcSorts$, matSorts$]).pipe(takeUntil(destroy$)).subscribe(([dcSorts, matSorts]) => {
             if (dcSorts.length >= 1) {
                 // At least one sort active
@@ -3859,19 +3859,23 @@ class MatTableDataContextBinding {
             return new Sort(matSort.active, this.fromMatDirection(matSort.direction));
         }));
         combineLatest([this._dataContext$, sortChanges$]).pipe(takeUntil(destroy$)).subscribe(([dc, sortRequest]) => {
-            dc.sort.updateSort(sortRequest);
+            if (dc) {
+                dc.sort.updateSort(sortRequest);
+            }
         });
     }
     bindPaginatorUntil(paginator$, destroy$) {
         const pageRequest$ = paginator$.pipe(filter(paginator => !!paginator), switchMap(paginator => paginator.page), map(pageEvent => new PageRequest(pageEvent.pageIndex, pageEvent.pageSize)));
         combineLatest([this._dataContext$, pageRequest$]).pipe(takeUntil(destroy$)).subscribe(([dc, pageRequest]) => {
-            if (isActivePagedDataContext(dc)) {
-                const pagedDc = dc;
-                pagedDc.setActivePage(pageRequest);
-            }
-            else {
-                this.logger.warn('Can not bind the given paginator to the given data-context,' +
-                    ' as the datacontext does not support pagination!', dc);
+            if (dc) {
+                if (isActivePagedDataContext(dc)) {
+                    const pagedDc = dc;
+                    pagedDc.setActivePage(pageRequest);
+                }
+                else {
+                    this.logger.warn('Can not bind the given paginator to the given data-context,' +
+                        ' as the datacontext does not support pagination!', dc);
+                }
             }
         });
     }
@@ -20244,6 +20248,7 @@ class ElderSelectBase extends FormFieldBaseComponent {
          **************************************************************************/
         this._logger = LoggerFactory.getLogger(this.constructor.name);
         this._filterContext = new FilterContext();
+        this.timeoutAfterMs = 5000;
         /**
          * Define if elder-select should clean up the
          * data-context resources for you.
@@ -20901,7 +20906,10 @@ class ElderSelectComponent extends ElderSelectBase {
         this.entityChange = this._entity$.pipe(skip(1) // Skip the initial or current value
         );
         this.entityIdUpdated = this.valueUpdated.pipe(map(value => this.entityIdFromValue(value)));
-        this.entityUpdated = combineLatest([this.entityIdUpdated, this._entity$]).pipe(filter(([updatedId, entity]) => this.getEntityId(entity) === updatedId), map(([updatedId, entity]) => entity));
+        this.entityUpdated = this.entityIdUpdated.pipe(switchMap(entityId => this.awaitEntityWithId(entityId, this.timeoutAfterMs)), catchError(err => {
+            this.logger.warn(`awaitEntityWithId -> timed out after: ${this.timeoutAfterMs}`, err);
+            return EMPTY;
+        }));
         this.entityWrapped$ = combineLatest([
             this._entity$,
             this.displayPropertyResolver$,
@@ -21092,6 +21100,9 @@ class ElderSelectComponent extends ElderSelectBase {
     valuesEquals(a, b) {
         return this.entityIdFromValue(a) === this.entityIdFromValue(b);
     }
+    awaitEntityWithId(entityId, timeoutMs) {
+        return this.entity$.pipe(filter(entity => this.getEntityId(entity) === entityId), take(1), timeout(timeoutMs));
+    }
     isEntitySelected(entity) {
         return this.getEntityId(entity) === this.entityId;
     }
@@ -21303,7 +21314,13 @@ class ElderMultiSelectBase extends ElderSelectBase {
         this.entities$ = new BehaviorSubject([]);
         this.entityIdsChange = this.valueChange.pipe(map(values => this.entityIdsFromValues(values)));
         this.entityIdsUpdated = this.valueUpdated.pipe(map(values => this.entityIdsFromValues(values)));
-        this.entitiesUpdated = combineLatest([this.entityIdsUpdated, this.entities$]).pipe(filter(([updatedIds, entities]) => this.equalIds(this.getEntityIds(entities), updatedIds)), map(([updatedIds, entities]) => entities));
+        this.entitiesUpdated = this.entityIdsUpdated.pipe(switchMap(entityId => this.awaitEntitiesWithId(entityId, this.timeoutAfterMs)), catchError(err => {
+            this.logger.warn(`awaitEntitiesWithId -> timed out after: ${this.timeoutAfterMs}`, err);
+            return EMPTY;
+        }));
+    }
+    awaitEntitiesWithId(entityIds, timeoutMs) {
+        return this.entities$.pipe(filter(entities => this.equalIds(this.getEntityIds(entities), entityIds)), take(1), timeout(timeoutMs));
     }
     /***************************************************************************
      *                                                                         *