@osovitny/anatoly 3.16.57 → 3.16.58
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.
|
@@ -18,8 +18,7 @@ import { NgModule, Optional, SkipSelf } from '@angular/core';
|
|
|
18
18
|
import { CommonModule } from '@angular/common';
|
|
19
19
|
import { RouterModule } from '@angular/router';
|
|
20
20
|
import { ToastrModule } from 'ngx-toastr';
|
|
21
|
-
//
|
|
22
|
-
//localization
|
|
21
|
+
//Localization
|
|
23
22
|
import { LocalizationSettingsModule } from './localization/settings.module';
|
|
24
23
|
import { LocalizationModule } from './localization/localization.module';
|
|
25
24
|
//Services
|
|
@@ -93,4 +92,4 @@ export class AnatolyCoreModule {
|
|
|
93
92
|
LocalizationModule], exports: [RouterModule,
|
|
94
93
|
LocalizationSettingsModule,
|
|
95
94
|
LocalizationModule] }); })();
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29yZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvY29yZS9jb3JlLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7RUFjRTtBQUVGLE1BQU07QUFDTixPQUFPLEVBQVksUUFBUSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTFDLGNBQWM7QUFDZCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM1RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUV4RSxVQUFVO0FBQ1YsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDaEUsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzVELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRTVGLG1CQUFtQjtBQUNuQixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFM0QseUJBQXlCO0FBQ3pCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLCtDQUErQyxDQUFDOzs7QUFFcEYsTUFBTSxDQUFDLElBQUksZ0JBQTBCLENBQUM7QUF5QnRDLE1BQU0sT0FBTyxpQkFBaUI7SUFDUjtJQUFwQixZQUFvQixRQUFrQixFQUEwQixZQUErQjtRQUEzRSxhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQ3BDLGdCQUFnQixHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDbkMsQ0FBQzsyRUFIVSxpQkFBaUI7NERBQWpCLGlCQUFpQjtpRUFWakI7WUFDVCx1QkFBdUI7WUFDdkIsc0JBQXNCO1lBQ3RCLGNBQWM7WUFDZCxtQkFBbUI7WUFDbkIscUJBQXFCO1lBQ3JCLGNBQWM7WUFDZCxtQkFBbUI7U0FDcEIsWUFuQkMsWUFBWTtZQUNaLFlBQVk7WUFDWixZQUFZLENBQUMsT0FBTyxFQUFFO1lBQ3RCLDBCQUEwQjtZQUMxQixrQkFBa0IsRUFHbEIsWUFBWTtZQUNaLDBCQUEwQjtZQUMxQixrQkFBa0I7O3VGQVlULGlCQUFpQjtjQXZCN0IsUUFBUTtlQUFDO2dCQUNSLE9BQU8sRUFBRTtvQkFDUCxZQUFZO29CQUNaLFlBQVk7b0JBQ1osWUFBWSxDQUFDLE9BQU8sRUFBRTtvQkFDdEIsMEJBQTBCO29CQUMxQixrQkFBa0I7aUJBQ25CO2dCQUNELE9BQU8sRUFBRTtvQkFDUCxZQUFZO29CQUNaLDBCQUEwQjtvQkFDMUIsa0JBQWtCO2lCQUNuQjtnQkFDRCxTQUFTLEVBQUU7b0JBQ1QsdUJBQXVCO29CQUN2QixzQkFBc0I7b0JBQ3RCLGNBQWM7b0JBQ2QsbUJBQW1CO29CQUNuQixxQkFBcUI7b0JBQ3JCLGNBQWM7b0JBQ2QsbUJBQW1CO2lCQUNwQjthQUNGOztzQkFFMEMsUUFBUTs7c0JBQUksUUFBUTs7d0ZBRGxELGlCQUFpQixjQXJCMUIsWUFBWTtRQUNaLFlBQVksbUJBRVosMEJBQTBCO1FBQzFCLGtCQUFrQixhQUdsQixZQUFZO1FBQ1osMEJBQTBCO1FBQzFCLGtCQUFrQiIsInNvdXJjZXNDb250ZW50IjpbIi8qXHJcbjxmaWxlPlxyXG4gIFByb2plY3Q6XHJcbiAgICBAb3Nvdml0bnkvYW5hdG9seVxyXG5cclxuICBBdXRob3JzOlxyXG4gICAgVmFkaW0gT3Nvdml0bnkgdmFkaW1Ab3Nvdml0bnkuY29tXHJcbiAgICBBbmF0b2x5IE9zb3ZpdG55IGFuYXRvbHlAb3Nvdml0bnkuY29tXHJcblxyXG4gIENyZWF0ZWQ6XHJcbiAgICAyOSBKdW5lIDIwMjBcclxuXHJcbiAgQ29weXJpZ2h0IChjKSAyMDE2LTIwMjIgT3Nvdml0bnkgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxyXG48L2ZpbGU+XHJcbiovXHJcblxyXG4vL05vZGVcclxuaW1wb3J0IHsgSW5qZWN0b3IsIE5nTW9kdWxlLCBPcHRpb25hbCwgU2tpcFNlbGYgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgQ29tbW9uTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcclxuaW1wb3J0IHsgUm91dGVyTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgVG9hc3RyTW9kdWxlIH0gZnJvbSAnbmd4LXRvYXN0cic7XHJcblxyXG4vL0xvY2FsaXphdGlvblxyXG5pbXBvcnQgeyBMb2NhbGl6YXRpb25TZXR0aW5nc01vZHVsZSB9IGZyb20gJy4vbG9jYWxpemF0aW9uL3NldHRpbmdzLm1vZHVsZSc7XHJcbmltcG9ydCB7IExvY2FsaXphdGlvbk1vZHVsZSB9IGZyb20gJy4vbG9jYWxpemF0aW9uL2xvY2FsaXphdGlvbi5tb2R1bGUnO1xyXG5cclxuLy9TZXJ2aWNlc1xyXG5pbXBvcnQgeyBEaWdpdGFsTWFya2V0aW5nU2VydmljZSB9IGZyb20gJy4vc2VydmljZXMvZG0uc2VydmljZSc7XHJcbmltcG9ydCB7IEdvb2dsZUFuYWx5dGljc1NlcnZpY2UgfSBmcm9tICcuL3NlcnZpY2VzL2dvb2dsZS1hbmFseXRpY3Muc2VydmljZSc7XHJcbmltcG9ydCB7IExvYWRpbmdTZXJ2aWNlIH0gZnJvbSAnLi9zZXJ2aWNlcy9sb2FkaW5nLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBMb2NhbFN0b3JhZ2VTZXJ2aWNlLCBTZXNzaW9uU3RvcmFnZVNlcnZpY2UgfSBmcm9tICcuL3NlcnZpY2VzL3dlYi1zdG9yYWdlLnNlcnZpY2UnO1xyXG5cclxuLy9TZXJ2aWNlczogbG9nZ2luZ1xyXG5pbXBvcnQgeyBMb2dnaW5nU2VydmljZSB9IGZyb20gJy4vbG9nZ2luZy9sb2dnaW5nLnNlcnZpY2UnO1xyXG5cclxuLy9TZXJ2aWNlczogbm90aWZpY2F0aW9uc1xyXG5pbXBvcnQgeyBOb3RpZmljYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi9ub3RpZmljYXRpb25zL3NlcnZpY2VzL25vdGlmaWNhdGlvbi1zZXJ2aWNlJztcclxuXHJcbmV4cG9ydCBsZXQgSW5qZWN0b3JJbnN0YW5jZTogSW5qZWN0b3I7XHJcblxyXG5ATmdNb2R1bGUoe1xyXG4gIGltcG9ydHM6IFtcclxuICAgIENvbW1vbk1vZHVsZSxcclxuICAgIFJvdXRlck1vZHVsZSxcclxuICAgIFRvYXN0ck1vZHVsZS5mb3JSb290KCksXHJcbiAgICBMb2NhbGl6YXRpb25TZXR0aW5nc01vZHVsZSxcclxuICAgIExvY2FsaXphdGlvbk1vZHVsZVxyXG4gIF0sXHJcbiAgZXhwb3J0czogW1xyXG4gICAgUm91dGVyTW9kdWxlLFxyXG4gICAgTG9jYWxpemF0aW9uU2V0dGluZ3NNb2R1bGUsXHJcbiAgICBMb2NhbGl6YXRpb25Nb2R1bGVcclxuICBdLFxyXG4gIHByb3ZpZGVyczogW1xyXG4gICAgRGlnaXRhbE1hcmtldGluZ1NlcnZpY2UsXHJcbiAgICBHb29nbGVBbmFseXRpY3NTZXJ2aWNlLFxyXG4gICAgTG9hZGluZ1NlcnZpY2UsXHJcbiAgICBMb2NhbFN0b3JhZ2VTZXJ2aWNlLFxyXG4gICAgU2Vzc2lvblN0b3JhZ2VTZXJ2aWNlLFxyXG4gICAgTG9nZ2luZ1NlcnZpY2UsXHJcbiAgICBOb3RpZmljYXRpb25TZXJ2aWNlXHJcbiAgXVxyXG59KVxyXG5leHBvcnQgY2xhc3MgQW5hdG9seUNvcmVNb2R1bGUge1xyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgaW5qZWN0b3I6IEluamVjdG9yLCBAT3B0aW9uYWwoKSBAU2tpcFNlbGYoKSBwYXJlbnRNb2R1bGU6IEFuYXRvbHlDb3JlTW9kdWxlKSB7XHJcbiAgICBJbmplY3Rvckluc3RhbmNlID0gdGhpcy5pbmplY3RvcjtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -55,12 +55,11 @@ export class StarterServiceBase extends ApiServiceBase {
|
|
|
55
55
|
let requiredItems$ = this.appContext.loadRequiredItems();
|
|
56
56
|
//Tasks to execute
|
|
57
57
|
let parallelTasks = [];
|
|
58
|
+
let tasks$ = null;
|
|
58
59
|
if (jsonFiles$)
|
|
59
60
|
parallelTasks.push(jsonFiles$);
|
|
60
61
|
if (requiredItems$)
|
|
61
62
|
parallelTasks.push(requiredItems$);
|
|
62
|
-
let parallelTasks$ = merge(...parallelTasks);
|
|
63
|
-
let tasks$ = forkJoin([applicationStarting$, parallelTasks$]);
|
|
64
63
|
/*
|
|
65
64
|
VadimOS:
|
|
66
65
|
concat is NOT wokring here, no idea why. Just executing first task
|
|
@@ -69,6 +68,13 @@ export class StarterServiceBase extends ApiServiceBase {
|
|
|
69
68
|
https://github.com/ReactiveX/rxjs/issues/2427
|
|
70
69
|
https://github.com/ReactiveX/rxjs/issues/2188
|
|
71
70
|
*/
|
|
71
|
+
if (parallelTasks.length > 0) {
|
|
72
|
+
let parallelTasks$ = merge(...parallelTasks);
|
|
73
|
+
tasks$ = forkJoin([applicationStarting$, parallelTasks$]);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
tasks$ = applicationStarting$;
|
|
77
|
+
}
|
|
72
78
|
//Log
|
|
73
79
|
let stopwatch = new Stopwatch("ensureApplicationStarted");
|
|
74
80
|
stopwatch.start();
|
|
@@ -79,4 +85,4 @@ export class StarterServiceBase extends ApiServiceBase {
|
|
|
79
85
|
}));
|
|
80
86
|
}
|
|
81
87
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5hdG9seS9zcmMvbGliL2NvcmUvc2VydmljZXMvc3RhcnRlci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7OztFQWNFO0FBSUYsT0FBTyxFQUFjLEVBQUUsRUFBVSxRQUFRLEVBQUUsS0FBSyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9ELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVyQyxLQUFLO0FBQ0wsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUdyRCxNQUFNLE9BQWdCLGtCQUFtQixTQUFRLGNBQWM7SUFDdkM7SUFBNEI7SUFBbEQsWUFBc0IsSUFBZ0IsRUFBWSxVQUE4QjtRQUM5RSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFEUSxTQUFJLEdBQUosSUFBSSxDQUFZO1FBQVksZUFBVSxHQUFWLFVBQVUsQ0FBb0I7UUFFOUUsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7SUFDeEIsQ0FBQztJQUVPLG1CQUFtQjtRQUN6QixJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUN0QyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ3ZDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQzlCLE9BQU8sRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQ3BCO1FBRUQsS0FBSztRQUNMLElBQUksU0FBUyxHQUFHLElBQUksU0FBUyxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFDckQsU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRWxCLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxhQUFhLENBQUM7UUFDNUMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFNLHFCQUFxQixDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMxRCxLQUFLO1lBQ0wsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2pCLFNBQVMsQ0FBQywwQkFBMEIsRUFBRSxDQUFDO1lBRXZDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0lBRUQsd0JBQXdCO1FBQ3RCLHlCQUF5QjtRQUN6QixJQUFJLG9CQUFvQixHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBRXRELG9CQUFvQjtRQUNwQixJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLHFCQUFxQixFQUFFLENBQUM7UUFFekQsdUNBQXVDO1FBQ3ZDLElBQUksY0FBYyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztRQUV6RCxrQkFBa0I7UUFDbEIsSUFBSSxhQUFhLEdBQUcsRUFBRSxDQUFDO1FBQ3ZCLElBQUksTUFBTSxHQUFvQixJQUFJLENBQUM7UUFFbkMsSUFBSSxVQUFVO1lBQUUsYUFBYSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUMvQyxJQUFJLGNBQWM7WUFBRSxhQUFhLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBRXZEOzs7Ozs7O1VBT0U7UUFDRixJQUFJLGFBQWEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQzVCLElBQUksY0FBYyxHQUFHLEtBQUssQ0FBQyxHQUFHLGFBQWEsQ0FBQyxDQUFDO1lBQzdDLE1BQU0sR0FBRyxRQUFRLENBQUMsQ0FBQyxvQkFBb0IsRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO1NBQzNEO2FBQ0k7WUFDSCxNQUFNLEdBQUcsb0JBQW9CLENBQUM7U0FDL0I7UUFFRCxLQUFLO1FBQ0wsSUFBSSxTQUFTLEdBQUcsSUFBSSxTQUFTLENBQUMsMEJBQTBCLENBQUMsQ0FBQztRQUMxRCxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFbEIsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUU7WUFDeEIsS0FBSztZQUNMLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNqQixTQUFTLENBQUMsMEJBQTBCLEVBQUUsQ0FBQztRQUN6QyxDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiLypcclxuPGZpbGU+XHJcbiAgUHJvamVjdDpcclxuICAgIEBvc292aXRueS9hbmF0b2x5XHJcblxyXG4gIEF1dGhvcnM6XHJcbiAgICBWYWRpbSBPc292aXRueSB2YWRpbUBvc292aXRueS5jb21cclxuICAgIEFuYXRvbHkgT3Nvdml0bnkgYW5hdG9seUBvc292aXRueS5jb21cclxuXHJcbiAgQ3JlYXRlZDpcclxuICAgIDE1IE5vdiAyMDIzXHJcblxyXG4gIENvcHlyaWdodCAoYykgMjAxNi0yMDIyIE9zb3ZpdG55IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC5cclxuPC9maWxlPlxyXG4qL1xyXG5cclxuLy9Ob2RlXHJcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mLCBjb25jYXQsIGZvcmtKb2luLCBtZXJnZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XHJcblxyXG4vL0FwcFxyXG5pbXBvcnQgeyBBcGlVcmwgfSBmcm9tICcuLi9jb25zdHMvc2V0dGluZ3MnO1xyXG5pbXBvcnQgeyBBcGlTZXJ2aWNlQmFzZSB9IGZyb20gJy4uLy4uL2RhdGEvYmFzZS9hcGkuc2VydmljZSc7XHJcbmltcG9ydCB7IFV0aWxzIH0gZnJvbSAnLi4vdXRpbHMnO1xyXG5pbXBvcnQgeyBTdG9wd2F0Y2ggfSBmcm9tICcuLi9wZXJmb3JtYW5jZS9zdG9wd2F0Y2gnO1xyXG5pbXBvcnQgeyBJQXBwQ29udGV4dFNlcnZpY2UgfSBmcm9tICcuLi9tb2RlbHMvYXBwY29udGV4dC5zZXJ2aWNlJztcclxuXHJcbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBTdGFydGVyU2VydmljZUJhc2UgZXh0ZW5kcyBBcGlTZXJ2aWNlQmFzZSB7XHJcbiAgY29uc3RydWN0b3IocHJvdGVjdGVkIGh0dHA6IEh0dHBDbGllbnQsIHByb3RlY3RlZCBhcHBDb250ZXh0OiBJQXBwQ29udGV4dFNlcnZpY2UpIHtcclxuICAgIHN1cGVyKGh0dHApO1xyXG4gICAgdGhpcy5iYXNlVXJsID0gQXBpVXJsO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBhcHBsaWNhdGlvblN0YXJ0aW5nKCk6IE9ic2VydmFibGU8YW55PiB7XHJcbiAgICBsZXQgY29udGV4dCA9IHRoaXMuYXBwQ29udGV4dC5jdXJyZW50O1xyXG4gICAgaWYgKCFVdGlscy5pc09iamVjdE51bGxPckVtcHR5KGNvbnRleHQpKSB7XHJcbiAgICAgIHRoaXMuYXBwQ29udGV4dC5pbml0KGNvbnRleHQpO1xyXG4gICAgICByZXR1cm4gb2YoY29udGV4dCk7XHJcbiAgICB9XHJcblxyXG4gICAgLy9Mb2dcclxuICAgIGxldCBzdG9wd2F0Y2ggPSBuZXcgU3RvcHdhdGNoKFwiYXBwbGljYXRpb25TdGFydGluZ1wiKTtcclxuICAgIHN0b3B3YXRjaC5zdGFydCgpO1xyXG5cclxuICAgIHRoaXMuYmFzZVVybCA9IGAke3RoaXMuYmFzZVVybH0vYXBwQ29udGV4dGA7XHJcbiAgICByZXR1cm4gdGhpcy5nZXQ8YW55PignYXBwbGljYXRpb25TdGFydGluZycpLnBpcGUobWFwKGRhdGEgPT4ge1xyXG4gICAgICAvL0xvZ1xyXG4gICAgICBzdG9wd2F0Y2guc3RvcCgpO1xyXG4gICAgICBzdG9wd2F0Y2gucHJpbnRFbGFwc2VkQXNNaWxsaXNlY29uZHMoKTtcclxuXHJcbiAgICAgIHRoaXMuYXBwQ29udGV4dC5pbml0KGRhdGEpO1xyXG4gICAgfSkpO1xyXG4gIH1cclxuXHJcbiAgZW5zdXJlQXBwbGljYXRpb25TdGFydGVkKCk6IE9ic2VydmFibGU8YW55PiB7XHJcbiAgICAvLzEuIEFwcGxpY2F0aW9uIFN0YXJ0aW5nXHJcbiAgICBsZXQgYXBwbGljYXRpb25TdGFydGluZyQgPSB0aGlzLmFwcGxpY2F0aW9uU3RhcnRpbmcoKTtcclxuXHJcbiAgICAvLzIuIExvYWQganNvbiBmaWxlc1xyXG4gICAgbGV0IGpzb25GaWxlcyQgPSB0aGlzLmFwcENvbnRleHQubG9hZFJlcXVpcmVkSnNvbkZpbGVzKCk7XHJcblxyXG4gICAgLy8zLiBMb2FkIHJlcXVpcmVkIGl0ZW1zLCBsaWtlIHNldHRpbmdzXHJcbiAgICBsZXQgcmVxdWlyZWRJdGVtcyQgPSB0aGlzLmFwcENvbnRleHQubG9hZFJlcXVpcmVkSXRlbXMoKTtcclxuXHJcbiAgICAvL1Rhc2tzIHRvIGV4ZWN1dGVcclxuICAgIGxldCBwYXJhbGxlbFRhc2tzID0gW107XHJcbiAgICBsZXQgdGFza3MkOiBPYnNlcnZhYmxlPGFueT4gPSBudWxsO1xyXG5cclxuICAgIGlmIChqc29uRmlsZXMkKSBwYXJhbGxlbFRhc2tzLnB1c2goanNvbkZpbGVzJCk7XHJcbiAgICBpZiAocmVxdWlyZWRJdGVtcyQpIHBhcmFsbGVsVGFza3MucHVzaChyZXF1aXJlZEl0ZW1zJCk7XHJcblxyXG4gICAgLypcclxuICAgICAgVmFkaW1PUzpcclxuICAgICAgY29uY2F0IGlzIE5PVCB3b2tyaW5nIGhlcmUsIG5vIGlkZWEgd2h5LiBKdXN0IGV4ZWN1dGluZyBmaXJzdCB0YXNrXHJcbiAgICAgIGxldCB0YXNrcyQgPSBjb25jYXQoYXBwbGljYXRpb25TdGFydGluZyQsIHBhcmFsbGVsVGFza3MkKTtcclxuXHJcbiAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS9SZWFjdGl2ZVgvcnhqcy9pc3N1ZXMvMjQyN1xyXG4gICAgICBodHRwczovL2dpdGh1Yi5jb20vUmVhY3RpdmVYL3J4anMvaXNzdWVzLzIxODhcclxuICAgICovXHJcbiAgICBpZiAocGFyYWxsZWxUYXNrcy5sZW5ndGggPiAwKSB7XHJcbiAgICAgIGxldCBwYXJhbGxlbFRhc2tzJCA9IG1lcmdlKC4uLnBhcmFsbGVsVGFza3MpO1xyXG4gICAgICB0YXNrcyQgPSBmb3JrSm9pbihbYXBwbGljYXRpb25TdGFydGluZyQsIHBhcmFsbGVsVGFza3MkXSk7XHJcbiAgICB9XHJcbiAgICBlbHNlIHtcclxuICAgICAgdGFza3MkID0gYXBwbGljYXRpb25TdGFydGluZyQ7XHJcbiAgICB9XHJcblxyXG4gICAgLy9Mb2dcclxuICAgIGxldCBzdG9wd2F0Y2ggPSBuZXcgU3RvcHdhdGNoKFwiZW5zdXJlQXBwbGljYXRpb25TdGFydGVkXCIpO1xyXG4gICAgc3RvcHdhdGNoLnN0YXJ0KCk7XHJcblxyXG4gICAgcmV0dXJuIHRhc2tzJC5waXBlKG1hcCgoKSA9PiB7XHJcbiAgICAgICAgLy9Mb2dcclxuICAgICAgICBzdG9wd2F0Y2guc3RvcCgpO1xyXG4gICAgICAgIHN0b3B3YXRjaC5wcmludEVsYXBzZWRBc01pbGxpc2Vjb25kcygpO1xyXG4gICAgICB9KVxyXG4gICAgKTtcclxuICB9XHJcbn1cclxuXHJcbiJdfQ==
|
|
@@ -2634,12 +2634,11 @@ class StarterServiceBase extends ApiServiceBase {
|
|
|
2634
2634
|
let requiredItems$ = this.appContext.loadRequiredItems();
|
|
2635
2635
|
//Tasks to execute
|
|
2636
2636
|
let parallelTasks = [];
|
|
2637
|
+
let tasks$ = null;
|
|
2637
2638
|
if (jsonFiles$)
|
|
2638
2639
|
parallelTasks.push(jsonFiles$);
|
|
2639
2640
|
if (requiredItems$)
|
|
2640
2641
|
parallelTasks.push(requiredItems$);
|
|
2641
|
-
let parallelTasks$ = merge(...parallelTasks);
|
|
2642
|
-
let tasks$ = forkJoin([applicationStarting$, parallelTasks$]);
|
|
2643
2642
|
/*
|
|
2644
2643
|
VadimOS:
|
|
2645
2644
|
concat is NOT wokring here, no idea why. Just executing first task
|
|
@@ -2648,6 +2647,13 @@ class StarterServiceBase extends ApiServiceBase {
|
|
|
2648
2647
|
https://github.com/ReactiveX/rxjs/issues/2427
|
|
2649
2648
|
https://github.com/ReactiveX/rxjs/issues/2188
|
|
2650
2649
|
*/
|
|
2650
|
+
if (parallelTasks.length > 0) {
|
|
2651
|
+
let parallelTasks$ = merge(...parallelTasks);
|
|
2652
|
+
tasks$ = forkJoin([applicationStarting$, parallelTasks$]);
|
|
2653
|
+
}
|
|
2654
|
+
else {
|
|
2655
|
+
tasks$ = applicationStarting$;
|
|
2656
|
+
}
|
|
2651
2657
|
//Log
|
|
2652
2658
|
let stopwatch = new Stopwatch("ensureApplicationStarted");
|
|
2653
2659
|
stopwatch.start();
|