Browse Source

refactoring

pull/11319/head
mpetrov 2 years ago
parent
commit
a4ee0f6d4c
  1. 7
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts

7
ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts

@ -21,6 +21,7 @@ import {
FormGroup, FormGroup,
NG_VALIDATORS, NG_VALIDATORS,
NG_VALUE_ACCESSOR, NG_VALUE_ACCESSOR,
UntypedFormControl,
ValidationErrors, ValidationErrors,
Validator, Validator,
} from '@angular/forms'; } from '@angular/forms';
@ -108,9 +109,9 @@ export class ModbusBasicConfigComponent implements ControlValueAccessor, Validat
this.basicFormGroup.setValue(editedBase, {emitEvent: false}); this.basicFormGroup.setValue(editedBase, {emitEvent: false});
} }
validate(): ValidationErrors | null { validate(basicConfigControl: UntypedFormControl): ValidationErrors | null {
const masterHasSlaves = !!this.basicFormGroup.get('master').value.slaves?.length; const masterHasSlaves = !!basicConfigControl.value.master?.slaves?.length;
const slaveEnabled = this.basicFormGroup.get('slave').value.sendDataToThingsBoard; const slaveEnabled = basicConfigControl.value.slave?.sendDataToThingsBoard;
const slaveIsValid = this.basicFormGroup.get('slave').valid; const slaveIsValid = this.basicFormGroup.get('slave').valid;
if ((slaveEnabled && slaveIsValid) || (masterHasSlaves && !slaveEnabled)) { if ((slaveEnabled && slaveIsValid) || (masterHasSlaves && !slaveEnabled)) {

Loading…
Cancel
Save