From 37c381996e59c8b82f25a4327092ac0fb6b8e947 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Thu, 29 Oct 2020 14:58:28 +0200
Subject: [PATCH] ui updates

---
 .../MqttTransportConfigurationDeserializer.java     |  1 -
 ...ice-profile-transport-configuration.component.ts | 13 ++++++++++---
 ui-ngx/src/app/shared/models/device.models.ts       |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttTransportConfigurationDeserializer.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttTransportConfigurationDeserializer.java
index 15f52f603e..4754792fb2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttTransportConfigurationDeserializer.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttTransportConfigurationDeserializer.java
@@ -36,7 +36,6 @@ public class MqttTransportConfigurationDeserializer extends StdDeserializer<Mqtt
     public MqttDeviceProfileTransportConfiguration deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
         try {
             JsonNode jsonNode = jsonParser.readValueAsTree();
-
             if (jsonNode.hasNonNull("transportPayloadType") && jsonNode.get("transportPayloadType").asText().equals(TransportPayloadType.PROTOBUF.name())) {
                 return jsonParser.getCodec().treeToValue(jsonNode, MqttProtoDeviceProfileTransportConfiguration.class);
             } else {
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts
index 861dae78aa..c1dc68f0cb 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts
@@ -111,6 +111,12 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
 
   writeValue(value: MqttDeviceProfileTransportConfiguration | null): void {
     if (isDefinedAndNotNull(value)) {
+      let configurationFormGroup = this.mqttDeviceProfileTransportConfigurationFormGroup.controls.configuration as FormGroup;
+      let payloadType = value.transportPayloadType;
+      if (payloadType ===  MqttTransportPayloadType.PROTOBUF) {
+        configurationFormGroup.registerControl('deviceTelemetryProtoSchema', this.fb.control(null, Validators.required));
+        configurationFormGroup.registerControl('deviceAttributesProtoSchema', this.fb.control(null, Validators.required));
+      }
       this.mqttDeviceProfileTransportConfigurationFormGroup.patchValue({configuration: value}, {emitEvent: false});
     }
   }
@@ -121,9 +127,10 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
       configuration = this.mqttDeviceProfileTransportConfigurationFormGroup.getRawValue().configuration;
       configuration.type = DeviceTransportType.MQTT;
       let configurationFormGroup = this.mqttDeviceProfileTransportConfigurationFormGroup.controls.configuration as FormGroup;
-      if (configuration.transportPayloadType ===  MqttTransportPayloadType.PROTOBUF) {
-        configurationFormGroup.addControl('deviceTelemetryProtoSchema', this.fb.control(null, Validators.required));
-        configurationFormGroup.addControl('deviceAttributesProtoSchema', this.fb.control(null, Validators.required));
+      let transportPayloadType = configuration.transportPayloadType;
+      if (transportPayloadType ===  MqttTransportPayloadType.PROTOBUF) {
+        configurationFormGroup.registerControl('deviceTelemetryProtoSchema', this.fb.control(null, Validators.required));
+        configurationFormGroup.registerControl('deviceAttributesProtoSchema', this.fb.control(null, Validators.required));
       } else {
         configurationFormGroup.removeControl('deviceTelemetryProtoSchema');
         configurationFormGroup.removeControl('deviceAttributesProtoSchema');
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index f6850dbc57..d0a91e0933 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -148,6 +148,7 @@ export interface DefaultDeviceProfileTransportConfiguration {
 export interface MqttDeviceProfileTransportConfiguration {
   deviceTelemetryTopic?: string;
   deviceAttributesTopic?: string;
+  transportPayloadType?: MqttTransportPayloadType;
   [key: string]: any;
 }