From 24446376bcd5e96b98906d58c2ac30980ba183b6 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Wed, 15 Sep 2021 11:07:51 +0300 Subject: [PATCH] UI: Fixed not updating data in Timeseries table in full screen mode --- .../lib/timeseries-table-widget.component.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts index 3f36769baf..94efa03663 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts @@ -19,7 +19,6 @@ import { Component, ElementRef, Input, - NgZone, OnInit, QueryList, ViewChild, @@ -59,7 +58,8 @@ import { getCellStyleInfo, getRowStyleInfo, RowStyleInfo, - TableWidgetDataKeySettings, TableWidgetSettings + TableWidgetDataKeySettings, + TableWidgetSettings } from '@home/components/widget/lib/table-widget.models'; import { Overlay } from '@angular/cdk/overlay'; import { SubscriptionEntityInfo } from '@core/api/widget-api.models'; @@ -151,7 +151,6 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI constructor(protected store: Store, private elementRef: ElementRef, - private ngZone: NgZone, private overlay: Overlay, private viewContainerRef: ViewContainerRef, private utils: UtilsService, @@ -199,6 +198,7 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI public onDataUpdated() { this.updateCurrentSourceData(); this.clearCache(); + this.ctx.detectChanges(); } private initialize() { @@ -291,7 +291,7 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI if (this.actionCellDescriptors.length) { source.displayedColumns.push('actions'); } - const tsDatasource = new TimeseriesDatasource(source, this.hideEmptyLines, this.dateFormatFilter, this.datePipe, this.ngZone); + const tsDatasource = new TimeseriesDatasource(source, this.hideEmptyLines, this.dateFormatFilter, this.datePipe); tsDatasource.dataUpdated(this.data); this.sources.push(source); } @@ -574,8 +574,7 @@ class TimeseriesDatasource implements DataSource { private source: TimeseriesTableSource, private hideEmptyLines: boolean, private dateFormatFilter: string, - private datePipe: DatePipe, - private ngZone: NgZone + private datePipe: DatePipe ) { this.source.timeseriesDatasource = this; } @@ -598,10 +597,8 @@ class TimeseriesDatasource implements DataSource { catchError(() => of(emptyPageData())), ).subscribe( (pageData) => { - this.ngZone.run(() => { - this.rowsSubject.next(pageData.data); - this.pageDataSubject.next(pageData); - }); + this.rowsSubject.next(pageData.data); + this.pageDataSubject.next(pageData); } ); }