@dereekb/dbx-core 9.15.4 → 9.15.5

package/fesm2020/dereekb-dbx-core.mjs

@@ -3,7 +3,7 @@ import { Directive, Injectable, forwardRef, Host, Input, Optional, NgModule, Inj
 import * as i1 from 'rxjs';
 import { switchMap, first, BehaviorSubject, combineLatest, distinctUntilChanged, filter, Subject, debounce, interval, throttle, exhaustMap, mergeMap, map, shareReplay, EMPTY, withLatestFrom, of, startWith, tap, delay, catchError, firstValueFrom, takeUntil, Observable } from 'rxjs';
 import * as i1$5 from '@dereekb/rxjs';
-import { SubscriptionObject, LockSet, filterMaybe, LoadingStateType, beginLoading, idleLoadingState, errorResult, successResult, scanCount, combineLatestFromMapValuesObsFn, workFactory, emitDelayObs, asObservable, returnIfIs, timeoutStartWith, skipFirstMaybe, maybeValueFromObservableOrValueGetter, switchMapToDefault, onFalseToTrue, onTrueToFalse, setContainsAllValuesFrom, setContainsNoValueFrom, FilterSourceInstance, FilterSource, FilterSourceConnector, FilterMap } from '@dereekb/rxjs';
+import { SubscriptionObject, LockSet, filterMaybe, LoadingStateType, beginLoading, idleLoadingState, errorResult, successResult, scanCount, combineLatestFromMapValuesObsFn, workFactory, emitDelayObs, asObservable, returnIfIs, timeoutStartWith, skipFirstMaybe, maybeValueFromObservableOrValueGetter, switchMapToDefault, asObservableFromGetter, onFalseToTrue, onTrueToFalse, setContainsAllValuesFrom, setContainsNoValueFrom, FilterSourceInstance, FilterSource, FilterSourceConnector, FilterMap } from '@dereekb/rxjs';
 import * as i1$6 from '@dereekb/util';
 import { isDefinedAndNotFalse, hasValueOrNotEmpty, BooleanStringKeyArrayUtilityInstance, reduceBooleansWithOrFn, getValueFromGetter, toReadableError, isGetter, setIncludes, isAllowed, maybeSet, expandTreeFunction, flattenTreeToArrayFunction, expandFlattenTreeFunction, mergeObjects, KeyValueTypleValueFilter, asArray, defaultForwardFunctionFactory, mergeArrays, filterMaybeValues, mergeArrayOrValueIntoArray, promiseReference, DataIsExpiredError, DataDoesNotExistError, hasNonNullValue, splitJoinRemainder, StorageObjectUtility, SHARED_MEMORY_STORAGE } from '@dereekb/util';
 import { ComponentStore } from '@ngrx/component-store';
@@ -2301,7 +2301,7 @@ const DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY = 'uid';
  * If not, or
  */
 function redirectForUserIdentifierParamHook(input) {
-    const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, transitionService, canViewUser } = input;
+    const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, priority = 100, transitionService, canViewUser } = input;
     const criteria = typeof input.criteria === 'string' ? { entering: input.criteria } : input.criteria;
     // https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult
     const assertAllowedUid = (transition) => {
@@ -2313,13 +2313,13 @@ function redirectForUserIdentifierParamHook(input) {
         return firstValueFrom(authService.userIdentifier$.pipe(first(), switchMap((currentUserId) => {
             let result = of(true);
             let redirectToUid;
-            if (!transitionTargetUid || transitionTargetUid === DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE) {
+            if (!transitionTargetUid || transitionTargetUid === defaultParamValue) {
                 // If uid isn't set, default to the current user.
                 redirectToUid = of(currentUserId);
             }
             else if (currentUserId !== transitionTargetUid) {
                 redirectToUid = canViewUser(transitionTargetUid, authService, injector).pipe(map((x) => {
-                    if (typeof x === 'boolean') {
+                    if (x == null || typeof x === 'boolean') {
                         return x ? transitionTargetUid : currentUserId;
                     }
                     else {
@@ -2343,7 +2343,7 @@ function redirectForUserIdentifierParamHook(input) {
         })));
     };
     // Register the "requires auth" hook with the TransitionsService
-    transitionService.onBefore(criteria, assertAllowedUid, { priority: 100 });
+    transitionService.onBefore(criteria, assertAllowedUid, { priority });
 }
 
 var DbxRouterTransitionEventType;
@@ -2688,6 +2688,7 @@ class DbxRouteParamReaderInstance {
     }
     destroy() {
         this._paramKey.complete();
+        this._defaultValue.complete();
     }
     get paramKey() {
         return this._paramKey.value;
@@ -2698,11 +2699,23 @@ class DbxRouteParamReaderInstance {
     setDefaultValue(defaultValue) {
         this._defaultValue.next(defaultValue ?? this.defaultValue);
     }
+    /**
+     * Convenience function to set the param value on the router.
+     *
+     * @param value
+     */
+    setParamValue(value) {
+        combineLatest([this.paramKey$, asObservableFromGetter(value)])
+            .pipe(first())
+            .subscribe(([paramKey, value]) => {
+            this.dbxRouterService.updateParams({ [paramKey]: value });
+        });
+    }
 }
 
 const DEFAULT_REDIRECT_INSTANCE_FORWARD_FACTORY = defaultForwardFunctionFactory((value) => of(value == null));
 /**
- * Utility class used in conjuction with a DbxRouteParamReaderInstance to redirect when the default param does not equal the
+ * Utility class used in conjuction with a DbxRouteParamReaderInstance to redirect when the default param is not valid.
  */
 class DbxRouteParamDefaultRedirectInstance {
     constructor(instance) {