functionality adjustments

2024-07-23 17:59:18 +03:00 · 2024-07-23 17:59:18 +03:00 · 3a9a654fd2
commit 3a9a654fd2
parent 84bcc9a5ea
9 changed files with 290 additions and 252 deletions
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
@ -62,6 +62,13 @@ import { ModbusMasterTableComponent } from '../modbus-master-table/modbus-master
    :host {
      height: 100%;
    }
+
+    :host ::ng-deep {
+      .mat-mdc-tab-body-content {
+        overflow: hidden !important;
+      }
+    }
+
    :host ::ng-deep {
      .mat-mdc-tab-group, .mat-mdc-tab-body-wrapper {
        height: 100%;
--- 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
@ -15,7 +15,8 @@
    limitations under the License.

 -->
-<div class="tb-form-panel no-border no-padding padding-top" [formGroup]="slaveConfigFormGroup">
+<div [formGroup]="slaveConfigFormGroup" class="slave-container">
+  <div class="tb-form-panel no-border no-padding padding-top">
    <div class="tb-form-hint tb-primary-fill tb-flex center">{{ 'gateway.hints.modbus-server' | translate }}</div>
    <div class="tb-form-row" fxLayoutAlign="space-between center">
      <mat-slide-toggle class="mat-slide" formControlName="sendDataToThingsBoard">
@ -24,6 +25,8 @@
        </mat-label>
      </mat-slide-toggle>
    </div>
+  </div>
+  <div class="slave-content tb-form-panel no-border no-padding padding-top" >
    <div class="tb-flex row space-between align-center no-gap fill-width">
      <div class="fixed-title-width" translate>gateway.server-slave-config</div>
      <tb-toggle-select formControlName="type" appearance="fill">
@ -172,10 +175,13 @@
      <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">
-        <input matInput type="number" min="0" name="value" formControlName="baudrate" placeholder="{{ 'gateway.set' | translate }}"/>
+          <mat-select formControlName="baudrate">
+            <mat-option *ngFor="let rate of modbusBaudrates" [value]="rate">{{ rate }}</mat-option>
+          </mat-select>
        </mat-form-field>
      </div>
    </div>
+    <div>
      <mat-expansion-panel>
        <mat-expansion-panel-header>
          <mat-panel-title>
@ -250,8 +256,10 @@
          </ng-container>
        </div>
      </mat-expansion-panel>
+    </div>
    <div class="tb-form-panel stroked">
      <div class="tb-form-panel-title" translate>gateway.values</div>
      <tb-modbus-values formControlName="values"></tb-modbus-values>
    </div>
  </div>
+</div>
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.scss
@ -0,0 +1,18 @@
+$server-config-header-height: 132px;
+
+:host {
+  .nested-expansion-header {
+    ::ng-deep .mat-content {
+      height: 100%;
+    }
+  }
+
+  .slave-content {
+    height: calc(100% - #{$server-config-header-height});
+    overflow: auto;
+  }
+
+  .slave-container {
+    display: inherit;
+  }
+}
--- 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
@ -27,6 +27,7 @@ import {
  Validators,
 } from '@angular/forms';
 import {
+  ModbusBaudrates,
  ModbusMethodLabelsMap,
  ModbusMethodType,
  ModbusOrderType,
@ -71,15 +72,7 @@ import { ModbusValuesComponent, } from '../modbus-values/modbus-values.component
    ModbusSecurityConfigComponent,
    GatewayPortTooltipPipe,
  ],
-  styles: [`
-    :host {
-      .nested-expansion-header {
-        .mat-content {
-          height: 100%;
-        }
-      }
-    }
-  `],
+  styleUrls: ['modbus-slave-config.component.scss'],
 })
 export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validator, OnDestroy {

@ -94,6 +87,7 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
  readonly modbusSerialMethodTypes = Object.values(ModbusSerialMethodType);
  readonly modbusOrderType = Object.values(ModbusOrderType);
  readonly ModbusProtocolType = ModbusProtocolType;
+  readonly modbusBaudrates = ModbusBaudrates;
  readonly serialSpecificControlKeys = ['serialPort', 'baudrate'];
  readonly tcpUdpSpecificControlKeys = ['port', 'security', 'host'];

@ -110,11 +104,11 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
      port: [null, [Validators.required, Validators.min(PortLimits.MIN), Validators.max(PortLimits.MAX)]],
      serialPort: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
      method: [ModbusMethodType.RTU, []],
-      unitId: [null, [Validators.required]],
-      baudrate: [null, []],
+      unitId: [0, [Validators.required]],
+      baudrate: [this.ModbusProtocolType[0], []],
      deviceName: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
      deviceType: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
-      pollPeriod: [null, []],
+      pollPeriod: [5000, []],
      sendDataToThingsBoard: [false, []],
      byteOrder:[ModbusOrderType.BIG, []],
      security: [],
@ -240,10 +234,10 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
      host: host ?? '',
      type: type ?? ModbusProtocolType.TCP,
      method: method ?? ModbusMethodType.RTU,
-      unitId: unitId ?? null,
+      unitId: unitId ?? 0,
      deviceName: deviceName ?? '',
      deviceType: deviceType ?? '',
-      pollPeriod: pollPeriod ?? null,
+      pollPeriod: pollPeriod ?? 5000,
      sendDataToThingsBoard: !!sendDataToThingsBoard,
      byteOrder: byteOrder ?? ModbusOrderType.BIG,
      security: security ?? {},
@ -256,11 +250,12 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
      },
      values: values ?? {} as ModbusRegisterValues,
      port: port ?? null,
+      baudrate: baudrate ?? this.modbusBaudrates[0],
    };
    if (slaveConfig.type === ModbusProtocolType.Serial) {
-      slaveState = { ...slaveState, baudrate, serialPort: port, host: '', port: null } as ModbusSlave;
+      slaveState = { ...slaveState, serialPort: port, host: '', port: null } as ModbusSlave;
    } else {
-      slaveState = { ...slaveState, serialPort: '', baudrate: null } as ModbusSlave;
+      slaveState = { ...slaveState, serialPort: '' } as ModbusSlave;
    }
    this.slaveConfigFormGroup.setValue(slaveState, {emitEvent: false});
  }
