ontimize-web-ngx 15.3.0 → 15.3.1

package/fesm2020/ontimize-web-ngx.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, EventEmitter, Directive, Host, Self, Optional, Input, HostListener, forwardRef, Output, Injectable, Injector, Component, ContentChildren, ChangeDetectorRef, Pipe, NgModule, ViewChild, ElementRef, ViewEncapsulation, ViewContainerRef, Inject, NgZone, HostBinding, ViewChildren, ChangeDetectionStrategy, inject, CUSTOM_ELEMENTS_SCHEMA, TemplateRef, SkipSelf, isDevMode, ContentChild, Renderer2, APP_INITIALIZER } from '@angular/core';
 import moment from 'moment';
-import { isObservable, from, of, Subscription, Subject, Observable, timer, combineLatest, BehaviorSubject, ReplaySubject, merge, fromEvent, map as map$1 } from 'rxjs';
+import { isObservable, from, of, Subscription, Subject, Observable, timer, combineLatest, BehaviorSubject, ReplaySubject, concatMap, delay, merge, fromEvent, map as map$1 } from 'rxjs';
 export { Observable, Subject } from 'rxjs';
 import * as i1$7 from '@angular/common/http';
 import { HttpClient, HttpHeaders, HttpRequest, HttpEventType, HttpErrorResponse, HttpClientModule } from '@angular/common/http';
@@ -13119,7 +13119,7 @@ class OTableComponentStateService extends AbstractComponentStateService {
     }
     getSortState() {
         const sortColumns = [];
-        this.component.sort.getSortColumns().forEach(sortData => {
+        this.component.sort?.getSortColumns().forEach(sortData => {
             sortColumns.push(sortData.id + Codes.COLUMNS_ALIAS_SEPARATOR + sortData.direction);
         });
         return {
@@ -15187,6 +15187,7 @@ class OFormLayoutTabGroupComponent {
         this.tabsModificationsCache = [];
         this.dialogService = injector.get(DialogService);
         this.router = this.injector.get(Router);
+        this.actRoute = this.injector.get(ActivatedRoute);
     }
     get state() {
         return this.formLayoutManager.state;
@@ -15423,38 +15424,20 @@ class OFormLayoutTabGroupComponent {
         this.state.tabsData = this.state.tabsData.filter(tabData => !tabData.insertionMode);
         if (this.state.tabsData.length >= 1 && (this.state.tabsData[0].url || '').length > 0) {
             this.showLoading.next(true);
-            const extras = {};
-            extras[Codes.QUERY_PARAMS] = this.state.tabsData[0].queryParams;
-            extras[Codes.QUERY_PARAMS][Codes.INSERTION_MODE] = `${this.state.tabsData[0].insertionMode}`;
-            if (this.formLayoutManager) {
-                this.formLayoutManager.setAsActiveFormLayoutManager();
-            }
-            this.router.navigate([this.state.tabsData[0].url], extras).then(() => {
-                if (this.data[0] && this.data[0].component && this.state.tabsData.length > 1) {
-                    setTimeout(() => {
-                        this.createTabsFromState();
-                    }, 0);
-                }
-                else {
-                    this.showLoading.next(false);
-                }
-            });
-        }
-    }
-    createTabsFromState() {
-        const tabComponent = this.data[0].component;
-        const stateTabsData = this.state.tabsData.slice(1);
-        if (stateTabsData.length > 0) {
-            stateTabsData.forEach((tabData) => {
-                setTimeout(() => {
-                    const newDetailData = this.createDetailComponent(tabComponent, tabData);
-                    this.data.push(newDetailData);
-                }, 0);
+            const zone = this.injector.get(NgZone);
+            from(this.state.tabsData).pipe(concatMap(tab => of(tab).pipe(delay(100)))).subscribe((tab) => {
+                const extras = {};
+                extras['relativeTo'] = this.actRoute;
+                extras[Codes.QUERY_PARAMS] = tab.queryParams;
+                extras[Codes.QUERY_PARAMS][Codes.INSERTION_MODE] = tab.insertionMode;
+                if (this.formLayoutManager) {
+                    this.formLayoutManager.setAsActiveFormLayoutManager();
+                }
+                zone.run(() => this.router.navigate([tab.url], extras)
+                    .then(() => this.showLoading.next(false))
+                    .catch(() => this.showLoading.next(true)));
             });
         }
-        else {
-            this.showLoading.next(false);
-        }
     }
     createDetailComponent(component, paramsObj) {
         const newDetailComp = {
@@ -32333,7 +32316,7 @@ class OTableComponent extends AbstractOServiceComponent {
             }
             ;
             if (Util.isDefined(oTableGlobalConfig.showChartsOnDemandOption)) {
-                this.showReportOnDemandOption = oTableGlobalConfig.showChartsOnDemandOption;
+                this.showChartsOnDemandOption = oTableGlobalConfig.showChartsOnDemandOption;
             }
             ;
             if (Util.isDefined(oTableGlobalConfig.showReportOnDemandOption)) {