diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java index 891efec861..6d13332f6f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java @@ -59,7 +59,7 @@ import static org.thingsboard.server.common.data.DataConstants.QUEUE_NAME; "
  • ALL - return all messages as a single JSON array message. " + "Where each element represents object with msg and metadata inner properties.
    • ", icon = "content_copy", - configDirective = "tbActionNodeMsgDeduplicationConfig" + configDirective = "tbTransformationNodeDeduplicationConfig" ) @Slf4j public class TbMsgDeduplicationNode implements TbNode { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java index 9df674cf88..40fa08ae3c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java @@ -59,7 +59,7 @@ import java.util.concurrent.TimeUnit; nodeDescription = "Process device messages based on device profile settings", nodeDetails = "Create and clear alarms based on alarm rules defined in device profile. The output relation type is either " + "'Alarm Created', 'Alarm Updated', 'Alarm Severity Updated' and 'Alarm Cleared' or simply 'Success' if no alarms were affected.", - configDirective = "tbDeviceProfileConfig" + configDirective = "tbActionNodeDeviceProfileConfig" ) public class TbDeviceProfileNode implements TbNode { diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/rule-node-config-action.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/action-rule-node-config.module.ts similarity index 93% rename from ui-ngx/src/app/modules/home/components/rule-node/action/rule-node-config-action.module.ts rename to ui-ngx/src/app/modules/home/components/rule-node/action/action-rule-node-config.module.ts index 8c8350378d..3e78ee4c46 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/action/rule-node-config-action.module.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/action/action-rule-node-config.module.ts @@ -33,7 +33,7 @@ import { GpsGeoActionConfigComponent } from './gps-geo-action-config.component'; import { MsgCountConfigComponent } from './msg-count-config.component'; import { RpcReplyConfigComponent } from './rpc-reply-config.component'; import { SaveToCustomTableConfigComponent } from './save-to-custom-table-config.component'; -import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.module'; +import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module'; import { UnassignCustomerConfigComponent } from './unassign-customer-config.component'; import { DeviceProfileConfigComponent } from './device-profile-config.component'; import { PushToEdgeConfigComponent } from './push-to-edge-config.component'; @@ -42,7 +42,6 @@ import { DeleteAttributesConfigComponent } from './delete-attributes-config.comp import { MathFunctionConfigComponent } from './math-function-config.component'; import { DeviceStateConfigComponent } from './device-state-config.component'; import { SendRestApiCallReplyConfigComponent } from './send-rest-api-call-reply-config.component'; -import { EmptyConfigComponent } from '@home/components/rule-node/empty-config.component'; @NgModule({ declarations: [ @@ -74,7 +73,7 @@ import { EmptyConfigComponent } from '@home/components/rule-node/empty-config.co CommonModule, SharedModule, HomeComponentsModule, - RuleNodeConfigCommonModule + CommonRuleNodeConfigModule ], exports: [ DeleteAttributesConfigComponent, @@ -102,10 +101,10 @@ import { EmptyConfigComponent } from '@home/components/rule-node/empty-config.co DeviceStateConfigComponent ] }) -export class RuleNodeConfigActionModule { +export class ActionRuleNodeConfigModule { } -export const ruleNodeActionConfigComponentsMap: Record> = { +export const actionRuleNodeConfigComponentsMap: Record> = { 'tbActionNodeAssignToCustomerConfig': AssignCustomerConfigComponent, 'tbActionNodeAttributesConfig': AttributesConfigComponent, 'tbActionNodeClearAlarmConfig': ClearAlarmConfigComponent, @@ -113,7 +112,7 @@ export const ruleNodeActionConfigComponentsMap: Record> = { +export const enrichmentRuleNodeConfigComponentsMap: Record> = { 'tbEnrichmentNodeCalculateDeltaConfig': CalculateDeltaConfigComponent, 'tbEnrichmentNodeCustomerAttributesConfig': CustomerAttributesConfigComponent, 'tbEnrichmentNodeDeviceAttributesConfig': DeviceAttributesConfigComponent, diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/rule-node-config-external.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/external-rule-node-config.module.ts similarity index 93% rename from ui-ngx/src/app/modules/home/components/rule-node/external/rule-node-config-external.module.ts rename to ui-ngx/src/app/modules/home/components/rule-node/external/external-rule-node-config.module.ts index c170d9ccd6..38395b9dac 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/external/rule-node-config-external.module.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/external/external-rule-node-config.module.ts @@ -29,7 +29,7 @@ import { SendSmsConfigComponent } from './send-sms-config.component'; import { CommonModule } from '@angular/common'; import { IRuleNodeConfigurationComponent, SharedModule } from '@shared/public-api'; import { HomeComponentsModule } from '@home/components/public-api'; -import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.module'; +import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module'; import { SlackConfigComponent } from './slack-config.component'; import { LambdaConfigComponent } from './lambda-config.component'; @@ -53,7 +53,7 @@ import { LambdaConfigComponent } from './lambda-config.component'; CommonModule, SharedModule, HomeComponentsModule, - RuleNodeConfigCommonModule + CommonRuleNodeConfigModule ], exports: [ SnsConfigComponent, @@ -71,10 +71,10 @@ import { LambdaConfigComponent } from './lambda-config.component'; SlackConfigComponent ] }) -export class RuleNodeConfigExternalModule { +export class ExternalRuleNodeConfigModule { } -export const ruleNodeExternalConfigComponentsMap: Record> = { +export const externalRuleNodeConfigComponentsMap: Record> = { 'tbExternalNodeAzureIotHubConfig': AzureIotHubConfigComponent, 'tbExternalNodeKafkaConfig': KafkaConfigComponent, 'tbExternalNodeLambdaConfig': LambdaConfigComponent, diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/rule-node-config-filter.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/filter-rule-node-config.module.ts similarity index 92% rename from ui-ngx/src/app/modules/home/components/rule-node/filter/rule-node-config-filter.module.ts rename to ui-ngx/src/app/modules/home/components/rule-node/filter/filter-rule-node-config.module.ts index 52ad3169d5..ca0aaffd71 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/filter/rule-node-config-filter.module.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/filter-rule-node-config.module.ts @@ -25,7 +25,7 @@ import { OriginatorTypeConfigComponent } from './originator-type-config.componen import { ScriptConfigComponent } from './script-config.component'; import { SwitchConfigComponent } from './switch-config.component'; import { CheckAlarmStatusComponent } from './check-alarm-status.component'; -import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.module'; +import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module'; @NgModule({ declarations: [ @@ -41,7 +41,7 @@ import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.mo imports: [ CommonModule, SharedModule, - RuleNodeConfigCommonModule + CommonRuleNodeConfigModule ], exports: [ CheckMessageConfigComponent, @@ -54,10 +54,10 @@ import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.mo CheckAlarmStatusComponent ] }) -export class RuleNodeConfigFilterModule { +export class FilterRuleNodeConfigModule { } -export const ruleNodeFilterConfigComponentsMap: Record> = { +export const filterRuleNodeConfigComponentsMap: Record> = { 'tbFilterNodeCheckAlarmStatusConfig': CheckAlarmStatusComponent, 'tbFilterNodeCheckMessageConfig': CheckMessageConfigComponent, 'tbFilterNodeCheckRelationConfig': CheckRelationConfigComponent, diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts index 0f8392c4f0..61cc018aab 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts @@ -15,8 +15,7 @@ /// import { Component } from '@angular/core'; -import { AppState, isDefinedAndNotNull } from '@core/public-api'; -import { Store } from '@ngrx/store'; +import { isDefinedAndNotNull } from '@core/public-api'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models'; diff --git a/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-node-config-flow.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/flow/flow-rule-node-config.module.ts similarity index 92% rename from ui-ngx/src/app/modules/home/components/rule-node/flow/rule-node-config-flow.module.ts rename to ui-ngx/src/app/modules/home/components/rule-node/flow/flow-rule-node-config.module.ts index 4dae3212aa..2ee36f71fc 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-node-config-flow.module.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/flow/flow-rule-node-config.module.ts @@ -34,10 +34,10 @@ import { RuleChainOutputComponent } from './rule-chain-output.component'; RuleChainOutputComponent ] }) -export class RuleNodeConfigFlowModule { +export class FlowRuleNodeConfigModule { } -export const ruleNodeFlowConfigComponentsMap: Record> = { +export const flowRuleNodeConfigComponentsMap: Record> = { 'tbFlowNodeRuleChainInputConfig': RuleChainInputComponent, 'tbFlowNodeRuleChainOutputConfig': RuleChainOutputComponent } diff --git a/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts index 79d46f02d5..58efd925db 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts @@ -19,29 +19,29 @@ import { EmptyConfigComponent } from './empty-config.component'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared/shared.module'; import { - ruleNodeActionConfigComponentsMap, - RuleNodeConfigActionModule -} from '@home/components/rule-node/action/rule-node-config-action.module'; + actionRuleNodeConfigComponentsMap, + ActionRuleNodeConfigModule +} from '@home/components/rule-node/action/action-rule-node-config.module'; import { - RuleNodeConfigFilterModule, - ruleNodeFilterConfigComponentsMap -} from '@home/components/rule-node/filter/rule-node-config-filter.module'; + filterRuleNodeConfigComponentsMap, + FilterRuleNodeConfigModule +} from '@home/components/rule-node/filter/filter-rule-node-config.module'; import { - RuleNodeCoreEnrichmentModule, - ruleNodeEnrichmentConfigComponentsMap -} from '@home/components/rule-node/enrichment/rule-node-core-enrichment.module'; + enrichmentRuleNodeConfigComponentsMap, + EnrichmentRuleNodeCoreModule +} from '@home/components/rule-node/enrichment/enrichment-rule-node-core.module'; import { - RuleNodeConfigExternalModule, - ruleNodeExternalConfigComponentsMap -} from '@home/components/rule-node/external/rule-node-config-external.module'; + externalRuleNodeConfigComponentsMap, + ExternalRuleNodeConfigModule +} from '@home/components/rule-node/external/external-rule-node-config.module'; import { - RuleNodeConfigTransformModule, - ruleNodeTransformConfigComponentsMap -} from '@home/components/rule-node/transform/rule-node-config-transform.module'; + transformationRuleNodeConfigComponentsMap, + TransformationRuleNodeConfigModule +} from '@home/components/rule-node/transformation/transformation-rule-node-config.module'; import { - RuleNodeConfigFlowModule, - ruleNodeFlowConfigComponentsMap -} from '@home/components/rule-node/flow/rule-node-config-flow.module'; + flowRuleNodeConfigComponentsMap, + FlowRuleNodeConfigModule +} from '@home/components/rule-node/flow/flow-rule-node-config.module'; import { IRuleNodeConfigurationComponent } from '@shared/models/rule-node.models'; @NgModule({ @@ -53,23 +53,23 @@ import { IRuleNodeConfigurationComponent } from '@shared/models/rule-node.models SharedModule ], exports: [ - RuleNodeConfigActionModule, - RuleNodeConfigFilterModule, - RuleNodeCoreEnrichmentModule, - RuleNodeConfigExternalModule, - RuleNodeConfigTransformModule, - RuleNodeConfigFlowModule, + ActionRuleNodeConfigModule, + FilterRuleNodeConfigModule, + EnrichmentRuleNodeCoreModule, + ExternalRuleNodeConfigModule, + TransformationRuleNodeConfigModule, + FlowRuleNodeConfigModule, EmptyConfigComponent ] }) export class RuleNodeConfigModule {} export const ruleNodeConfigComponentsMap: Record> = { - ...ruleNodeActionConfigComponentsMap, - ...ruleNodeEnrichmentConfigComponentsMap, - ...ruleNodeExternalConfigComponentsMap, - ...ruleNodeFilterConfigComponentsMap, - ...ruleNodeFlowConfigComponentsMap, - ...ruleNodeTransformConfigComponentsMap, + ...actionRuleNodeConfigComponentsMap, + ...enrichmentRuleNodeConfigComponentsMap, + ...externalRuleNodeConfigComponentsMap, + ...filterRuleNodeConfigComponentsMap, + ...flowRuleNodeConfigComponentsMap, + ...transformationRuleNodeConfigComponentsMap, 'tbNodeEmptyConfig': EmptyConfigComponent }; diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/change-originator-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html similarity index 98% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/change-originator-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html index 818ea5a12d..1f66108e48 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/transform/change-originator-config.component.html +++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html @@ -36,7 +36,7 @@
    + *ngIf="changeOriginatorConfigForm.get('originatorSource').value === originatorSource.ENTITY"> diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/change-originator-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/change-originator-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/copy-keys-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/copy-keys-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/copy-keys-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/copy-keys-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/deduplication-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/deduplication-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/deduplication-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.ts similarity index 98% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/deduplication-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.ts index ec9b3a9cf2..bf50b36f3a 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/transform/deduplication-config.component.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.ts @@ -21,7 +21,7 @@ import { deduplicationStrategiesTranslations, FetchMode } from '@home/components import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models'; @Component({ - selector: 'tb-action-node-msg-deduplication-config', + selector: 'tb-transformation-node-deduplication-config', templateUrl: './deduplication-config.component.html', styleUrls: [] }) diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/delete-keys-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/delete-keys-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/delete-keys-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/delete-keys-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/node-json-path-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/node-json-path-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/node-json-path-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/node-json-path-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/rename-keys-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/rename-keys-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/rename-keys-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/rename-keys-config.component.scss rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.scss diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/rename-keys-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/rename-keys-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/script-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/script-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/script-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/script-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/to-email-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/to-email-config.component.html rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.html diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/to-email-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/to-email-config.component.scss rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.scss diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/to-email-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/to-email-config.component.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.ts diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transform/rule-node-config-transform.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/transformation-rule-node-config.module.ts similarity index 88% rename from ui-ngx/src/app/modules/home/components/rule-node/transform/rule-node-config-transform.module.ts rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/transformation-rule-node-config.module.ts index c64381e54e..a25495d7b4 100644 --- a/ui-ngx/src/app/modules/home/components/rule-node/transform/rule-node-config-transform.module.ts +++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/transformation-rule-node-config.module.ts @@ -18,7 +18,7 @@ import { NgModule, Type } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IRuleNodeConfigurationComponent, SharedModule } from '@shared/public-api'; import { ChangeOriginatorConfigComponent } from './change-originator-config.component'; -import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.module'; +import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module'; import { TransformScriptConfigComponent } from './script-config.component'; import { ToEmailConfigComponent } from './to-email-config.component'; import { CopyKeysConfigComponent } from './copy-keys-config.component'; @@ -42,7 +42,7 @@ import { ScriptConfigComponent } from '@home/components/rule-node/filter/script- imports: [ CommonModule, SharedModule, - RuleNodeConfigCommonModule + CommonRuleNodeConfigModule ], exports: [ ChangeOriginatorConfigComponent, @@ -55,13 +55,13 @@ import { ScriptConfigComponent } from '@home/components/rule-node/filter/script- DeduplicationConfigComponent ] }) -export class RuleNodeConfigTransformModule { +export class TransformationRuleNodeConfigModule { } -export const ruleNodeTransformConfigComponentsMap: Record> = { +export const transformationRuleNodeConfigComponentsMap: Record> = { 'tbTransformationNodeChangeOriginatorConfig': ChangeOriginatorConfigComponent, 'tbTransformationNodeCopyKeysConfig': CopyKeysConfigComponent, - 'tbActionNodeMsgDeduplicationConfig': DeduplicationConfigComponent, + 'tbTransformationNodeDeduplicationConfig': DeduplicationConfigComponent, 'tbTransformationNodeDeleteKeysConfig': DeleteKeysConfigComponent, 'tbTransformationNodeJsonPathConfig': NodeJsonPathConfigComponent, 'tbTransformationNodeRenameKeysConfig': RenameKeysConfigComponent, diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index bbcc04d5f9..cbae98683c 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -4927,7 +4927,7 @@ "min-interval-seconds-message": "Only 1 second minimum interval is allowed.", "output-timeseries-key-prefix": "Output time series key prefix", "output-timeseries-key-prefix-required": "Output time series key prefix required.", - "separator-hint": "Press \"Enter\" to complete field input.", + "separator-hint": "You should press \"Enter\" to complete field input.", "select-details": "Select details", "entity-details-id": "Id", "entity-details-title": "Title",