UI: Rename rule node modules and component

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;
                 "<li><strong>ALL</strong> - return all messages as a single JSON array message. " +
                 "Where each element represents object with <strong><i>msg</i></strong> and <strong><i>metadata</i></strong> inner properties.</li></ul>",
         icon = "content_copy",
-        configDirective = "tbActionNodeMsgDeduplicationConfig"
+        configDirective = "tbTransformationNodeDeduplicationConfig"
 )
 @Slf4j
 public class TbMsgDeduplicationNode implements TbNode {

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 {
 

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<string, Type<IRuleNodeConfigurationComponent>> = {
+export const actionRuleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
   'tbActionNodeAssignToCustomerConfig': AssignCustomerConfigComponent,
   'tbActionNodeAttributesConfig': AttributesConfigComponent,
   'tbActionNodeClearAlarmConfig': ClearAlarmConfigComponent,
@@ -113,7 +112,7 @@ export const ruleNodeActionConfigComponentsMap: Record<string, Type<IRuleNodeCon
   'tbActionNodeCreateRelationConfig': CreateRelationConfigComponent,
   'tbActionNodeDeleteAttributesConfig': DeleteAttributesConfigComponent,
   'tbActionNodeDeleteRelationConfig': DeleteRelationConfigComponent,
-  'tbDeviceProfileConfig': DeviceProfileConfigComponent,
+  'tbActionNodeDeviceProfileConfig': DeviceProfileConfigComponent,
   'tbActionNodeDeviceStateConfig': DeviceStateConfigComponent,
   'tbActionNodeGeneratorConfig': GeneratorConfigComponent,
   'tbActionNodeGpsGeofencingConfig': GpsGeoActionConfigComponent,

ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.ts

@@ -19,7 +19,7 @@ import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
 
 @Component({
-  selector: 'tb-device-profile-config',
+  selector: 'tb-action-node-device-profile-config',
   templateUrl: './device-profile-config.component.html',
   styleUrls: []
 })

ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.ts

@@ -17,7 +17,12 @@
 import { Component } from '@angular/core';
 import { isDefinedAndNotNull } from '@core/public-api';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MessageType, messageTypeNames, RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import {
+  MessageType,
+  messageTypeNames,
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent
+} from '@shared/models/rule-node.models';
 
 @Component({
     selector: 'tb-action-node-device-state-config',

ui-ngx/src/app/modules/home/components/rule-node/common/common-rule-node-config.module.ts

@@ -76,5 +76,5 @@ import { ExampleHintComponent } from './example-hint.component';
   ]
 })
 
-export class RuleNodeConfigCommonModule {
+export class CommonRuleNodeConfigModule {
 }

ui-ngx/src/app/modules/home/components/rule-node/enrichment/enrichment-rule-node-core.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 { CustomerAttributesConfigComponent } from './customer-attributes-config.component';
-import { RuleNodeConfigCommonModule } from '../common/rule-node-config-common.module';
+import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module';
 import { EntityDetailsConfigComponent } from './entity-details-config.component';
 import { DeviceAttributesConfigComponent } from './device-attributes-config.component';
 import { OriginatorAttributesConfigComponent } from './originator-attributes-config.component';
@@ -45,7 +45,7 @@ import { FetchDeviceCredentialsConfigComponent } from './fetch-device-credential
   imports: [
     CommonModule,
     SharedModule,
-    RuleNodeConfigCommonModule
+    CommonRuleNodeConfigModule
   ],
   exports: [
     CustomerAttributesConfigComponent,
@@ -60,10 +60,10 @@ import { FetchDeviceCredentialsConfigComponent } from './fetch-device-credential
     FetchDeviceCredentialsConfigComponent
   ]
 })
-export class RuleNodeCoreEnrichmentModule {
+export class EnrichmentRuleNodeCoreModule {
 }
 
-export const ruleNodeEnrichmentConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
+export const enrichmentRuleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
   'tbEnrichmentNodeCalculateDeltaConfig': CalculateDeltaConfigComponent,
   'tbEnrichmentNodeCustomerAttributesConfig': CustomerAttributesConfigComponent,
   'tbEnrichmentNodeDeviceAttributesConfig': DeviceAttributesConfigComponent,

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<string, Type<IRuleNodeConfigurationComponent>> = {
+export const externalRuleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
   'tbExternalNodeAzureIotHubConfig': AzureIotHubConfigComponent,
   'tbExternalNodeKafkaConfig': KafkaConfigComponent,
   'tbExternalNodeLambdaConfig': LambdaConfigComponent,

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<string, Type<IRuleNodeConfigurationComponent>> = {
+export const filterRuleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
   'tbFilterNodeCheckAlarmStatusConfig': CheckAlarmStatusComponent,
   'tbFilterNodeCheckMessageConfig': CheckMessageConfigComponent,
   'tbFilterNodeCheckRelationConfig': CheckRelationConfigComponent,

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 { isDefinedAndNotNull } from '@core/public-api';
-import { Store } from '@ngrx/store';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
 

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<string, Type<IRuleNodeConfigurationComponent>> = {
+export const flowRuleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
   'tbFlowNodeRuleChainInputConfig': RuleChainInputComponent,
   'tbFlowNodeRuleChainOutputConfig': RuleChainOutputComponent
 }

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,
+  actionRuleNodeConfigComponentsMap,
-  RuleNodeConfigActionModule
+  ActionRuleNodeConfigModule
-} from '@home/components/rule-node/action/rule-node-config-action.module';
+} from '@home/components/rule-node/action/action-rule-node-config.module';
 import {
-  RuleNodeConfigFilterModule,
+  filterRuleNodeConfigComponentsMap,
-  ruleNodeFilterConfigComponentsMap
+  FilterRuleNodeConfigModule
-} from '@home/components/rule-node/filter/rule-node-config-filter.module';
+} from '@home/components/rule-node/filter/filter-rule-node-config.module';
 import {
-  RuleNodeCoreEnrichmentModule,
+  enrichmentRuleNodeConfigComponentsMap,
-  ruleNodeEnrichmentConfigComponentsMap
+  EnrichmentRuleNodeCoreModule
-} from '@home/components/rule-node/enrichment/rule-node-core-enrichment.module';
+} from '@home/components/rule-node/enrichment/enrichment-rule-node-core.module';
 import {
-  RuleNodeConfigExternalModule,
+  externalRuleNodeConfigComponentsMap,
-  ruleNodeExternalConfigComponentsMap
+  ExternalRuleNodeConfigModule
-} from '@home/components/rule-node/external/rule-node-config-external.module';
+} from '@home/components/rule-node/external/external-rule-node-config.module';
 import {
-  RuleNodeConfigTransformModule,
+  transformationRuleNodeConfigComponentsMap,
-  ruleNodeTransformConfigComponentsMap
+  TransformationRuleNodeConfigModule
-} from '@home/components/rule-node/transform/rule-node-config-transform.module';
+} from '@home/components/rule-node/transformation/transformation-rule-node-config.module';
 import {
-  RuleNodeConfigFlowModule,
+  flowRuleNodeConfigComponentsMap,
-  ruleNodeFlowConfigComponentsMap
+  FlowRuleNodeConfigModule
-} from '@home/components/rule-node/flow/rule-node-config-flow.module';
+} 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,
+    ActionRuleNodeConfigModule,
-    RuleNodeConfigFilterModule,
+    FilterRuleNodeConfigModule,
-    RuleNodeCoreEnrichmentModule,
+    EnrichmentRuleNodeCoreModule,
-    RuleNodeConfigExternalModule,
+    ExternalRuleNodeConfigModule,
-    RuleNodeConfigTransformModule,
+    TransformationRuleNodeConfigModule,
-    RuleNodeConfigFlowModule,
+    FlowRuleNodeConfigModule,
     EmptyConfigComponent
   ]
 })
 export class RuleNodeConfigModule {}
 
 export const ruleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
