From 2837edbbd1f6a90059164324c3a8f907c8a9746a Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Thu, 25 Jul 2024 16:31:58 +0300
Subject: [PATCH] refactoring

---
 .../modbus-slave-config.component.html             | 10 +++++-----
 .../modbus-slave-config.component.ts               |  8 ++++++--
 .../modbus-slave-dialog.component.html             | 14 +++++++-------
 .../modbus-slave-dialog.component.ts               |  6 +++++-
 .../metadata/connector-default-configs/modbus.json |  2 +-
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html
index 56fc579361..d37c8cc9ee 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html
@@ -34,7 +34,7 @@
       </tb-toggle-select>
     </div>
     <div class="tb-form-panel no-border no-padding padding-top">
-      <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial"
+      <div *ngIf="protocolType !== ModbusProtocolType.Serial"
            class="tb-form-row column-xs"
            fxLayoutAlign="space-between center"
       >
@@ -54,7 +54,7 @@
           </mat-form-field>
         </div>
       </div>
-      <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial else serialPort"
+      <div *ngIf="protocolType !== ModbusProtocolType.Serial else serialPort"
            class="tb-form-row column-xs"
            fxLayoutAlign="space-between center"
       >
@@ -102,7 +102,7 @@
         <div class="tb-flex no-gap">
           <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="method">
-              <mat-option *ngFor="let method of slaveConfigFormGroup.get('type').value === ModbusProtocolType.Serial ? modbusSerialMethodTypes : modbusMethodTypes"
+              <mat-option *ngFor="let method of protocolType === ModbusProtocolType.Serial ? modbusSerialMethodTypes : modbusMethodTypes"
                           [value]="method">{{ ModbusMethodLabelsMap.get(method) }}</mat-option>
             </mat-select>
           </mat-form-field>
@@ -168,7 +168,7 @@
         </mat-form-field>
       </div>
     </div>
-    <div *ngIf="this.slaveConfigFormGroup.get('type').value === ModbusProtocolType.Serial" class="tb-form-row column-xs" fxLayoutAlign="space-between center">
+    <div *ngIf="protocolType === ModbusProtocolType.Serial" class="tb-form-row column-xs" fxLayoutAlign="space-between center">
       <div class="fixed-title-width" translate>gateway.baudrate</div>
       <div class="tb-flex no-gap">
         <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
@@ -196,7 +196,7 @@
               </mat-form-field>
             </div>
           </div>
-          <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial" class="tb-form-panel stroked tb-slide-toggle">
+          <div *ngIf="protocolType !== ModbusProtocolType.Serial" class="tb-form-panel stroked tb-slide-toggle">
             <mat-expansion-panel class="tb-settings" [expanded]="showSecurityControl.value">
               <mat-expansion-panel-header fxLayout="row wrap">
                 <mat-panel-title>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts
index 3ff9e929ed..05083a087d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts
@@ -134,6 +134,10 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
     return this.slaveConfigFormGroup.get('sendDataToThingsBoard').value;
   }
 
+  get protocolType(): ModbusProtocolType {
+    return this.slaveConfigFormGroup.get('type').value;
+  }
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -207,7 +211,7 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
       this.showSecurityControl.disable({emitEvent: false});
       this.slaveConfigFormGroup.get('sendDataToThingsBoard').enable({emitEvent: false});
     }
-    this.updateEnablingByProtocol(this.slaveConfigFormGroup.get('type').value);
+    this.updateEnablingByProtocol(this.protocolType);
     this.updateSecurityEnable(this.showSecurityControl.value);
   }
 
