diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts index 64ea045f8f..bf9b48aca3 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts @@ -24,11 +24,11 @@ import { Validator } from '@angular/forms'; import { - AdvancedPersistenceConfig, - defaultAdvancedPersistenceConfig, + AdvancedProcessingConfig, + defaultAdvancedProcessingConfig, maxDeduplicateTimeSecs, - PersistenceType, - PersistenceTypeTranslationMap + ProcessingType, + ProcessingTypeTranslationMap } from '@home/components/rule-node/action/timeseries-config.models'; import { isDefinedAndNotNull } from '@core/utils'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @@ -52,13 +52,13 @@ export class AdvancedPersistenceSettingRowComponent implements ControlValueAcces title: string; persistenceSettingRowForm = this.fb.group({ - type: [defaultAdvancedPersistenceConfig.type], + type: [defaultAdvancedProcessingConfig.type], deduplicationIntervalSecs: [{value: 60, disabled: true}] }); - PersistenceType = PersistenceType; - persistenceStrategies = [PersistenceType.ON_EVERY_MESSAGE, PersistenceType.DEDUPLICATE, PersistenceType.SKIP]; - PersistenceTypeTranslationMap = PersistenceTypeTranslationMap; + PersistenceType = ProcessingType; + persistenceStrategies = [ProcessingType.ON_EVERY_MESSAGE, ProcessingType.DEDUPLICATE, ProcessingType.SKIP]; + PersistenceTypeTranslationMap = ProcessingTypeTranslationMap; maxDeduplicateTime = maxDeduplicateTimeSecs; @@ -96,16 +96,16 @@ export class AdvancedPersistenceSettingRowComponent implements ControlValueAcces }; } - writeValue(value: AdvancedPersistenceConfig) { + writeValue(value: AdvancedProcessingConfig) { if (isDefinedAndNotNull(value)) { this.persistenceSettingRowForm.patchValue(value, {emitEvent: false}); } else { - this.persistenceSettingRowForm.patchValue(defaultAdvancedPersistenceConfig); + this.persistenceSettingRowForm.patchValue(defaultAdvancedProcessingConfig); } } private updatedValidation() { - if (this.persistenceSettingRowForm.get('type').value === PersistenceType.DEDUPLICATE) { + if (this.persistenceSettingRowForm.get('type').value === ProcessingType.DEDUPLICATE) { this.persistenceSettingRowForm.get('deduplicationIntervalSecs').enable({emitEvent: false}); } else { this.persistenceSettingRowForm.get('deduplicationIntervalSecs').disable({emitEvent: false}) diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html index eb0f05bec2..d3cbb1cdcb 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html +++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html @@ -16,6 +16,11 @@ -->
+ +
-
+
-
- rule-node-config.save-time-series.persistence-settings +
+ rule-node-config.save-time-series.processing-settings
@@ -27,7 +27,7 @@ {{ 'rule-node-config.advanced-mode' | translate }}
- @if(!timeseriesConfigForm.get('persistenceSettings.isAdvanced').value) { + @if(!timeseriesConfigForm.get('processingSettings.isAdvanced').value) { rule-node-config.save-time-series.strategy @@ -37,7 +37,7 @@ - @if(timeseriesConfigForm.get('persistenceSettings.type').value === PersistenceType.DEDUPLICATE) { + @if(timeseriesConfigForm.get('processingSettings.type').value === PersistenceType.DEDUPLICATE) { } - } - @else { + } @else { { - persistenceSettings: PersistenceSettingsForm +export interface TimeseriesNodeConfigurationForm extends Omit { + processingSettings: ProcessingSettingsForm } -export type PersistenceSettings = BasicPersistenceSettings & Partial & Partial; +export type ProcessingSettings = ProcessingSettingsSettings & Partial & Partial; -export type PersistenceSettingsForm = Omit & { +export type ProcessingSettingsForm = Omit & { isAdvanced: boolean; - advanced?: Partial; - type: PersistenceType; + advanced?: Partial; + type: ProcessingType; }; -export enum PersistenceType { +export enum ProcessingType { ON_EVERY_MESSAGE = 'ON_EVERY_MESSAGE', DEDUPLICATE = 'DEDUPLICATE', WEBSOCKETS_ONLY = 'WEBSOCKETS_ONLY', @@ -44,35 +44,35 @@ export enum PersistenceType { SKIP = 'SKIP' } -export const PersistenceTypeTranslationMap = new Map([ - [PersistenceType.ON_EVERY_MESSAGE, 'rule-node-config.save-time-series.strategy-type.every-message'], - [PersistenceType.DEDUPLICATE, 'rule-node-config.save-time-series.strategy-type.deduplicate'], - [PersistenceType.WEBSOCKETS_ONLY, 'rule-node-config.save-time-series.strategy-type.web-sockets-only'], - [PersistenceType.SKIP, 'rule-node-config.save-time-series.strategy-type.skip'], +export const ProcessingTypeTranslationMap = new Map([ + [ProcessingType.ON_EVERY_MESSAGE, 'rule-node-config.save-time-series.strategy-type.every-message'], + [ProcessingType.DEDUPLICATE, 'rule-node-config.save-time-series.strategy-type.deduplicate'], + [ProcessingType.WEBSOCKETS_ONLY, 'rule-node-config.save-time-series.strategy-type.web-sockets-only'], + [ProcessingType.SKIP, 'rule-node-config.save-time-series.strategy-type.skip'], ]) -export interface BasicPersistenceSettings { - type: PersistenceType; +export interface ProcessingSettingsSettings { + type: ProcessingType; } -export interface DeduplicatePersistenceStrategy extends BasicPersistenceSettings{ +export interface DeduplicateProcessingStrategy extends ProcessingSettingsSettings{ deduplicationIntervalSecs: number; } -export interface AdvancedPersistenceStrategy extends BasicPersistenceSettings{ - timeseries: AdvancedPersistenceConfig; - latest: AdvancedPersistenceConfig; - webSockets: AdvancedPersistenceConfig; +export interface AdvancedProcessingStrategy extends ProcessingSettingsSettings{ + timeseries: AdvancedProcessingConfig; + latest: AdvancedProcessingConfig; + webSockets: AdvancedProcessingConfig; } -export type AdvancedPersistenceConfig = WithOptional; +export type AdvancedProcessingConfig = WithOptional; -export const defaultAdvancedPersistenceConfig: AdvancedPersistenceConfig = { - type: PersistenceType.ON_EVERY_MESSAGE +export const defaultAdvancedProcessingConfig: AdvancedProcessingConfig = { + type: ProcessingType.ON_EVERY_MESSAGE } -export const defaultAdvancedPersistenceStrategy: Omit = { - timeseries: defaultAdvancedPersistenceConfig, - latest: defaultAdvancedPersistenceConfig, - webSockets: defaultAdvancedPersistenceConfig, +export const defaultAdvancedPersistenceStrategy: Omit = { + timeseries: defaultAdvancedProcessingConfig, + latest: defaultAdvancedProcessingConfig, + webSockets: defaultAdvancedProcessingConfig, } diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html index 238fdce6af..0981daa5cb 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html +++ b/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html @@ -15,11 +15,11 @@ limitations under the License. --> -
+
-
+