-  ...ruleNodeActionConfigComponentsMap,
+  ...actionRuleNodeConfigComponentsMap,
-  ...ruleNodeEnrichmentConfigComponentsMap,
+  ...enrichmentRuleNodeConfigComponentsMap,
-  ...ruleNodeExternalConfigComponentsMap,
+  ...externalRuleNodeConfigComponentsMap,
-  ...ruleNodeFilterConfigComponentsMap,
+  ...filterRuleNodeConfigComponentsMap,
-  ...ruleNodeFlowConfigComponentsMap,
+  ...flowRuleNodeConfigComponentsMap,
-  ...ruleNodeTransformConfigComponentsMap,
+  ...transformationRuleNodeConfigComponentsMap,
   'tbNodeEmptyConfig': EmptyConfigComponent
 };

ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html

@@ -36,7 +36,7 @@
     </mat-select>
   </mat-form-field>
   <div class="tb-form-panel stroked no-padding-bottom"
-        *ngIf="changeOriginatorConfigForm.get('originatorSource').value === 'ENTITY'">
+        *ngIf="changeOriginatorConfigForm.get('originatorSource').value === originatorSource.ENTITY">
     <tb-example-hint [hintText]="'tb.rulenode.entity-name-pattern-hint'"
                       popupHelpLink="rulenode/change_originator_node_fields_templatization">
     </tb-example-hint>

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: []
 })

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<string, Type<IRuleNodeConfigurationComponent>> = {
+export const transformationRuleNodeConfigComponentsMap: Record<string, Type<IRuleNodeConfigurationComponent>> = {
   'tbTransformationNodeChangeOriginatorConfig': ChangeOriginatorConfigComponent,
   'tbTransformationNodeCopyKeysConfig': CopyKeysConfigComponent,
-  'tbActionNodeMsgDeduplicationConfig': DeduplicationConfigComponent,
+  'tbTransformationNodeDeduplicationConfig': DeduplicationConfigComponent,
   'tbTransformationNodeDeleteKeysConfig': DeleteKeysConfigComponent,
   'tbTransformationNodeJsonPathConfig': NodeJsonPathConfigComponent,
   'tbTransformationNodeRenameKeysConfig': RenameKeysConfigComponent,

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",