Remove device profile rpc topic filter

ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html

@@ -36,23 +36,6 @@
               {{ 'device-profile.not-valid-multi-character' | translate}}
             </mat-error>
           </mat-form-field>
-          <mat-form-field fxFlex>
-            <mat-label translate>device-profile.rpc-request-topic-filter</mat-label>
-            <input matInput required
-                   formControlName="deviceRpcRequestTopic"
-                   type="text">
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcRequestTopic').hasError('required')">
-              {{ 'device-profile.rpc-request-topic-filter-required' | translate}}
-            </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcRequestTopic').hasError('invalidSingleTopicCharacter')">
-              {{ 'device-profile.not-valid-single-character' | translate}}
-            </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcRequestTopic').hasError('invalidMultiTopicCharacter')">
-              {{ 'device-profile.not-valid-multi-character' | translate}}
-            </mat-error>
-          </mat-form-field>
-        </div>
-        <div fxLayout="row" fxLayoutGap="8px" fxLayout.xs="column">
           <mat-form-field fxFlex>
             <mat-label translate>device-profile.attributes-topic-filter</mat-label>
             <input matInput required
@@ -68,21 +51,6 @@
               {{ 'device-profile.not-valid-multi-character' | translate}}
             </mat-error>
           </mat-form-field>
-          <mat-form-field fxFlex>
-            <mat-label translate>device-profile.rpc-response-topic-filter</mat-label>
-            <input matInput required
-                   formControlName="deviceRpcResponseTopic"
-                   type="text">
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcResponseTopic').hasError('required')">
-              {{ 'device-profile.rpc-response-topic-filter-required' | translate}}
-            </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcResponseTopic').hasError('invalidSingleTopicCharacter')">
-              {{ 'device-profile.not-valid-single-character' | translate}}
-            </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcResponseTopic').hasError('invalidMultiTopicCharacter')">
-              {{ 'device-profile.not-valid-multi-character' | translate}}
-            </mat-error>
-          </mat-form-field>
         </div>
         <div class="tb-hint" innerHTML="{{ 'device-profile.support-level-wildcards' | translate }}"></div>
         <div class="tb-hint" innerHTML="{{ 'device-profile.single-level-wildcards-hint' | translate }}"></div>

ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts

@@ -79,9 +79,7 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
     this.mqttDeviceProfileTransportConfigurationFormGroup = this.fb.group({
       configuration: this.fb.group({
         deviceAttributesTopic: [null, [Validators.required, this.validationMQTTTopic()]],
-        deviceTelemetryTopic: [null, [Validators.required, this.validationMQTTTopic()]],
+        deviceTelemetryTopic: [null, [Validators.required, this.validationMQTTTopic()]]
-        deviceRpcRequestTopic: [null, [Validators.required, this.validationMQTTTopic()]],
-        deviceRpcResponseTopic: [null, [Validators.required, this.validationMQTTTopic()]]
       })
     });
     this.mqttDeviceProfileTransportConfigurationFormGroup.valueChanges.subscribe(() => {

ui-ngx/src/app/shared/models/device.models.ts

@@ -108,8 +108,6 @@ export interface DefaultDeviceProfileTransportConfiguration {
 export interface MqttDeviceProfileTransportConfiguration {
   deviceTelemetryTopic?: string;
   deviceAttributesTopic?: string;
-  deviceRpcRequestTopic?: string;
-  deviceRpcResponseTopic?: string;
   [key: string]: any;
 }
 
@@ -162,9 +160,7 @@ export function createDeviceProfileTransportConfiguration(type: DeviceTransportT
       case DeviceTransportType.MQTT:
         const mqttTransportConfiguration: MqttDeviceProfileTransportConfiguration = {
           deviceTelemetryTopic: 'v1/devices/me/telemetry',
-          deviceAttributesTopic: 'v1/devices/me/attributes',
+          deviceAttributesTopic: 'v1/devices/me/attributes'
-          deviceRpcRequestTopic: 'v1/devices/me/rpc/request/',
-          deviceRpcResponseTopic: 'v1/devices/me/rpc/response/'
         };
         transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
         break;

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -795,15 +795,11 @@
         "support-level-wildcards": "Single <code>[+]</code> and multi-level <code>[#]</code> wildcards supported.",
         "telemetry-topic-filter": "Telemetry topic filter",
         "telemetry-topic-filter-required": "Telemetry topic filter is required.",
-        "rpc-request-topic-filter": "RPC request topic filter",
-        "rpc-request-topic-filter-required": "RPC request topic filter is required.",
         "attributes-topic-filter": "Attributes topic filter",
         "attributes-topic-filter-required": "Attributes topic filter is required.",
-        "rpc-response-topic-filter": "RPC response topic filter",
-        "rpc-response-topic-filter-required": "RPC response topic filter is required.",
         "not-valid-single-character": "Invalid use of a single-level wildcard character",
         "not-valid-multi-character": "Invalid use of a multi-level wildcard character",
-        "single-level-wildcards-hint": "<code>[+]</code> is suitable for any topic level. Ex.: <b>v1/devices/+/telemetry</b> or <b>+/devices/+/attributes</b>.",
+        "single-level-wildcards-hint": "<code>[+]</code> is suitable for any topic filter level. Ex.: <b>v1/devices/+/telemetry</b> or <b>+/devices/+/attributes</b>.",
         "multi-level-wildcards-hint": "<code>[#]</code> can replace the topic filter itself and must be the last symbol of the topic. Ex.: <b>#</b> or <b>v1/devices/me/#</b>."
     },
     "dialog": {