--- 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
@ -136,7 +136,9 @@
            <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">
-                <input matInput type="number" min="0" name="value" formControlName="baudrate" placeholder="{{ 'gateway.set' | translate }}"/>
+                <mat-select formControlName="baudrate">
+                  <mat-option *ngFor="let rate of modbusBaudrates" [value]="rate">{{ rate }}</mat-option>
+                </mat-select>
              </mat-form-field>
            </div>
          </div>
@ -162,7 +164,7 @@
            <div class="fixed-title-width" translate>gateway.parity</div>
            <div class="tb-flex no-gap">
              <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
-                <mat-select formControlName="bytesize">
+                <mat-select formControlName="parity">
                  <mat-option *ngFor="let parity of modbusParities" [value]="parity">{{ ModbusParityLabelsMap.get(parity) }}</mat-option>
                </mat-select>
              </mat-form-field>
--- 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
@ -25,6 +25,7 @@ import {
 } from '@angular/forms';
 import {
  MappingInfo,
+  ModbusBaudrates,
  ModbusByteSizes,
  ModbusMethodLabelsMap,
  ModbusMethodType,
@ -100,6 +101,7 @@ export class ModbusSlaveDialogComponent extends DialogComponent<ModbusSlaveDialo
  readonly modbusSerialMethodTypes = Object.values(ModbusSerialMethodType);
  readonly modbusParities = Object.values(ModbusParity);
  readonly modbusByteSizes = ModbusByteSizes;
+  readonly modbusBaudrates = ModbusBaudrates;
  readonly modbusOrderType = Object.values(ModbusOrderType);
  readonly ModbusProtocolType = ModbusProtocolType;
  readonly ModbusParityLabelsMap = ModbusParityLabelsMap;
@ -129,25 +131,25 @@ export class ModbusSlaveDialogComponent extends DialogComponent<ModbusSlaveDialo
      port: [null, [Validators.required, Validators.min(PortLimits.MIN), Validators.max(PortLimits.MAX)]],
      serialPort: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
      method: [ModbusMethodType.RTU, []],
-      baudrate: [null, []],
+      baudrate: [this.modbusBaudrates[0], []],
      stopbits: [null, []],
      bytesize: [ModbusByteSizes[0], []],
      parity: [ModbusParity.None, []],
      strict: [false, []],
-      unitId: [null, [Validators.required]],
+      unitId: [0, [Validators.required]],
      deviceName: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
      deviceType: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
      sendDataOnlyOnChange: [false, []],
-      timeout: [],
+      timeout: [35],
      byteOrder: [ModbusOrderType.BIG, []],
      wordOrder: [ModbusOrderType.BIG, []],
-      retries: [false, []],
-      retryOnEmpty: [false, []],
-      retryOnInvalid: [false, []],
-      pollPeriod: [null, []],
-      connectAttemptTimeMs: [null, []],
-      connectAttemptCount: [null, []],
-      waitAfterFailedAttemptsMs: [null, []],
+      retries: [true, []],
+      retryOnEmpty: [true, []],
+      retryOnInvalid: [true, []],
+      pollPeriod: [5000, []],
+      connectAttemptTimeMs: [5000, []],
+      connectAttemptCount: [5, []],
+      waitAfterFailedAttemptsMs: [300000, []],
      values: [{}, []],
      security: [{}],
    });
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-values/modbus-values.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-values/modbus-values.component.ts
@ -84,6 +84,10 @@ import { coerceBoolean } from '@shared/decorators/coercion';
        min-height: 320px;
      }
    }
