@dereekb/dbx-core 9.3.3 → 9.4.0
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.
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { combineLatest, firstValueFrom } from 'rxjs';
|
|
1
|
+
import { map, combineLatest, firstValueFrom } from 'rxjs';
|
|
2
2
|
import { asObservable, filterMaybe } from '@dereekb/rxjs';
|
|
3
3
|
import { asSegueRef } from '../../../segue';
|
|
4
4
|
import { DbxRouterTransitionEventType } from '../../transition/transition';
|
|
5
5
|
import { ActivatedRoute, NavigationEnd, NavigationStart, Router } from '@angular/router';
|
|
6
6
|
import { Injectable } from '@angular/core';
|
|
7
7
|
import { isArray } from 'class-validator';
|
|
8
|
-
import { map } from 'rxjs/operators';
|
|
9
8
|
import { KeyValueTypleValueFilter, mergeObjects } from '@dereekb/util';
|
|
10
9
|
import * as i0 from "@angular/core";
|
|
11
10
|
import * as i1 from "@angular/router";
|
|
@@ -76,4 +75,4 @@ DbxAngularRouterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.
|
|
|
76
75
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxAngularRouterService, decorators: [{
|
|
77
76
|
type: Injectable
|
|
78
77
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i1.ActivatedRoute }]; } });
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5ndWxhci5yb3V0ZXIuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2RieC1jb3JlL3NyYy9saWIvcm91dGVyL3JvdXRlci9wcm92aWRlci9hbmd1bGFyL2FuZ3VsYXIucm91dGVyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBYyxhQUFhLEVBQUUsY0FBYyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLGVBQWUsQ0FBQztBQUU3RSxPQUFPLEVBQUUsVUFBVSxFQUFrRSxNQUFNLGdCQUFnQixDQUFDO0FBQzVHLE9BQU8sRUFBNEIsNEJBQTRCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRyxPQUFPLEVBQUUsY0FBYyxFQUE2QixhQUFhLEVBQW9CLGVBQWUsRUFBRSxNQUFNLEVBQVcsTUFBTSxpQkFBaUIsQ0FBQztBQUMvSSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEVBQUUsd0JBQXdCLEVBQVMsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFDOzs7QUFFOUU7O0dBRUc7QUFFSCxNQUFNLE9BQU8sdUJBQXVCO0lBc0JsQyxZQUFxQixNQUFjLEVBQVcsY0FBOEI7UUFBdkQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFXLG1CQUFjLEdBQWQsY0FBYyxDQUFnQjtRQXJCbkUsWUFBTyxHQUF1QyxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQztRQUV6RSxpQkFBWSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDN0MsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDUixJQUFJLEtBQXNDLENBQUM7WUFFM0MsSUFBSSxDQUFDLFlBQVksZUFBZSxFQUFFO2dCQUNoQyxLQUFLLEdBQUc7b0JBQ04sSUFBSSxFQUFFLDRCQUE0QixDQUFDLEtBQUs7aUJBQ3pDLENBQUM7YUFDSDtpQkFBTSxJQUFJLENBQUMsWUFBWSxhQUFhLEVBQUU7Z0JBQ3JDLEtBQUssR0FBRztvQkFDTixJQUFJLEVBQUUsNEJBQTRCLENBQUMsT0FBTztpQkFDM0MsQ0FBQzthQUNIO1lBRUQsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixXQUFXLEVBQUUsQ0FDZCxDQUFDO0lBRTZFLENBQUM7SUFFaEYsRUFBRSxDQUFDLEtBQW9HO1FBQ3JHLE1BQU0sUUFBUSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNyQyxPQUFPLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxhQUFhLEVBQUUsRUFBRTtZQUNyRCxNQUFNLFFBQVEsR0FBRyxVQUFVLENBQUMsYUFBYSxDQUFDLENBQUM7WUFDM0MsTUFBTSxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQztZQUV6QixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtnQkFDaEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFnQixFQUFFO29CQUM1QyxHQUFHLFFBQVEsQ0FBQyxVQUFVO29CQUN0QixXQUFXLEVBQUUsUUFBUSxDQUFDLFNBQVM7aUJBQ2hDLENBQUMsQ0FBQzthQUNKO2lCQUFNO2dCQUNMLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsR0FBdUIsRUFBRTtvQkFDeEQsR0FBRyxRQUFRLENBQUMsVUFBVTtpQkFDdkIsQ0FBQyxDQUFDO2FBQ0o7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxZQUFZLENBQUMsV0FBc0Q7UUFDakUsTUFBTSxXQUFXLEdBQTJGLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxFQUFFLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNyTCxHQUFHLENBQUMsQ0FBQyxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFO1lBQzlCLE1BQU0sU0FBUyxHQUFHLFlBQVksQ0FBQyxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsRUFBRSx3QkFBd0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM1RixNQUFNLFFBQVEsR0FBMkQ7Z0JBQ3ZFLEdBQUcsRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLFlBQVk7Z0JBQ3JDLFNBQVM7Z0JBQ1QsVUFBVSxFQUFFO29CQUNWLFVBQVUsRUFBRSxJQUFJO2lCQUNqQjthQUNGLENBQUM7WUFFRixPQUFPLFFBQVEsQ0FBQztRQUNsQixDQUFDLENBQUMsQ0FDSCxDQUFDO1FBRUYsT0FBTyxJQUFJLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzlCLENBQUM7SUFFRCxRQUFRLENBQUMsUUFBc0M7UUFDN0MsT0FBTyxLQUFLLENBQUMsQ0FBQyxRQUFRO0lBQ3hCLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxDQUErQixFQUFFLENBQStCO1FBQy9FLE9BQU8sQ0FBQyxDQUFDLENBQUMsUUFBUTtJQUNwQixDQUFDOztvSEFwRVUsdUJBQXVCO3dIQUF2Qix1QkFBdUI7MkZBQXZCLHVCQUF1QjtrQkFEbkMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IG1hcCwgT2JzZXJ2YWJsZSwgY29tYmluZUxhdGVzdCwgZmlyc3RWYWx1ZUZyb20gfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGFzT2JzZXJ2YWJsZSwgZmlsdGVyTWF5YmUsIE9ic2VydmFibGVPclZhbHVlIH0gZnJvbSAnQGRlcmVla2Ivcnhqcyc7XG5pbXBvcnQgeyBEYnhSb3V0ZXJTZXJ2aWNlLCBEYnhSb3V0ZXJUcmFuc2l0aW9uU2VydmljZSB9IGZyb20gJy4uLy4uL3NlcnZpY2UnO1xuaW1wb3J0IHsgYXNTZWd1ZVJlZiwgU2VndWVSZWYsIFNlZ3VlUmVmT3JTZWd1ZVJlZlJvdXRlckxpbmssIFNlZ3VlUmVmUmF3U2VndWVQYXJhbXMgfSBmcm9tICcuLi8uLi8uLi9zZWd1ZSc7XG5pbXBvcnQgeyBEYnhSb3V0ZXJUcmFuc2l0aW9uRXZlbnQsIERieFJvdXRlclRyYW5zaXRpb25FdmVudFR5cGUgfSBmcm9tICcuLi8uLi90cmFuc2l0aW9uL3RyYW5zaXRpb24nO1xuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGUsIE5hdmlnYXRpb25CZWhhdmlvck9wdGlvbnMsIE5hdmlnYXRpb25FbmQsIE5hdmlnYXRpb25FeHRyYXMsIE5hdmlnYXRpb25TdGFydCwgUm91dGVyLCBVcmxUcmVlIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGlzQXJyYXkgfSBmcm9tICdjbGFzcy12YWxpZGF0b3InO1xuaW1wb3J0IHsgS2V5VmFsdWVUeXBsZVZhbHVlRmlsdGVyLCBNYXliZSwgbWVyZ2VPYmplY3RzIH0gZnJvbSAnQGRlcmVla2IvdXRpbCc7XG5cbi8qKlxuICogQW5ndWxhclJvdXRlciBpbXBsZW1lbnRhdGlvbiBvZiBEYnhSb3V0ZXJTZXJ2aWNlIGFuZCBEYnhSb3V0ZXJUcmFuc2l0aW9uU2VydmljZS5cbiAqL1xuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIERieEFuZ3VsYXJSb3V0ZXJTZXJ2aWNlIGltcGxlbWVudHMgRGJ4Um91dGVyU2VydmljZSwgRGJ4Um91dGVyVHJhbnNpdGlvblNlcnZpY2Uge1xuICByZWFkb25seSBwYXJhbXMkOiBPYnNlcnZhYmxlPFNlZ3VlUmVmUmF3U2VndWVQYXJhbXM+ID0gdGhpcy5hY3RpdmF0ZWRSb3V0ZS5wYXJhbXM7XG5cbiAgcmVhZG9ubHkgdHJhbnNpdGlvbnMkID0gdGhpcy5yb3V0ZXIuZXZlbnRzLnBpcGUoXG4gICAgbWFwKCh4KSA9PiB7XG4gICAgICBsZXQgZXZlbnQ6IE1heWJlPERieFJvdXRlclRyYW5zaXRpb25FdmVudD47XG5cbiAgICAgIGlmICh4IGluc3RhbmNlb2YgTmF2aWdhdGlvblN0YXJ0KSB7XG4gICAgICAgIGV2ZW50ID0ge1xuICAgICAgICAgIHR5cGU6IERieFJvdXRlclRyYW5zaXRpb25FdmVudFR5cGUuU1RBUlRcbiAgICAgICAgfTtcbiAgICAgIH0gZWxzZSBpZiAoeCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQpIHtcbiAgICAgICAgZXZlbnQgPSB7XG4gICAgICAgICAgdHlwZTogRGJ4Um91dGVyVHJhbnNpdGlvbkV2ZW50VHlwZS5TVUNDRVNTXG4gICAgICAgIH07XG4gICAgICB9XG5cbiAgICAgIHJldHVybiBldmVudDtcbiAgICB9KSxcbiAgICBmaWx0ZXJNYXliZSgpXG4gICk7XG5cbiAgY29uc3RydWN0b3IocmVhZG9ubHkgcm91dGVyOiBSb3V0ZXIsIHJlYWRvbmx5IGFjdGl2YXRlZFJvdXRlOiBBY3RpdmF0ZWRSb3V0ZSkge31cblxuICBnbyhpbnB1dDogT2JzZXJ2YWJsZU9yVmFsdWU8U2VndWVSZWZPclNlZ3VlUmVmUm91dGVyTGluazxOYXZpZ2F0aW9uRXh0cmFzIHwgTmF2aWdhdGlvbkJlaGF2aW9yT3B0aW9ucz4+KTogUHJvbWlzZTxib29sZWFuPiB7XG4gICAgY29uc3QgaW5wdXRPYnMgPSBhc09ic2VydmFibGUoaW5wdXQpO1xuICAgIHJldHVybiBmaXJzdFZhbHVlRnJvbShpbnB1dE9icykudGhlbigoaW5wdXRTZWd1ZVJlZikgPT4ge1xuICAgICAgY29uc3Qgc2VndWVSZWYgPSBhc1NlZ3VlUmVmKGlucHV0U2VndWVSZWYpO1xuICAgICAgY29uc3QgcmVmID0gc2VndWVSZWYucmVmO1xuXG4gICAgICBpZiAoaXNBcnJheShyZWYpKSB7XG4gICAgICAgIHJldHVybiB0aGlzLnJvdXRlci5uYXZpZ2F0ZShyZWYgYXMgdW5rbm93bltdLCB7XG4gICAgICAgICAgLi4uc2VndWVSZWYucmVmT3B0aW9ucyxcbiAgICAgICAgICBxdWVyeVBhcmFtczogc2VndWVSZWYucmVmUGFyYW1zXG4gICAgICAgIH0pO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHRoaXMucm91dGVyLm5hdmlnYXRlQnlVcmwocmVmIGFzIHN0cmluZyB8IFVybFRyZWUsIHtcbiAgICAgICAgICAuLi5zZWd1ZVJlZi5yZWZPcHRpb25zXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgdXBkYXRlUGFyYW1zKGlucHV0UGFyYW1zOiBPYnNlcnZhYmxlT3JWYWx1ZTxTZWd1ZVJlZlJhd1NlZ3VlUGFyYW1zPik6IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgIGNvbnN0IHNlZ3VlVXBkYXRlOiBPYnNlcnZhYmxlPFNlZ3VlUmVmT3JTZWd1ZVJlZlJvdXRlckxpbms8TmF2aWdhdGlvbkV4dHJhcyB8IE5hdmlnYXRpb25CZWhhdmlvck9wdGlvbnM+PiA9IGNvbWJpbmVMYXRlc3QoW3RoaXMuYWN0aXZhdGVkUm91dGUucGFyYW1zLCBhc09ic2VydmFibGUoaW5wdXRQYXJhbXMpXSkucGlwZShcbiAgICAgIG1hcCgoW2N1cnJlbnRQYXJhbXMsIHBhcmFtc10pID0+IHtcbiAgICAgICAgY29uc3QgcmVmUGFyYW1zID0gbWVyZ2VPYmplY3RzKFtjdXJyZW50UGFyYW1zLCBwYXJhbXNdLCBLZXlWYWx1ZVR5cGxlVmFsdWVGaWx0ZXIuVU5ERUZJTkVEKTtcbiAgICAgICAgY29uc3Qgc2VndWVSZWY6IFNlZ3VlUmVmPE5hdmlnYXRpb25FeHRyYXMgfCBOYXZpZ2F0aW9uQmVoYXZpb3JPcHRpb25zPiA9IHtcbiAgICAgICAgICByZWY6IHRoaXMuYWN0aXZhdGVkUm91dGUucGF0aEZyb21Sb290LFxuICAgICAgICAgIHJlZlBhcmFtcyxcbiAgICAgICAgICByZWZPcHRpb25zOiB7XG4gICAgICAgICAgICByZXBsYWNlVXJsOiB0cnVlXG4gICAgICAgICAgfVxuICAgICAgICB9O1xuXG4gICAgICAgIHJldHVybiBzZWd1ZVJlZjtcbiAgICAgIH0pXG4gICAgKTtcblxuICAgIHJldHVybiB0aGlzLmdvKHNlZ3VlVXBkYXRlKTtcbiAgfVxuXG4gIGlzQWN0aXZlKHNlZ3VlUmVmOiBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIGZhbHNlOyAvLyBUT0RPIVxuICB9XG5cbiAgY29tcGFyZVByZWNpc2lvbihhOiBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rLCBiOiBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rKTogbnVtYmVyIHtcbiAgICByZXR1cm4gMDsgLy8gVE9ETyFcbiAgfVxufVxuIl19
|
|
@@ -15,7 +15,6 @@ import { createAction, props, createReducer, on, combineReducers, createFeatureS
|
|
|
15
15
|
import * as i1$1 from '@angular/router';
|
|
16
16
|
import { NavigationStart, NavigationEnd } from '@angular/router';
|
|
17
17
|
import { isArray } from 'class-validator';
|
|
18
|
-
import { map as map$1 } from 'rxjs/operators';
|
|
19
18
|
import * as i1$2 from '@uirouter/core';
|
|
20
19
|
import { addMinutes, isValid, isPast, formatDistance, formatDistanceToNow, startOfDay, isSameDay } from 'date-fns';
|
|
21
20
|
import { toJsDate, formatToTimeString, unixTimeNumberForNow, timeHasExpired } from '@dereekb/date';
|
|
@@ -2240,7 +2239,7 @@ class DbxAngularRouterService {
|
|
|
2240
2239
|
this.router = router;
|
|
2241
2240
|
this.activatedRoute = activatedRoute;
|
|
2242
2241
|
this.params$ = this.activatedRoute.params;
|
|
2243
|
-
this.transitions$ = this.router.events.pipe(map
|
|
2242
|
+
this.transitions$ = this.router.events.pipe(map((x) => {
|
|
2244
2243
|
let event;
|
|
2245
2244
|
if (x instanceof NavigationStart) {
|
|
2246
2245
|
event = {
|
|
@@ -2269,7 +2268,7 @@ class DbxAngularRouterService {
|
|
|
2269
2268
|
});
|
|
2270
2269
|
}
|
|
2271
2270
|
updateParams(inputParams) {
|
|
2272
|
-
const segueUpdate = combineLatest([this.activatedRoute.params, asObservable(inputParams)]).pipe(map
|
|
2271
|
+
const segueUpdate = combineLatest([this.activatedRoute.params, asObservable(inputParams)]).pipe(map(([currentParams, params]) => {
|
|
2273
2272
|
const refParams = mergeObjects([currentParams, params], KeyValueTypleValueFilter.UNDEFINED);
|
|
2274
2273
|
const segueRef = {
|
|
2275
2274
|
ref: this.activatedRoute.pathFromRoot,
|