@dereekb/dbx-core 9.15.4 → 9.15.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/action/directive/debug/action.logger.directive.mjs +2 -2
- package/esm2020/lib/router/auth/hook/uid.hook.mjs +5 -5
- package/esm2020/lib/router/router/service/router.service.mjs +1 -1
- package/esm2020/lib/router/router/util/route.default.mjs +2 -2
- package/esm2020/lib/router/router/util/route.reader.mjs +16 -3
- package/fesm2015/dereekb-dbx-core.mjs +20 -7
- package/fesm2015/dereekb-dbx-core.mjs.map +1 -1
- package/fesm2020/dereekb-dbx-core.mjs +20 -7
- package/fesm2020/dereekb-dbx-core.mjs.map +1 -1
- package/lib/router/auth/hook/uid.hook.d.ts +8 -1
- package/lib/router/router/service/router.service.d.ts +2 -0
- package/lib/router/router/util/route.default.d.ts +1 -1
- package/lib/router/router/util/route.reader.d.ts +12 -0
- package/package.json +4 -4
|
@@ -13,7 +13,7 @@ export class DbxActionContextLoggerDirective extends AbstractSubscriptionDirecti
|
|
|
13
13
|
}
|
|
14
14
|
ngOnInit() {
|
|
15
15
|
this.sub = this.source.state$.subscribe((state) => {
|
|
16
|
-
console.log('
|
|
16
|
+
console.log('dbxActionLogger - state: ', state);
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -27,4 +27,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImpor
|
|
|
27
27
|
}], ctorParameters: function () { return [{ type: i1.DbxActionContextStoreSourceInstance, decorators: [{
|
|
28
28
|
type: Host
|
|
29
29
|
}] }]; } });
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aW9uLmxvZ2dlci5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9kYngtY29yZS9zcmMvbGliL2FjdGlvbi9kaXJlY3RpdmUvZGVidWcvYWN0aW9uLmxvZ2dlci5kaXJlY3RpdmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBVSxJQUFJLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDdEUsT0FBTyxFQUFFLG1DQUFtQyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7OztBQUVoRjs7R0FFRztBQUlILE1BQU0sT0FBTywrQkFBZ0MsU0FBUSw2QkFBNkI7SUFDaEYsWUFBb0MsTUFBMkM7UUFDN0UsS0FBSyxFQUFFLENBQUM7UUFEMEIsV0FBTSxHQUFOLE1BQU0sQ0FBcUM7SUFFL0UsQ0FBQztJQUVELFFBQVE7UUFDTixJQUFJLENBQUMsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ2hELE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDbEQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOzs0SEFUVSwrQkFBK0I7Z0hBQS9CLCtCQUErQjsyRkFBL0IsK0JBQStCO2tCQUgzQyxTQUFTO21CQUFDO29CQUNULFFBQVEsRUFBRSw0Q0FBNEM7aUJBQ3ZEOzswQkFFYyxJQUFJIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGlyZWN0aXZlLCBPbkluaXQsIEhvc3QgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFic3RyYWN0U3Vic2NyaXB0aW9uRGlyZWN0aXZlIH0gZnJvbSAnLi4vLi4vLi4vc3Vic2NyaXB0aW9uJztcbmltcG9ydCB7IERieEFjdGlvbkNvbnRleHRTdG9yZVNvdXJjZUluc3RhbmNlIH0gZnJvbSAnLi4vLi4vYWN0aW9uLnN0b3JlLnNvdXJjZSc7XG5cbi8qKlxuICogUHJpbnRzIG91dCB0aGUgY3VycmVudCBzdGF0ZSB0byB0aGUgY29uc29sZS4gVXNlZnVsIGZvciBkZWJ1Z2dpbmcuXG4gKi9cbkBEaXJlY3RpdmUoe1xuICBzZWxlY3RvcjogJ1tkYnhBY3Rpb25Mb2dnZXJdLFtkYnhBY3Rpb25Db250ZXh0TG9nZ2VyXSdcbn0pXG5leHBvcnQgY2xhc3MgRGJ4QWN0aW9uQ29udGV4dExvZ2dlckRpcmVjdGl2ZSBleHRlbmRzIEFic3RyYWN0U3Vic2NyaXB0aW9uRGlyZWN0aXZlIGltcGxlbWVudHMgT25Jbml0IHtcbiAgY29uc3RydWN0b3IoQEhvc3QoKSBwdWJsaWMgcmVhZG9ubHkgc291cmNlOiBEYnhBY3Rpb25Db250ZXh0U3RvcmVTb3VyY2VJbnN0YW5jZSkge1xuICAgIHN1cGVyKCk7XG4gIH1cblxuICBuZ09uSW5pdCgpOiB2b2lkIHtcbiAgICB0aGlzLnN1YiA9IHRoaXMuc291cmNlLnN0YXRlJC5zdWJzY3JpYmUoKHN0YXRlKSA9PiB7XG4gICAgICBjb25zb2xlLmxvZygnZGJ4QWN0aW9uTG9nZ2VyIC0gc3RhdGU6ICcsIHN0YXRlKTtcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -8,7 +8,7 @@ export const DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY = 'uid';
|
|
|
8
8
|
* If not, or
|
|
9
9
|
*/
|
|
10
10
|
export function redirectForUserIdentifierParamHook(input) {
|
|
11
|
-
const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, transitionService, canViewUser } = input;
|
|
11
|
+
const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, priority = 100, transitionService, canViewUser } = input;
|
|
12
12
|
const criteria = typeof input.criteria === 'string' ? { entering: input.criteria } : input.criteria;
|
|
13
13
|
// https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult
|
|
14
14
|
const assertAllowedUid = (transition) => {
|
|
@@ -20,13 +20,13 @@ export function redirectForUserIdentifierParamHook(input) {
|
|
|
20
20
|
return firstValueFrom(authService.userIdentifier$.pipe(first(), switchMap((currentUserId) => {
|
|
21
21
|
let result = of(true);
|
|
22
22
|
let redirectToUid;
|
|
23
|
-
if (!transitionTargetUid || transitionTargetUid ===
|
|
23
|
+
if (!transitionTargetUid || transitionTargetUid === defaultParamValue) {
|
|
24
24
|
// If uid isn't set, default to the current user.
|
|
25
25
|
redirectToUid = of(currentUserId);
|
|
26
26
|
}
|
|
27
27
|
else if (currentUserId !== transitionTargetUid) {
|
|
28
28
|
redirectToUid = canViewUser(transitionTargetUid, authService, injector).pipe(map((x) => {
|
|
29
|
-
if (typeof x === 'boolean') {
|
|
29
|
+
if (x == null || typeof x === 'boolean') {
|
|
30
30
|
return x ? transitionTargetUid : currentUserId;
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
@@ -50,6 +50,6 @@ export function redirectForUserIdentifierParamHook(input) {
|
|
|
50
50
|
})));
|
|
51
51
|
};
|
|
52
52
|
// Register the "requires auth" hook with the TransitionsService
|
|
53
|
-
transitionService.onBefore(criteria, assertAllowedUid, { priority
|
|
53
|
+
transitionService.onBefore(criteria, assertAllowedUid, { priority });
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"uid.hook.js","sourceRoot":"","sources":["../../../../../../../../packages/dbx-core/src/lib/router/auth/hook/uid.hook.ts"],"names":[],"mappings":"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","sourcesContent":["import { AuthUserIdentifier } from '../../../auth/auth.user';\nimport { DbxAuthService } from '../../../auth/service/auth.service';\nimport { TransitionService, TransitionHookFn, Transition, HookResult, StateService, HookMatchCriteria } from '@uirouter/core';\nimport { Maybe } from '@dereekb/util';\nimport { map, first, filter, switchMap, firstValueFrom, Observable, of } from 'rxjs';\nimport { Injector } from '@angular/core';\n\nexport const DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE = '0';\nexport const DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY = 'uid';\n\nexport interface RedirectForUserIdentifierParamHookInput {\n  /**\n   * Route parameter to use.\n   *\n   * Defaults to \"uid\"\n   */\n  readonly uidParam?: string;\n  /**\n   * The default param value to check against.\n   *\n   * Defaults to 0.\n   */\n  readonly defaultParamValue?: string;\n  /**\n   * Criteria or route to watch and intercept.\n   */\n  readonly criteria: HookMatchCriteria | string;\n  readonly transitionService: TransitionService;\n  /**\n   * Whether or not the current user can view the target user.\n   *\n   * Can return another users identifier, or true to allow access, or false/null/undefined to deny access.\n   */\n  readonly canViewUser: (targetUid: AuthUserIdentifier, authService: DbxAuthService, injector: Injector) => Observable<Maybe<boolean | AuthUserIdentifier>>;\n  /**\n   * Hook priority\n   */\n  readonly priority?: number;\n}\n\n/**\n * This hook asserts the user is allowed to view a route with a user identifier as a parameter.\n *\n * If not, or\n */\nexport function redirectForUserIdentifierParamHook(input: RedirectForUserIdentifierParamHookInput): void {\n  const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, priority = 100, transitionService, canViewUser } = input;\n  const criteria: HookMatchCriteria = typeof input.criteria === 'string' ? { entering: input.criteria } : input.criteria;\n\n  // https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult\n  const assertAllowedUid: TransitionHookFn = (transition: Transition): HookResult => {\n    const $state: StateService = transition.router.stateService;\n    const injector = transition.injector();\n    const authService: DbxAuthService = injector.get(DbxAuthService);\n    const params = transition.params();\n\n    const transitionTargetUid: Maybe<string> = params[uidParam];\n\n    return firstValueFrom(\n      authService.userIdentifier$.pipe(\n        first(),\n        switchMap((currentUserId) => {\n          let result: Observable<HookResult> = of(true);\n\n          let redirectToUid: Maybe<Observable<Maybe<AuthUserIdentifier>>>;\n\n          if (!transitionTargetUid || transitionTargetUid === defaultParamValue) {\n            // If uid isn't set, default to the current user.\n            redirectToUid = of(currentUserId);\n          } else if (currentUserId !== transitionTargetUid) {\n            redirectToUid = canViewUser(transitionTargetUid, authService, injector).pipe(\n              map((x) => {\n                if (x == null || typeof x === 'boolean') {\n                  return x ? transitionTargetUid : currentUserId;\n                } else {\n                  return x;\n                }\n              })\n            );\n          }\n\n          if (redirectToUid != null) {\n            result = redirectToUid.pipe(\n              first(),\n              map((targetUid) => {\n                if (targetUid !== transitionTargetUid) {\n                  const target = transition.targetState();\n                  const state = target.state();\n                  return $state.target(state, { ...params, uid: targetUid }, { location: true });\n                } else {\n                  return true;\n                }\n              })\n            );\n          }\n\n          return result;\n        })\n      )\n    ) as HookResult;\n  };\n\n  // Register the \"requires auth\" hook with the TransitionsService\n  transitionService.onBefore(criteria, assertAllowedUid, { priority });\n}\n"]}
|
|
@@ -3,4 +3,4 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export class DbxRouterService {
|
|
5
5
|
}
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9kYngtY29yZS9zcmMvbGliL3JvdXRlci9yb3V0ZXIvc2VydmljZS9yb3V0ZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQTs7R0FFRztBQUNILE1BQU0sT0FBZ0IsZ0JBQWdCO0NBOENyQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9ic2VydmFibGVPclZhbHVlIH0gZnJvbSAnQGRlcmVla2Ivcnhqcyc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rLCBTZWd1ZVJlZlJhd1NlZ3VlUGFyYW1zIH0gZnJvbSAnLi4vLi4vc2VndWUnO1xuXG4vKipcbiAqIFJvdXRlciBzZXJ2aWNlIGRlZmluaXRpb24gdGhhdCBjYW4gcm91dGUgdGhlIGFwcCBhbmQgcHJvdmlkZSByb3V0aW5nIGRldGFpbHMuXG4gKi9cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBEYnhSb3V0ZXJTZXJ2aWNlIHtcbiAgLyoqXG4gICAqIFBhcmFtcyBvZiB0aGUgY3VycmVudCBzdWNjZXNzZnVsbHkgbG9hZGVkIHJvdXRlLlxuICAgKi9cbiAgYWJzdHJhY3QgcmVhZG9ubHkgcGFyYW1zJDogT2JzZXJ2YWJsZTxTZWd1ZVJlZlJhd1NlZ3VlUGFyYW1zPjtcblxuICAvKipcbiAgICogTmF2aWdhdGVzIHRvIHRoZSB0YXJnZXQgU2VndWVSZWYuXG4gICAqXG4gICAqIEBwYXJhbSBzZWd1ZVJlZlxuICAgKi9cbiAgYWJzdHJhY3QgZ28oc2VndWVSZWY6IE9ic2VydmFibGVPclZhbHVlPFNlZ3VlUmVmT3JTZWd1ZVJlZlJvdXRlckxpbms+KTogUHJvbWlzZTxib29sZWFuPjtcblxuICAvKipcbiAgICogTmF2aWdhdGVzIHRvIHRoZSBjdXJyZW50IHVybCB3aXRoIHVwZGF0ZWQgcGFyYW1ldGVycy4gV2lsbCBiZSBtZXJnZWQgd2l0aCB0aGUgZXhpc3RpbmcgcGFyYW1ldGVycy5cbiAgICpcbiAgICogVGhlIG5ldyBzdGF0ZSB3aWxsIHJlcGxhY2UgdGhlIGN1cnJlbnQgc3RhdGUgaW4gdGhlIGhpc3RvcnkuXG4gICAqXG4gICAqIEBwYXJhbSBzZWd1ZVJlZlxuICAgKi9cbiAgYWJzdHJhY3QgdXBkYXRlUGFyYW1zKHBhcmFtczogT2JzZXJ2YWJsZU9yVmFsdWU8U2VndWVSZWZSYXdTZWd1ZVBhcmFtcz4pOiBQcm9taXNlPGJvb2xlYW4+O1xuXG4gIC8qKlxuICAgKiBSZXR1cm5zIHRydWUgaWYgdGhlIGlucHV0IHNlZ3VlIHJlZiBpcyBjb25zaWRlcmVkIGFjdGl2ZS5cbiAgICpcbiAgICogQHBhcmFtIHNlZ3VlUmVmXG4gICAqL1xuICBhYnN0cmFjdCBpc0FjdGl2ZShzZWd1ZVJlZjogU2VndWVSZWZPclNlZ3VlUmVmUm91dGVyTGluayk6IGJvb2xlYW47XG5cbiAgLyoqXG4gICAqIFJldHVybnMgdHJ1ZSBpZiB0aGUgaW5wdXQgc2VndWUgcmVmIGlzIGNvbnNpZGVyZWQgYWN0aXZlIGV4YWN0bHkuXG4gICAqXG4gICAqIEBwYXJhbSBzZWd1ZVJlZlxuICAgKi9cbiAgYWJzdHJhY3QgaXNBY3RpdmVFeGFjdGx5KHNlZ3VlUmVmOiBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rKTogYm9vbGVhbjtcblxuICAvKipcbiAgICogQ29tcGFyZXMgdGhlIHR3byByZWZzIGZvciBwcmVjaXNpb24gZm9yIGEgY2VydGFpbiByb3V0ZS5cbiAgICpcbiAgICogRm9yIGV4YW1wbGUsIGlmIHRoZSBwYXJlbnQgcm91dGUgaXMgaW5wdXQgd2l0aCBhIGNoaWxkIHJvdXRlLCB0aGUgY2hpbGQgcm91dGUgaXNcbiAgICogY29uc2lkZXJlZCBtb3JlIHByZWNpc2UuXG4gICAqXG4gICAqIEBwYXJhbSBhXG4gICAqIEBwYXJhbSBiXG4gICAqL1xuICBhYnN0cmFjdCBjb21wYXJlUHJlY2lzaW9uKGE6IFNlZ3VlUmVmT3JTZWd1ZVJlZlJvdXRlckxpbmssIGI6IFNlZ3VlUmVmT3JTZWd1ZVJlZlJvdXRlckxpbmspOiBudW1iZXI7XG59XG4iXX0=
|
|
@@ -3,7 +3,7 @@ import { defaultForwardFunctionFactory } from '@dereekb/util';
|
|
|
3
3
|
import { SubscriptionObject, switchMapToDefault, filterMaybe } from '@dereekb/rxjs';
|
|
4
4
|
const DEFAULT_REDIRECT_INSTANCE_FORWARD_FACTORY = defaultForwardFunctionFactory((value) => of(value == null));
|
|
5
5
|
/**
|
|
6
|
-
* Utility class used in conjuction with a DbxRouteParamReaderInstance to redirect when the default param
|
|
6
|
+
* Utility class used in conjuction with a DbxRouteParamReaderInstance to redirect when the default param is not valid.
|
|
7
7
|
*/
|
|
8
8
|
export class DbxRouteParamDefaultRedirectInstance {
|
|
9
9
|
constructor(instance) {
|
|
@@ -59,4 +59,4 @@ export class DbxRouteParamDefaultRedirectInstance {
|
|
|
59
59
|
this._useDefaultFilter.next(useValueFilter);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2RieC1jb3JlL3NyYy9saWIvcm91dGVyL3JvdXRlci91dGlsL3JvdXRlLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU3RCxPQUFPLEVBQWtFLDZCQUE2QixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzlILE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxrQkFBa0IsRUFBb0MsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXRILE1BQU0seUNBQXlDLEdBQUcsNkJBQTZCLENBQTRDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUM7QUFFeko7O0dBRUc7QUFDSCxNQUFNLE9BQU8sb0NBQW9DO0lBSy9DLFlBQXFCLFFBQXdDO1FBQXhDLGFBQVEsR0FBUixRQUFRLENBQWdDO1FBSnJELGFBQVEsR0FBRyxJQUFJLGVBQWUsQ0FBVSxJQUFJLENBQUMsQ0FBQztRQUM5QyxzQkFBaUIsR0FBRyxJQUFJLGVBQWUsQ0FBNkMsU0FBUyxDQUFDLENBQUM7UUFDL0YsU0FBSSxHQUFHLElBQUksa0JBQWtCLEVBQUUsQ0FBQztJQUV3QixDQUFDO0lBRWpFLElBQUk7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsUUFBUTthQUNuQyxJQUFJLENBQ0gsU0FBUyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUU7WUFDcEIsSUFBSSxPQUFPLEVBQUU7Z0JBQ1gsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQ25DLGtCQUFrQixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7b0JBQ3hELE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFFLHlDQUFnSCxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDdEwsQ0FBQyxDQUFDLEVBQ0YsV0FBVyxFQUFFLEVBQUUscUNBQXFDO2dCQUNwRCxTQUFTLENBQUMsQ0FBQyxZQUFZLEVBQUUsRUFBRTtvQkFDekIsT0FBTyxJQUFJLENBQUMsd0JBQXdCLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ3JELENBQUMsQ0FBQyxDQUNILENBQUM7YUFDSDtpQkFBTTtnQkFDTCxPQUFPLEtBQUssQ0FBQzthQUNkO1FBQ0gsQ0FBQyxDQUFDLENBQ0g7YUFDQSxTQUFTLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBRUQsT0FBTztRQUNMLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDekIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUVTLHdCQUF3QixDQUFDLEtBQWU7UUFDaEQsSUFBSSxLQUFLLElBQUksSUFBSSxFQUFFO1lBQ2pCLHVCQUF1QjtZQUN2QixPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUN0QzthQUFNO1lBQ0wsYUFBYTtZQUNiLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUMvQjtJQUNILENBQUM7SUFFUyxpQkFBaUIsQ0FBQyxLQUFlO1FBQ3pDLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZLENBQUM7WUFDakQsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEtBQUs7U0FDaEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELElBQUksT0FBTztRQUNULE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUM7SUFDN0IsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLE9BQWdCO1FBQzFCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzlCLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxjQUEwRDtRQUM1RSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzlDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgRU1QVFksIHN3aXRjaE1hcCwgb2YgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IERieFJvdXRlUGFyYW1SZWFkZXJJbnN0YW5jZSB9IGZyb20gJy4vcm91dGUucmVhZGVyJztcbmltcG9ydCB7IERlc3Ryb3lhYmxlLCBJbml0aWFsaXplZCwgTWF5YmUsIERlZmF1bHRGb3J3YXJkRnVuY3Rpb25GYWN0b3J5LCBkZWZhdWx0Rm9yd2FyZEZ1bmN0aW9uRmFjdG9yeSB9IGZyb20gJ0BkZXJlZWtiL3V0aWwnO1xuaW1wb3J0IHsgU3Vic2NyaXB0aW9uT2JqZWN0LCBzd2l0Y2hNYXBUb0RlZmF1bHQsIFN3aXRjaE1hcFRvRGVmYXVsdEZpbHRlckZ1bmN0aW9uLCBmaWx0ZXJNYXliZSB9IGZyb20gJ0BkZXJlZWtiL3J4anMnO1xuXG5jb25zdCBERUZBVUxUX1JFRElSRUNUX0lOU1RBTkNFX0ZPUldBUkRfRkFDVE9SWSA9IGRlZmF1bHRGb3J3YXJkRnVuY3Rpb25GYWN0b3J5PFN3aXRjaE1hcFRvRGVmYXVsdEZpbHRlckZ1bmN0aW9uPHVua25vd24+PigodmFsdWUpID0+
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2RieC1jb3JlL3NyYy9saWIvcm91dGVyL3JvdXRlci91dGlsL3JvdXRlLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU3RCxPQUFPLEVBQWtFLDZCQUE2QixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzlILE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxrQkFBa0IsRUFBb0MsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXRILE1BQU0seUNBQXlDLEdBQUcsNkJBQTZCLENBQTRDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUM7QUFFeko7O0dBRUc7QUFDSCxNQUFNLE9BQU8sb0NBQW9DO0lBSy9DLFlBQXFCLFFBQXdDO1FBQXhDLGFBQVEsR0FBUixRQUFRLENBQWdDO1FBSnJELGFBQVEsR0FBRyxJQUFJLGVBQWUsQ0FBVSxJQUFJLENBQUMsQ0FBQztRQUM5QyxzQkFBaUIsR0FBRyxJQUFJLGVBQWUsQ0FBNkMsU0FBUyxDQUFDLENBQUM7UUFDL0YsU0FBSSxHQUFHLElBQUksa0JBQWtCLEVBQUUsQ0FBQztJQUV3QixDQUFDO0lBRWpFLElBQUk7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsUUFBUTthQUNuQyxJQUFJLENBQ0gsU0FBUyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUU7WUFDcEIsSUFBSSxPQUFPLEVBQUU7Z0JBQ1gsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQ25DLGtCQUFrQixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7b0JBQ3hELE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFFLHlDQUFnSCxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDdEwsQ0FBQyxDQUFDLEVBQ0YsV0FBVyxFQUFFLEVBQUUscUNBQXFDO2dCQUNwRCxTQUFTLENBQUMsQ0FBQyxZQUFZLEVBQUUsRUFBRTtvQkFDekIsT0FBTyxJQUFJLENBQUMsd0JBQXdCLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ3JELENBQUMsQ0FBQyxDQUNILENBQUM7YUFDSDtpQkFBTTtnQkFDTCxPQUFPLEtBQUssQ0FBQzthQUNkO1FBQ0gsQ0FBQyxDQUFDLENBQ0g7YUFDQSxTQUFTLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBRUQsT0FBTztRQUNMLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDekIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUVTLHdCQUF3QixDQUFDLEtBQWU7UUFDaEQsSUFBSSxLQUFLLElBQUksSUFBSSxFQUFFO1lBQ2pCLHVCQUF1QjtZQUN2QixPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUN0QzthQUFNO1lBQ0wsYUFBYTtZQUNiLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUMvQjtJQUNILENBQUM7SUFFUyxpQkFBaUIsQ0FBQyxLQUFlO1FBQ3pDLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZLENBQUM7WUFDakQsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEtBQUs7U0FDaEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELElBQUksT0FBTztRQUNULE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUM7SUFDN0IsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLE9BQWdCO1FBQzFCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzlCLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxjQUEwRDtRQUM1RSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzlDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgRU1QVFksIHN3aXRjaE1hcCwgb2YgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IERieFJvdXRlUGFyYW1SZWFkZXJJbnN0YW5jZSB9IGZyb20gJy4vcm91dGUucmVhZGVyJztcbmltcG9ydCB7IERlc3Ryb3lhYmxlLCBJbml0aWFsaXplZCwgTWF5YmUsIERlZmF1bHRGb3J3YXJkRnVuY3Rpb25GYWN0b3J5LCBkZWZhdWx0Rm9yd2FyZEZ1bmN0aW9uRmFjdG9yeSB9IGZyb20gJ0BkZXJlZWtiL3V0aWwnO1xuaW1wb3J0IHsgU3Vic2NyaXB0aW9uT2JqZWN0LCBzd2l0Y2hNYXBUb0RlZmF1bHQsIFN3aXRjaE1hcFRvRGVmYXVsdEZpbHRlckZ1bmN0aW9uLCBmaWx0ZXJNYXliZSB9IGZyb20gJ0BkZXJlZWtiL3J4anMnO1xuXG5jb25zdCBERUZBVUxUX1JFRElSRUNUX0lOU1RBTkNFX0ZPUldBUkRfRkFDVE9SWSA9IGRlZmF1bHRGb3J3YXJkRnVuY3Rpb25GYWN0b3J5PFN3aXRjaE1hcFRvRGVmYXVsdEZpbHRlckZ1bmN0aW9uPHVua25vd24+PigodmFsdWUpID0+IG9mKHZhbHVlID09IG51bGwpKTtcblxuLyoqXG4gKiBVdGlsaXR5IGNsYXNzIHVzZWQgaW4gY29uanVjdGlvbiB3aXRoIGEgRGJ4Um91dGVQYXJhbVJlYWRlckluc3RhbmNlIHRvIHJlZGlyZWN0IHdoZW4gdGhlIGRlZmF1bHQgcGFyYW0gaXMgbm90IHZhbGlkLlxuICovXG5leHBvcnQgY2xhc3MgRGJ4Um91dGVQYXJhbURlZmF1bHRSZWRpcmVjdEluc3RhbmNlPFQ+IGltcGxlbWVudHMgSW5pdGlhbGl6ZWQsIERlc3Ryb3lhYmxlIHtcbiAgcHJpdmF0ZSBfZW5hYmxlZCA9IG5ldyBCZWhhdmlvclN1YmplY3Q8Ym9vbGVhbj4odHJ1ZSk7XG4gIHByaXZhdGUgX3VzZURlZmF1bHRGaWx0ZXIgPSBuZXcgQmVoYXZpb3JTdWJqZWN0PE1heWJlPFN3aXRjaE1hcFRvRGVmYXVsdEZpbHRlckZ1bmN0aW9uPFQ+Pj4odW5kZWZpbmVkKTtcbiAgcHJpdmF0ZSBfc3ViID0gbmV3IFN1YnNjcmlwdGlvbk9iamVjdCgpO1xuXG4gIGNvbnN0cnVjdG9yKHJlYWRvbmx5IGluc3RhbmNlOiBEYnhSb3V0ZVBhcmFtUmVhZGVySW5zdGFuY2U8VD4pIHt9XG5cbiAgaW5pdCgpOiB2b2lkIHtcbiAgICB0aGlzLl9zdWIuc3Vic2NyaXB0aW9uID0gdGhpcy5fZW5hYmxlZFxuICAgICAgLnBpcGUoXG4gICAgICAgIHN3aXRjaE1hcCgoZW5hYmxlZCkgPT4ge1xuICAgICAgICAgIGlmIChlbmFibGVkKSB7XG4gICAgICAgICAgICByZXR1cm4gdGhpcy5pbnN0YW5jZS5wYXJhbVZhbHVlJC5waXBlKFxuICAgICAgICAgICAgICBzd2l0Y2hNYXBUb0RlZmF1bHQodGhpcy5pbnN0YW5jZS5kZWZhdWx0VmFsdWUkLCAodmFsdWUpID0+IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fdXNlRGVmYXVsdEZpbHRlci5waXBlKHN3aXRjaE1hcCgoZm4pID0+IChERUZBVUxUX1JFRElSRUNUX0lOU1RBTkNFX0ZPUldBUkRfRkFDVE9SWSBhcyBEZWZhdWx0Rm9yd2FyZEZ1bmN0aW9uRmFjdG9yeTxTd2l0Y2hNYXBUb0RlZmF1bHRGaWx0ZXJGdW5jdGlvbjxUPj4pKGZuKSh2YWx1ZSkpKTtcbiAgICAgICAgICAgICAgfSksXG4gICAgICAgICAgICAgIGZpbHRlck1heWJlKCksIC8vIGRvIG5vdCByZWRpcmVjdCBvbiBNYXliZU5vdCB2YWx1ZXNcbiAgICAgICAgICAgICAgc3dpdGNoTWFwKChkZWZhdWx0VmFsdWUpID0+IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5yZWRpcmVjdFdpdGhEZWZhdWx0VmFsdWUoZGVmYXVsdFZhbHVlKTtcbiAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgICk7XG4gICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIHJldHVybiBFTVBUWTtcbiAgICAgICAgICB9XG4gICAgICAgIH0pXG4gICAgICApXG4gICAgICAuc3Vic2NyaWJlKCk7XG4gIH1cblxuICBkZXN0cm95KCk6IHZvaWQge1xuICAgIHRoaXMuX2VuYWJsZWQuY29tcGxldGUoKTtcbiAgICB0aGlzLl91c2VEZWZhdWx0RmlsdGVyLmNvbXBsZXRlKCk7XG4gICAgdGhpcy5fc3ViLmRlc3Ryb3koKTtcbiAgfVxuXG4gIHByb3RlY3RlZCByZWRpcmVjdFdpdGhEZWZhdWx0VmFsdWUodmFsdWU6IE1heWJlPFQ+KTogUHJvbWlzZTxib29sZWFuPiB7XG4gICAgaWYgKHZhbHVlICE9IG51bGwpIHtcbiAgICAgIC8vIHBlcmZvcm0gYSBzZWd1ZSBvbmNlXG4gICAgICByZXR1cm4gdGhpcy5yZWRpcmVjdFdpdGhWYWx1ZSh2YWx1ZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIC8vIGRvIG5vdGhpbmdcbiAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUoZmFsc2UpO1xuICAgIH1cbiAgfVxuXG4gIHByb3RlY3RlZCByZWRpcmVjdFdpdGhWYWx1ZSh2YWx1ZTogTWF5YmU8VD4pOiBQcm9taXNlPGJvb2xlYW4+IHtcbiAgICByZXR1cm4gdGhpcy5pbnN0YW5jZS5kYnhSb3V0ZXJTZXJ2aWNlLnVwZGF0ZVBhcmFtcyh7XG4gICAgICBbdGhpcy5pbnN0YW5jZS5wYXJhbUtleV06IHZhbHVlXG4gICAgfSk7XG4gIH1cblxuICBnZXQgZW5hYmxlZCgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gdGhpcy5fZW5hYmxlZC52YWx1ZTtcbiAgfVxuXG4gIHNldCBlbmFibGVkKGVuYWJsZWQ6IGJvb2xlYW4pIHtcbiAgICB0aGlzLl9lbmFibGVkLm5leHQoZW5hYmxlZCk7XG4gIH1cblxuICBzZXRVc2VEZWZhdWx0RmlsdGVyKHVzZVZhbHVlRmlsdGVyOiBNYXliZTxTd2l0Y2hNYXBUb0RlZmF1bHRGaWx0ZXJGdW5jdGlvbjxUPj4pOiB2b2lkIHtcbiAgICB0aGlzLl91c2VEZWZhdWx0RmlsdGVyLm5leHQodXNlVmFsdWVGaWx0ZXIpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { switchMapToDefault, maybeValueFromObservableOrValueGetter } from '@dereekb/rxjs';
|
|
2
|
-
import { BehaviorSubject, combineLatest, distinctUntilChanged, map, shareReplay } from 'rxjs';
|
|
1
|
+
import { switchMapToDefault, maybeValueFromObservableOrValueGetter, asObservableFromGetter } from '@dereekb/rxjs';
|
|
2
|
+
import { BehaviorSubject, combineLatest, distinctUntilChanged, first, map, shareReplay } from 'rxjs';
|
|
3
3
|
/**
|
|
4
4
|
* Utility class used for reading a single value from the DbxRouterService.
|
|
5
5
|
*/
|
|
@@ -20,6 +20,7 @@ export class DbxRouteParamReaderInstance {
|
|
|
20
20
|
}
|
|
21
21
|
destroy() {
|
|
22
22
|
this._paramKey.complete();
|
|
23
|
+
this._defaultValue.complete();
|
|
23
24
|
}
|
|
24
25
|
get paramKey() {
|
|
25
26
|
return this._paramKey.value;
|
|
@@ -30,5 +31,17 @@ export class DbxRouteParamReaderInstance {
|
|
|
30
31
|
setDefaultValue(defaultValue) {
|
|
31
32
|
this._defaultValue.next(defaultValue ?? this.defaultValue);
|
|
32
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Convenience function to set the param value on the router.
|
|
36
|
+
*
|
|
37
|
+
* @param value
|
|
38
|
+
*/
|
|
39
|
+
setParamValue(value) {
|
|
40
|
+
combineLatest([this.paramKey$, asObservableFromGetter(value)])
|
|
41
|
+
.pipe(first())
|
|
42
|
+
.subscribe(([paramKey, value]) => {
|
|
43
|
+
this.dbxRouterService.updateParams({ [paramKey]: value });
|
|
44
|
+
});
|
|
45
|
+
}
|
|
33
46
|
}
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUucmVhZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvZGJ4LWNvcmUvc3JjL2xpYi9yb3V0ZXIvcm91dGVyL3V0aWwvcm91dGUucmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBeUQsa0JBQWtCLEVBQUUscUNBQXFDLEVBQW9DLHNCQUFzQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNNLE9BQU8sRUFBRSxlQUFlLEVBQUUsYUFBYSxFQUFFLG9CQUFvQixFQUFFLEtBQUssRUFBRSxHQUFHLEVBQWMsV0FBVyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBd0NqSDs7R0FFRztBQUNILE1BQU0sT0FBTywyQkFBMkI7SUFtQnRDLFlBQXFCLGdCQUFrQyxFQUFXLGVBQXVCLEVBQVcsWUFBOEM7UUFBN0gscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQUFXLG9CQUFlLEdBQWYsZUFBZSxDQUFRO1FBQVcsaUJBQVksR0FBWixZQUFZLENBQWtDO1FBbEIxSSxjQUFTLEdBQUcsSUFBSSxlQUFlLENBQVMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzdELGNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRSxDQUFDO1FBRTNDLGtCQUFhLEdBQUcsSUFBSSxlQUFlLENBQTJDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVoRyxnQkFBVyxHQUF5QixhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDOUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEVBQUUsRUFBRTtZQUNwQixPQUFRLE1BQU0sQ0FBQyxHQUFHLENBQWMsSUFBSSxTQUFTLENBQUM7UUFDaEQsQ0FBQyxDQUFDLEVBQ0Ysb0JBQW9CLEVBQUUsRUFDdEIsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUNmLENBQUM7UUFFTyxzQkFBaUIsR0FBeUIsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMscUNBQXFDLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMzSCxrQkFBYSxHQUF5QixJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsRUFBRSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRXZILFdBQU0sR0FBeUIsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRStCLENBQUM7SUFFdEosT0FBTztRQUNMLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDMUIsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBRUQsSUFBSSxRQUFRO1FBQ1YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQztJQUM5QixDQUFDO0lBRUQsSUFBSSxRQUFRLENBQUMsUUFBdUI7UUFDbEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsZUFBZSxDQUFDLFlBQTZDO1FBQzNELElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsS0FBc0M7UUFDbEQsYUFBYSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO2FBQzNELElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQzthQUNiLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDL0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUM1RCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9ic2VydmFibGVPclZhbHVlR2V0dGVyLCBNYXliZU9ic2VydmFibGVPclZhbHVlR2V0dGVyLCBzd2l0Y2hNYXBUb0RlZmF1bHQsIG1heWJlVmFsdWVGcm9tT2JzZXJ2YWJsZU9yVmFsdWVHZXR0ZXIsIHZhbHVlRnJvbU9ic2VydmFibGVPclZhbHVlR2V0dGVyLCBhc09ic2VydmFibGVGcm9tR2V0dGVyIH0gZnJvbSAnQGRlcmVla2Ivcnhqcyc7XG5pbXBvcnQgeyBEZXN0cm95YWJsZSwgTWF5YmUgfSBmcm9tICdAZGVyZWVrYi91dGlsJztcbmltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgY29tYmluZUxhdGVzdCwgZGlzdGluY3RVbnRpbENoYW5nZWQsIGZpcnN0LCBtYXAsIE9ic2VydmFibGUsIHNoYXJlUmVwbGF5IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBEYnhSb3V0ZXJTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZS9yb3V0ZXIuc2VydmljZSc7XG5cbi8qKlxuICogSW50ZXJmYWNlIHVzZWQgZm9yIHJlYWRpbmcgYSBzaW5nbGUgdmFsdWUgZnJvbSB0aGUgRGJ4Um91dGVyU2VydmljZS4gU3VwcG9ydHMgYSBkZWZhdWx0IHZhbHVlLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIERieFJvdXRlUGFyYW1SZWFkZXI8VD4ge1xuICAvKipcbiAgICogVGhlIHBhcmFtIHZhbHVlIGFzIHJlYWQgZnJvbSB0aGUgY3VycmVudCByb3V0ZXIgc3RhdGUuXG4gICAqL1xuICByZWFkb25seSBwYXJhbVZhbHVlJDogT2JzZXJ2YWJsZTxNYXliZTxUPj47XG4gIC8qKlxuICAgKiBUaGUgZGVmYXVsdCB2YWx1ZSBvYnNlcnZhYmxlLlxuICAgKi9cbiAgcmVhZG9ubHkgZGVmYXVsdFZhbHVlJDogT2JzZXJ2YWJsZTxNYXliZTxUPj47XG4gIC8qKlxuICAgKiBUaGUgZmluYWwgY29tcHV0ZWQgdmFsdWVcbiAgICovXG4gIHJlYWRvbmx5IHZhbHVlJDogT2JzZXJ2YWJsZTxNYXliZTxUPj47XG5cbiAgLyoqXG4gICAqIFBhcmFtIGtleSBnZXR0ZXIvc2V0dGVycy5cbiAgICovXG4gIGdldCBwYXJhbUtleSgpOiBzdHJpbmc7XG4gIHNldCBwYXJhbUtleShwYXJhbUtleTogTWF5YmU8c3RyaW5nPik7XG5cbiAgLyoqXG4gICAqIFNldHMgdGhlIGRlZmF1bHQgdmFsdWUgc291cmNlLlxuICAgKlxuICAgKiBAcGFyYW0gZGVmYXVsdFZhbHVlXG4gICAqL1xuICBzZXREZWZhdWx0VmFsdWUoZGVmYXVsdFZhbHVlOiBNYXliZU9ic2VydmFibGVPclZhbHVlR2V0dGVyPFQ+KTogdm9pZDtcbiAgLyoqXG4gICAqIFVwZGF0ZXMgdGhlIHZhbHVlIG9uIHRoZSBjdXJyZW50IHJvdXRlIGZvciB0aGUgcGFyYW1LZXkuXG4gICAqXG4gICAqIEBwYXJhbSB2YWx1ZVxuICAgKi9cbiAgc2V0UGFyYW1WYWx1ZSh2YWx1ZTogTWF5YmVPYnNlcnZhYmxlT3JWYWx1ZUdldHRlcjxUPik6IHZvaWQ7XG59XG5cbi8qKlxuICogVXRpbGl0eSBjbGFzcyB1c2VkIGZvciByZWFkaW5nIGEgc2luZ2xlIHZhbHVlIGZyb20gdGhlIERieFJvdXRlclNlcnZpY2UuXG4gKi9cbmV4cG9ydCBjbGFzcyBEYnhSb3V0ZVBhcmFtUmVhZGVySW5zdGFuY2U8VD4gaW1wbGVtZW50cyBEYnhSb3V0ZVBhcmFtUmVhZGVyPFQ+LCBEZXN0cm95YWJsZSB7XG4gIHByaXZhdGUgX3BhcmFtS2V5ID0gbmV3IEJlaGF2aW9yU3ViamVjdDxzdHJpbmc+KHRoaXMuZGVmYXVsdFBhcmFtS2V5KTtcbiAgcmVhZG9ubHkgcGFyYW1LZXkkID0gdGhpcy5fcGFyYW1LZXkuYXNPYnNlcnZhYmxlKCk7XG5cbiAgcHJpdmF0ZSBfZGVmYXVsdFZhbHVlID0gbmV3IEJlaGF2aW9yU3ViamVjdDxNYXliZTxPYnNlcnZhYmxlT3JWYWx1ZUdldHRlcjxNYXliZTxUPj4+Pih0aGlzLmRlZmF1bHRWYWx1ZSk7XG5cbiAgcmVhZG9ubHkgcGFyYW1WYWx1ZSQ6IE9ic2VydmFibGU8TWF5YmU8VD4+ID0gY29tYmluZUxhdGVzdChbdGhpcy5wYXJhbUtleSQsIHRoaXMuZGJ4Um91dGVyU2VydmljZS5wYXJhbXMkXSkucGlwZShcbiAgICBtYXAoKFtrZXksIHBhcmFtc10pID0+IHtcbiAgICAgIHJldHVybiAocGFyYW1zW2tleV0gYXMgTWF5YmU8VD4pID8/IHVuZGVmaW5lZDtcbiAgICB9KSxcbiAgICBkaXN0aW5jdFVudGlsQ2hhbmdlZCgpLFxuICAgIHNoYXJlUmVwbGF5KDEpXG4gICk7XG5cbiAgcmVhZG9ubHkgbmV4dERlZmF1bHRWYWx1ZSQ6IE9ic2VydmFibGU8TWF5YmU8VD4+ID0gdGhpcy5fZGVmYXVsdFZhbHVlLnBpcGUobWF5YmVWYWx1ZUZyb21PYnNlcnZhYmxlT3JWYWx1ZUdldHRlcigpLCBzaGFyZVJlcGxheSgxKSk7XG4gIHJlYWRvbmx5IGRlZmF1bHRWYWx1ZSQ6IE9ic2VydmFibGU8TWF5YmU8VD4+ID0gdGhpcy5fZGVmYXVsdFZhbHVlLnBpcGUobWF5YmVWYWx1ZUZyb21PYnNlcnZhYmxlT3JWYWx1ZUdldHRlcigpLCBzaGFyZVJlcGxheSgxKSk7XG5cbiAgcmVhZG9ubHkgdmFsdWUkOiBPYnNlcnZhYmxlPE1heWJlPFQ+PiA9IHRoaXMucGFyYW1WYWx1ZSQucGlwZShzd2l0Y2hNYXBUb0RlZmF1bHQodGhpcy5kZWZhdWx0VmFsdWUkKSwgc2hhcmVSZXBsYXkoMSkpO1xuXG4gIGNvbnN0cnVjdG9yKHJlYWRvbmx5IGRieFJvdXRlclNlcnZpY2U6IERieFJvdXRlclNlcnZpY2UsIHJlYWRvbmx5IGRlZmF1bHRQYXJhbUtleTogc3RyaW5nLCByZWFkb25seSBkZWZhdWx0VmFsdWU/OiBNYXliZU9ic2VydmFibGVPclZhbHVlR2V0dGVyPFQ+KSB7fVxuXG4gIGRlc3Ryb3koKTogdm9pZCB7XG4gICAgdGhpcy5fcGFyYW1LZXkuY29tcGxldGUoKTtcbiAgICB0aGlzLl9kZWZhdWx0VmFsdWUuY29tcGxldGUoKTtcbiAgfVxuXG4gIGdldCBwYXJhbUtleSgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLl9wYXJhbUtleS52YWx1ZTtcbiAgfVxuXG4gIHNldCBwYXJhbUtleShwYXJhbUtleTogTWF5YmU8c3RyaW5nPikge1xuICAgIHRoaXMuX3BhcmFtS2V5Lm5leHQocGFyYW1LZXkgfHwgdGhpcy5kZWZhdWx0UGFyYW1LZXkpO1xuICB9XG5cbiAgc2V0RGVmYXVsdFZhbHVlKGRlZmF1bHRWYWx1ZTogTWF5YmVPYnNlcnZhYmxlT3JWYWx1ZUdldHRlcjxUPik6IHZvaWQge1xuICAgIHRoaXMuX2RlZmF1bHRWYWx1ZS5uZXh0KGRlZmF1bHRWYWx1ZSA/PyB0aGlzLmRlZmF1bHRWYWx1ZSk7XG4gIH1cblxuICAvKipcbiAgICogQ29udmVuaWVuY2UgZnVuY3Rpb24gdG8gc2V0IHRoZSBwYXJhbSB2YWx1ZSBvbiB0aGUgcm91dGVyLlxuICAgKlxuICAgKiBAcGFyYW0gdmFsdWVcbiAgICovXG4gIHNldFBhcmFtVmFsdWUodmFsdWU6IE1heWJlT2JzZXJ2YWJsZU9yVmFsdWVHZXR0ZXI8VD4pOiB2b2lkIHtcbiAgICBjb21iaW5lTGF0ZXN0KFt0aGlzLnBhcmFtS2V5JCwgYXNPYnNlcnZhYmxlRnJvbUdldHRlcih2YWx1ZSldKVxuICAgICAgLnBpcGUoZmlyc3QoKSlcbiAgICAgIC5zdWJzY3JpYmUoKFtwYXJhbUtleSwgdmFsdWVdKSA9PiB7XG4gICAgICAgIHRoaXMuZGJ4Um91dGVyU2VydmljZS51cGRhdGVQYXJhbXMoeyBbcGFyYW1LZXldOiB2YWx1ZSB9KTtcbiAgICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { Directive, Injectable, forwardRef, Host, Input, Optional, NgModule, InjectionToken, Inject, EventEmitter, Output, LOCALE_ID, Pipe, ViewChild, Injector, ViewContainerRef, Component } from '@angular/core';
|
|
3
3
|
import * as i1$5 from '@dereekb/rxjs';
|
|
4
|
-
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';
|
|
4
|
+
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';
|
|
5
5
|
import * as i1 from 'rxjs';
|
|
6
6
|
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';
|
|
7
7
|
import * as i1$6 from '@dereekb/util';
|
|
@@ -887,7 +887,7 @@ class DbxActionContextLoggerDirective extends AbstractSubscriptionDirective {
|
|
|
887
887
|
}
|
|
888
888
|
ngOnInit() {
|
|
889
889
|
this.sub = this.source.state$.subscribe((state) => {
|
|
890
|
-
console.log('
|
|
890
|
+
console.log('dbxActionLogger - state: ', state);
|
|
891
891
|
});
|
|
892
892
|
}
|
|
893
893
|
}
|
|
@@ -2312,7 +2312,7 @@ const DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY = 'uid';
|
|
|
2312
2312
|
* If not, or
|
|
2313
2313
|
*/
|
|
2314
2314
|
function redirectForUserIdentifierParamHook(input) {
|
|
2315
|
-
const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, transitionService, canViewUser } = input;
|
|
2315
|
+
const { uidParam = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_KEY, defaultParamValue = DEFAULT_REDIRECT_FOR_USER_IDENTIFIER_PARAM_VALUE, priority = 100, transitionService, canViewUser } = input;
|
|
2316
2316
|
const criteria = typeof input.criteria === 'string' ? { entering: input.criteria } : input.criteria;
|
|
2317
2317
|
// https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult
|
|
2318
2318
|
const assertAllowedUid = (transition) => {
|
|
@@ -2324,13 +2324,13 @@ function redirectForUserIdentifierParamHook(input) {
|
|
|
2324
2324
|
return firstValueFrom(authService.userIdentifier$.pipe(first(), switchMap((currentUserId) => {
|
|
2325
2325
|
let result = of(true);
|
|
2326
2326
|
let redirectToUid;
|
|
2327
|
-
if (!transitionTargetUid || transitionTargetUid ===
|
|
2327
|
+
if (!transitionTargetUid || transitionTargetUid === defaultParamValue) {
|
|
2328
2328
|
// If uid isn't set, default to the current user.
|
|
2329
2329
|
redirectToUid = of(currentUserId);
|
|
2330
2330
|
}
|
|
2331
2331
|
else if (currentUserId !== transitionTargetUid) {
|
|
2332
2332
|
redirectToUid = canViewUser(transitionTargetUid, authService, injector).pipe(map((x) => {
|
|
2333
|
-
if (typeof x === 'boolean') {
|
|
2333
|
+
if (x == null || typeof x === 'boolean') {
|
|
2334
2334
|
return x ? transitionTargetUid : currentUserId;
|
|
2335
2335
|
}
|
|
2336
2336
|
else {
|
|
@@ -2354,7 +2354,7 @@ function redirectForUserIdentifierParamHook(input) {
|
|
|
2354
2354
|
})));
|
|
2355
2355
|
};
|
|
2356
2356
|
// Register the "requires auth" hook with the TransitionsService
|
|
2357
|
-
transitionService.onBefore(criteria, assertAllowedUid, { priority
|
|
2357
|
+
transitionService.onBefore(criteria, assertAllowedUid, { priority });
|
|
2358
2358
|
}
|
|
2359
2359
|
|
|
2360
2360
|
var DbxRouterTransitionEventType;
|
|
@@ -2695,6 +2695,7 @@ class DbxRouteParamReaderInstance {
|
|
|
2695
2695
|
}
|
|
2696
2696
|
destroy() {
|
|
2697
2697
|
this._paramKey.complete();
|
|
2698
|
+
this._defaultValue.complete();
|
|
2698
2699
|
}
|
|
2699
2700
|
get paramKey() {
|
|
2700
2701
|
return this._paramKey.value;
|
|
@@ -2705,11 +2706,23 @@ class DbxRouteParamReaderInstance {
|
|
|
2705
2706
|
setDefaultValue(defaultValue) {
|
|
2706
2707
|
this._defaultValue.next(defaultValue !== null && defaultValue !== void 0 ? defaultValue : this.defaultValue);
|
|
2707
2708
|
}
|
|
2709
|
+
/**
|
|
2710
|
+
* Convenience function to set the param value on the router.
|
|
2711
|
+
*
|
|
2712
|
+
* @param value
|
|
2713
|
+
*/
|
|
2714
|
+
setParamValue(value) {
|
|
2715
|
+
combineLatest([this.paramKey$, asObservableFromGetter(value)])
|
|
2716
|
+
.pipe(first())
|
|
2717
|
+
.subscribe(([paramKey, value]) => {
|
|
2718
|
+
this.dbxRouterService.updateParams({ [paramKey]: value });
|
|
2719
|
+
});
|
|
2720
|
+
}
|
|
2708
2721
|
}
|
|
2709
2722
|
|
|
2710
2723
|
const DEFAULT_REDIRECT_INSTANCE_FORWARD_FACTORY = defaultForwardFunctionFactory((value) => of(value == null));
|
|
2711
2724
|
/**
|
|
2712
|
-
* Utility class used in conjuction with a DbxRouteParamReaderInstance to redirect when the default param
|
|
2725
|
+
* Utility class used in conjuction with a DbxRouteParamReaderInstance to redirect when the default param is not valid.
|
|
2713
2726
|
*/
|
|
2714
2727
|
class DbxRouteParamDefaultRedirectInstance {
|
|
2715
2728
|
constructor(instance) {
|