+
+    ::ng-deep .mdc-evolution-chip-set__chips {
+      align-items: center;
+    }
  `]
 })

--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
@ -804,17 +804,17 @@ export enum ModbusOrderType {
 }

 export enum ModbusRegisterType {
-  HoldingRegister = 'holding_registers',
+  HoldingRegisters = 'holding_registers',
  CoilsInitializer = 'coils_initializer',
-  InputRegister = 'input_registers',
+  InputRegisters = 'input_registers',
  DiscreteInputs = 'discrete_inputs'
 }

 export const ModbusRegisterTranslationsMap = new Map<ModbusRegisterType, string>(
  [
-    [ModbusRegisterType.HoldingRegister, 'gateway.holding_registers'],
+    [ModbusRegisterType.HoldingRegisters, 'gateway.holding_registers'],
    [ModbusRegisterType.CoilsInitializer, 'gateway.coils_initializer'],
-    [ModbusRegisterType.InputRegister, 'gateway.input_registers'],
+    [ModbusRegisterType.InputRegisters, 'gateway.input_registers'],
    [ModbusRegisterType.DiscreteInputs, 'gateway.discrete_inputs']
  ]
 );
@ -1023,3 +1023,5 @@ export interface ModbusIdentity {
  productName?: string;
  modelName?: string;
 }
+
+export const ModbusBaudrates = [4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600];
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@ -2772,7 +2772,7 @@
        "delete-value": "Delete value",
        "delete-rpc-method": "Delete method",
        "delete-rpc-request": "Delete request",
-        "delete-attribute-update": "Add attribute update",
+        "delete-attribute-update": "Delete attribute update",
        "advanced": "Advanced",
        "advanced-connection-settings": "Advanced connection settings",
        "attributes": "Attributes",
@ -2821,7 +2821,7 @@
        "connectors-table-key": "Key",
        "connectors-table-class": "Class",
        "connection-timeout": "Connection timeout (s)",
-        "connect-attempt-time": "Connect attempt time (s)",
+        "connect-attempt-time": "Connect attempt time (ms)",
        "connect-attempt-count": "Connect attempt count",
        "copy-username": "Copy username",
        "copy-password": "Copy password",
@ -2954,10 +2954,10 @@
        "unit-id": "Unit ID",
        "host": "Host",
        "host-required": "Host is required.",
-        "holding_registers": "Holding register",
+        "holding_registers": "Holding registers",
        "coils_initializer": "Coils initializer",
-        "input_registers": "Input register",
-        "discrete_inputs": "Discrete input",
+        "input_registers": "Input registers",
+        "discrete_inputs": "Discrete inputs",
        "json-parse": "Not valid JSON.",
        "json-required": "Field cannot be empty.",
        "JSONPath-hint": "This field supports constants and JSONPath expressions.",
@ -3019,7 +3019,7 @@
        "password": "Password",
        "password-required": "Password is required.",
        "permit-without-calls": "Keep alive permit without calls",
-        "poll-period": "Poll period (s)",
+        "poll-period": "Poll period (ms)",
        "port": "Port",
        "port-required": "Port is required.",
        "port-limits-error": "Port should be number from {{min}} to {{max}}.",
@ -3307,7 +3307,7 @@
            "exactly-once": "2 - Exactly once"
        },
        "objects-count": "Objects count",
-        "wait-after-failed-attempts": "Wait after failed attempts (s)",
+        "wait-after-failed-attempts": "Wait after failed attempts (ms)",
        "tls-path-private-key": "Path to private key on gateway",
        "toggle-fullscreen": "Toggle fullscreen",
        "transformer-json-config": "Configuration JSON*",