Browse Source

UI: Add show always time window in telemetry show in widgets

pull/14511/head
Vladyslav_Prykhodko 10 months ago
parent
commit
4d9648e665
  1. 1
      ui-ngx/src/app/core/services/dashboard-utils.service.ts
  2. 13
      ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts

1
ui-ngx/src/app/core/services/dashboard-utils.service.ts

@ -358,7 +358,6 @@ export class DashboardUtilsService {
if (!widgetHasTimewindow || widget.config.useDashboardTimewindow) {
delete widget.config.displayTimewindow;
delete widget.config.timewindow;
delete widget.config.timewindowStyle;
if (!widgetHasTimewindow) {
delete widget.config.useDashboardTimewindow;

13
ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts

@ -76,7 +76,6 @@ import { AliasController } from '@core/api/alias-controller';
import { EntityAlias, EntityAliases } from '@shared/models/alias.models';
import { UtilsService } from '@core/services/utils.service';
import { DashboardUtilsService } from '@core/services/dashboard-utils.service';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { WidgetService } from '@core/http/widget.service';
import { toWidgetInfo } from '../../models/widget-component.models';
import { EntityService } from '@core/http/entity.service';
@ -89,6 +88,8 @@ import { Filters } from '@shared/models/query/query.models';
import { hidePageSizePixelValue } from '@shared/models/constants';
import { DeleteTimeseriesPanelComponent } from '@home/components/attribute/delete-timeseries-panel.component';
import { FormBuilder } from '@angular/forms';
import { AggregationType, defaultTimewindow } from '@shared/models/time/time.models';
import { TimeService } from '@core/services/time.service';
@Component({
@ -201,7 +202,8 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
private zone: NgZone,
private cd: ChangeDetectorRef,
private elementRef: ElementRef,
private fb: FormBuilder) {
private fb: FormBuilder,
private timeService: TimeService) {
super(store);
this.dirtyValue = !this.activeValue;
const sortOrder: SortOrder = { property: 'key', direction: Direction.ASC };
@ -568,7 +570,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
this.widgetsLoaded = false;
this.widgetService.getBundleWidgetTypes(widgetsBundle.id.id).subscribe(
(widgetTypes) => {
widgetTypes = widgetTypes.sort((a, b) => {
widgetTypes = widgetTypes.filter(widget => !widget.deprecated).sort((a, b) => {
let result = widgetType[b.descriptor.type].localeCompare(widgetType[a.descriptor.type]);
if (result === 0) {
result = b.createdTime - a.createdTime;
@ -592,6 +594,11 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
};
widget.config.title = widgetInfo.widgetName;
widget.config.datasources = [this.widgetDatasource];
if (widget.type === widgetType.timeseries && widget.config.useDashboardTimewindow) {
widget.config.useDashboardTimewindow = false;
widget.config.timewindow = defaultTimewindow(this.timeService);
widget.config.timewindow.aggregation.type = AggregationType.NONE;
}
if ((this.attributeScope === LatestTelemetry.LATEST_TELEMETRY && widgetInfo.type !== widgetType.rpc) ||
widgetInfo.type === widgetType.latest) {
const length = this.widgetsListCache.push([widget]);

Loading…
Cancel
Save