@@ -218,7 +222,7 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
   }
 
   private updateSecurityEnable(securityEnabled: boolean): void {
-    if (securityEnabled && this.isSlaveEnabled) {
+    if (securityEnabled && this.isSlaveEnabled && this.protocolType !== ModbusProtocolType.Serial) {
       this.slaveConfigFormGroup.get('security').enable({emitEvent: false});
     } else {
       this.slaveConfigFormGroup.get('security').disable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html
index 31d2202fcb..1e47479f03 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html
@@ -53,7 +53,7 @@
           </tb-toggle-select>
         </div>
         <div class="tb-form-panel no-border no-padding padding-top">
-          <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial"
+          <div *ngIf="protocolType !== ModbusProtocolType.Serial"
                class="tb-form-row column-xs"
                fxLayoutAlign="space-between center"
           >
@@ -73,7 +73,7 @@
               </mat-form-field>
             </div>
           </div>
-          <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial else serialPort"
+          <div *ngIf="protocolType !== ModbusProtocolType.Serial else serialPort"
                class="tb-form-row column-xs"
                fxLayoutAlign="space-between center"
           >
@@ -122,14 +122,14 @@
             <div class="tb-flex no-gap">
               <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
                 <mat-select formControlName="method">
-                  <mat-option *ngFor="let method of slaveConfigFormGroup.get('type').value === ModbusProtocolType.Serial ? modbusSerialMethodTypes : modbusMethodTypes"
+                  <mat-option *ngFor="let method of protocolType === ModbusProtocolType.Serial ? modbusSerialMethodTypes : modbusMethodTypes"
                               [value]="method">{{ ModbusMethodLabelsMap.get(method) }}</mat-option>
                 </mat-select>
               </mat-form-field>
             </div>
           </div>
         </div>
-        <ng-container *ngIf="this.slaveConfigFormGroup.get('type').value === ModbusProtocolType.Serial">
+        <ng-container *ngIf="protocolType === ModbusProtocolType.Serial">
           <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
             <div class="fixed-title-width" translate>gateway.baudrate</div>
             <div class="tb-flex no-gap">
@@ -260,7 +260,7 @@
                   </mat-form-field>
                 </div>
               </div>
-              <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial" class="tb-form-row column-xs" fxLayoutAlign="space-between center">
+              <div *ngIf="protocolType !== ModbusProtocolType.Serial" class="tb-form-row column-xs" fxLayoutAlign="space-between center">
                 <div class="fixed-title-width" translate>gateway.word-order</div>
                 <div class="tb-flex no-gap">
                   <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
@@ -270,7 +270,7 @@
                   </mat-form-field>
                 </div>
               </div>
-              <div *ngIf="this.slaveConfigFormGroup.get('type').value !== ModbusProtocolType.Serial" class="tb-form-panel stroked tb-slide-toggle">
+              <div *ngIf="protocolType !== ModbusProtocolType.Serial" class="tb-form-panel stroked tb-slide-toggle">
                 <mat-expansion-panel class="tb-settings" [expanded]="showSecurityControl.value">
                   <mat-expansion-panel-header fxLayout="row wrap">
                     <mat-panel-title>
@@ -356,7 +356,7 @@
     <button mat-raised-button color="primary"
             (click)="add()"
             [disabled]="slaveConfigFormGroup.invalid || !slaveConfigFormGroup.dirty">
-      {{ this.data.buttonTitle | translate }}
+      {{ data.buttonTitle | translate }}
     </button>
   </div>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts
index 38a77ac587..cbfc7cc8c2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts
@@ -128,6 +128,10 @@ export class ModbusSlaveDialogComponent extends DialogComponent<ModbusSlaveDialo
     this.showSecurityControl.patchValue(!!this.data.value.security && !isEqual(this.data.value.security, {}));
   }
 
+  get protocolType(): ModbusProtocolType {
+    return this.slaveConfigFormGroup.get('type').value;
+  }
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -236,7 +240,7 @@ export class ModbusSlaveDialogComponent extends DialogComponent<ModbusSlaveDialo
   }
 
   private updateSecurityEnabling(isEnabled: boolean): void {
-    if (isEnabled) {
+    if (isEnabled && this.protocolType !== ModbusProtocolType.Serial) {
       this.slaveConfigFormGroup.get('security').enable({emitEvent: false});
     } else {
       this.slaveConfigFormGroup.get('security').disable({emitEvent: false});
diff --git a/ui-ngx/src/assets/metadata/connector-default-configs/modbus.json b/ui-ngx/src/assets/metadata/connector-default-configs/modbus.json
index c84a2278b9..441f63ab5f 100644
--- a/ui-ngx/src/assets/metadata/connector-default-configs/modbus.json
+++ b/ui-ngx/src/assets/metadata/connector-default-configs/modbus.json
@@ -200,7 +200,7 @@
             "timeseries": [
                 {
                     "address": 2,
-                    "type": "int",
+                    "type": "8int",
                     "tag": "smm",
                     "objectsCount": 1,
                     "value": "12334"