changed connector update approach

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

@@ -47,6 +47,7 @@ import {
 import {
   MappingTableComponent
 } from '@home/components/widget/lib/gateway/connectors-configuration/mapping-table/mapping-table.component';
+import { isDefinedAndNotNull } from '@core/utils';
 
 @Component({
   selector: 'tb-mqtt-basic-config',
@@ -136,15 +137,20 @@ export class MqttBasicConfigComponent implements ControlValueAccessor, Validator
   }
 
   private getMappedMQTTConfig(basicConfig: MQTTBasicConfig): MQTTBasicConfig {
-    const { broker, workers, dataMapping, requestsMapping  } = basicConfig || {};
-    return workers ? {
-      dataMapping,
-      requestsMapping,
-      broker: {
+    let { broker, workers, dataMapping, requestsMapping  } = basicConfig || {};
+
+    if (isDefinedAndNotNull(workers.maxNumberOfWorkers) || isDefinedAndNotNull(workers.maxMessageNumberPerWorker)) {
+      broker = {
         ...broker,
         ...workers,
-      }
-    } : basicConfig;
+      };
+    }
+
+    if ((requestsMapping as RequestMappingData[])?.length) {
+      requestsMapping = this.getRequestDataObject(requestsMapping as RequestMappingData[]);
+    }
+
+    return { broker, workers, dataMapping, requestsMapping };
   }
 
   validate(): ValidationErrors | null {
@@ -153,7 +159,7 @@ export class MqttBasicConfigComponent implements ControlValueAccessor, Validator
     };
   }
 
-  private getRequestDataArray(value: Record<RequestType, RequestMappingData>): RequestMappingData[] {
+  private getRequestDataArray(value: Record<RequestType, RequestMappingData[]>): RequestMappingData[] {
     const mappingConfigs = [];
 
     if (isObject(value)) {
@@ -169,4 +175,20 @@ export class MqttBasicConfigComponent implements ControlValueAccessor, Validator
 
     return mappingConfigs;
   }
+
+  private getRequestDataObject(array: RequestMappingData[]): Record<RequestType, RequestMappingData[]> {
+    const result = {
+      connectRequests: [],
+      disconnectRequests: [],
+      attributeRequests: [],
+      attributeUpdates: [],
+      serverSideRpc: [],
+    };
+
+    array.forEach(({ requestType, requestValue }) => {
+      result[requestType].push(requestValue);
+    });
+
+    return result as Record<RequestType, RequestMappingData[]>;
+  }
 }

ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts

@@ -51,6 +51,7 @@ import { EntityType } from '@shared/models/entity-type.models';
 import {
   AddConnectorConfigData,
   ConnectorBaseConfig,
+  ConnectorBaseInfo,
   ConnectorConfigurationModes,
   ConnectorType,
   GatewayConnector,
@@ -133,7 +134,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
 
   private basicConfigSub: Subscription;
 
-  private connectorUpdateInProgress = false;
+  private jsonConfigSub: Subscription;
 
   private subscriptionOptions: WidgetSubscriptionOptions = {
     callbacks: {
@@ -211,18 +212,6 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
       }
     });
 
-    this.connectorForm.get('configurationJson').valueChanges.pipe(
-      filter(() => !this.connectorUpdateInProgress),
-      takeUntil(this.destroy$)
-    ).subscribe((config) => {
-      const basicConfig = this.connectorForm.get('basicConfig');
-      const type = this.connectorForm.get('type').value;
-      const mode = this.connectorForm.get('mode').value;
-      if (!isEqual(config, basicConfig?.value) && this.allowBasicConfig.has(type) && mode === ConnectorConfigurationModes.ADVANCED) {
-        this.connectorForm.get('basicConfig').patchValue(config, {emitEvent: false});
-      }
-    });
-
     this.dataSource.sort = this.sort;
     this.dataSource.sortingDataAccessor = (data: AttributeData, sortHeaderId: string) => {
       switch (sortHeaderId) {
@@ -374,13 +363,26 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
       const sharedData = data.value;
       const hasSameName = sharedData.name === connectorData.name;
       const hasEmptyConfig = isEqual(sharedData.configurationJson, {}) && hasSameName;
-      const hasSameConfig =isEqual(sharedData.configurationJson, connectorData.configurationJson);
+      const hasSameConfig = this.hasSameConfig(sharedData.configurationJson, connectorData.configurationJson);
       const isRecentlyCreated = sharedData.ts && sharedData.ts <= connectorData.ts;
       return hasSameName && isRecentlyCreated && (hasSameConfig || hasEmptyConfig);
     });
     return sharedIndex !== -1;
   }
 
+  private hasSameConfig(sharedDataConfigJson: ConnectorBaseInfo, connectorDataConfigJson: ConnectorBaseInfo): boolean {
+    const { name, id, enableRemoteLogging, logLevel, ...sharedDataConfig } = sharedDataConfigJson;
+    const {
+      name: connectorName,
+      id: connectorId,
+      enableRemoteLogging: connectorEnableRemoteLogging,
+      logLevel: connectorLogLevel,
+      ...connectorConfig
+    } = connectorDataConfigJson;
+
+    return isEqual(sharedDataConfig, connectorConfig);
+  }
+
   private combineData(): void {
     this.dataSource.data = [...this.activeData, ...this.inactiveData, ...this.sharedAttributeData].filter((item, index, self) =>
       index === self.findIndex((t) => t.key === item.key)
@@ -677,7 +679,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
       this.basicConfigSub.unsubscribe();
     }
     this.basicConfigSub = this.connectorForm.get('basicConfig').valueChanges.pipe(
-      filter(() => !this.connectorUpdateInProgress),
+      filter(() => !!this.initialConnector),
       takeUntil(this.destroy$)
     ).subscribe((config) => {
       const configJson = this.connectorForm.get('configurationJson');
@@ -690,6 +692,22 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
     });
   }
 
+  private createJsonConfigWatcher(): void {
+    if (this.jsonConfigSub) {
+      this.jsonConfigSub.unsubscribe();
+    }
+    this.jsonConfigSub = this.connectorForm.get('configurationJson').valueChanges.pipe(
+      takeUntil(this.destroy$)
+    ).subscribe((config) => {
+      const basicConfig = this.connectorForm.get('basicConfig');
+      const type = this.connectorForm.get('type').value;
+      const mode = this.connectorForm.get('mode').value;
+      if (!isEqual(config, basicConfig?.value) && this.allowBasicConfig.has(type) && mode === ConnectorConfigurationModes.ADVANCED) {
+        this.connectorForm.get('basicConfig').patchValue(config, {emitEvent: false});
+      }
+    });
+  }
+
   private confirmConnectorChange(): Observable<boolean> {
     if (this.initialConnector && this.connectorForm.dirty) {
       return this.dialogService.confirm(
@@ -728,22 +746,18 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
       case ConnectorType.MQTT:
       case ConnectorType.OPCUA:
       case ConnectorType.MODBUS:
-        this.connectorUpdateInProgress = true;
-        if (connector.name !== this.connectorForm.value.name) {
-          this.connectorForm.get('basicConfig').setValue({}, {emitEvent: false});
-        }
-
+        this.connectorForm.get('mode').setValue(connector.mode || ConnectorConfigurationModes.BASIC, {emitEvent: false});
         setTimeout(() => {
-          this.connectorForm.patchValue({...connector, mode: connector.mode || ConnectorConfigurationModes.BASIC});
-          this.createBasicConfigWatcher();
+          this.connectorForm.patchValue(connector, {emitEvent: false});
           this.connectorForm.markAsPristine();
-          this.connectorUpdateInProgress = false;
+          this.createBasicConfigWatcher();
         });
         break;
       default:
         this.connectorForm.patchValue({...connector, mode: null});
         this.connectorForm.markAsPristine();
     }
+    this.createJsonConfigWatcher();
   }
 
   private setClientData(data: PageData<AttributeData>): void {

ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts

@@ -176,11 +176,18 @@ export type ConnectorMapping = DeviceConnectorMapping | RequestMappingData | Con
 
 export type ConnectorMappingFormValue = DeviceConnectorMapping | RequestMappingFormValue | ConverterMappingFormValue;
 
-export type ConnectorBaseConfig = MQTTBasicConfig | OPCBasicConfig | ModbusBasicConfig;
+export type ConnectorBaseConfig = ConnectorBaseInfo | MQTTBasicConfig | OPCBasicConfig | ModbusBasicConfig;
+
+export interface ConnectorBaseInfo {
+  name: string;
+  id: string;
+  enableRemoteLogging: boolean;
+  logLevel: GatewayLogLevel;
+}
 
 export interface MQTTBasicConfig {
   dataMapping: ConverterConnectorMapping[];
-  requestsMapping: Record<RequestType, RequestMappingData> | RequestMappingData[];
+  requestsMapping: Record<RequestType, RequestMappingData[]> | RequestMappingData[];
   broker: BrokerConfig;
   workers?: WorkersConfig;
 }