diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts b/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts index 99e6ec66b6..0e21abe0f1 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts @@ -27,7 +27,7 @@ import { CanvasDigitalGauge, CanvasDigitalGaugeOptions } from '@home/components/ import { DatePipe } from '@angular/common'; import { IWidgetSubscription } from '@core/api/widget-api.models'; import { Subscription } from 'rxjs'; -import { ColorProcessor, createdValueSubscription, ValueSourceType } from '@shared/models/widget-settings.models'; +import { ColorProcessor, createValueSubscription, ValueSourceType } from '@shared/models/widget-settings.models'; import GenericOptions = CanvasGauges.GenericOptions; // @dynamic @@ -205,7 +205,7 @@ export class TbCanvasDigitalGauge { this.localSettings.ticks = this.localSettings.ticksValue .map(tick => tick.type === ValueSourceType.constant && isFinite(tick.value) ? tick.value : null); - createdValueSubscription( + createValueSubscription( this.ctx, this.localSettings.ticksValue, this.updateAttribute.bind(this) diff --git a/ui-ngx/src/app/shared/models/widget-settings.models.ts b/ui-ngx/src/app/shared/models/widget-settings.models.ts index a8ef6fa4d6..e49fad9baa 100644 --- a/ui-ngx/src/app/shared/models/widget-settings.models.ts +++ b/ui-ngx/src/app/shared/models/widget-settings.models.ts @@ -415,7 +415,7 @@ export abstract class AdvancedModeColorProcessor extends ColorProcessor { super(settings); this.advancedMode = this.getCurrentConfig().advancedMode; if (this.advancedMode) { - createdValueSubscription( + createValueSubscription( this.ctx, this.datasourceConfigs(), this.onDataUpdated.bind(this) @@ -1141,9 +1141,9 @@ export const getLatestSingleTsValue = (data: Array): DataEntry = return null; }; -export const createdValueSubscription = (ctx: WidgetContext, - datasourceConfigs: ValueSourceConfig[], - onDataUpdated: WidgetSubscriptionCallbacks['onDataUpdated']): Observable => { +export const createValueSubscription = (ctx: WidgetContext, + datasourceConfigs: ValueSourceConfig[], + onDataUpdated: WidgetSubscriptionCallbacks['onDataUpdated']): Observable => { let datasources: Datasource[] = []; let index = 0; @@ -1165,9 +1165,9 @@ export const createdValueSubscription = (ctx: WidgetContext, }; const generateDatasource = (ctx: WidgetContext, - datasources: Datasource[], - valueSource: ValueSourceConfig, - index: number): Datasource[] => { + datasources: Datasource[], + valueSource: ValueSourceConfig, + index: number): Datasource[] => { if (valueSource.type === ValueSourceType.latestKey) { if (ctx.datasources.length && isDefinedAndNotNull(ctx.datasources[0].aliasName)) { datasources = configureDatasource(ctx, valueSource, ctx.datasources[0].aliasName, datasources, index, true); @@ -1181,11 +1181,11 @@ const generateDatasource = (ctx: WidgetContext, }; const configureDatasource = (ctx: WidgetContext, - valueSource: ValueSourceConfig, - entityAlias: string, - datasources: Datasource[], - index: number, - isLatest: boolean): Datasource[] => { + valueSource: ValueSourceConfig, + entityAlias: string, + datasources: Datasource[], + index: number, + isLatest: boolean): Datasource[] => { const indexes = [index]; const entityAliasId = ctx.aliasController.getEntityAliasId(entityAlias); let datasource = datasources.find(d => @@ -1230,8 +1230,8 @@ const configureDatasource = (ctx: WidgetContext, const subscribeForDatasource = (ctx: WidgetContext, - datasource: Datasource[], - onDataUpdated: WidgetSubscriptionCallbacks['onDataUpdated']): Observable => { + datasource: Datasource[], + onDataUpdated: WidgetSubscriptionCallbacks['onDataUpdated']): Observable => { if (!datasource.length) { return EMPTY; }