diff --git a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html
index 757756dc7b..4bfa7c2068 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html
+++ b/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}}
-
- device-profile.rpc-request-topic-filter
-
-
- {{ 'device-profile.rpc-request-topic-filter-required' | translate}}
-
-
- {{ 'device-profile.not-valid-single-character' | translate}}
-
-
- {{ 'device-profile.not-valid-multi-character' | translate}}
-
-
-
-
device-profile.attributes-topic-filter
-
- device-profile.rpc-response-topic-filter
-
-
- {{ 'device-profile.rpc-response-topic-filter-required' | translate}}
-
-
- {{ 'device-profile.not-valid-single-character' | translate}}
-
-
- {{ 'device-profile.not-valid-multi-character' | translate}}
-
-
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 d5ef8a1a06..80eb37e756 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
@@ -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()]],
- deviceRpcRequestTopic: [null, [Validators.required, this.validationMQTTTopic()]],
- deviceRpcResponseTopic: [null, [Validators.required, this.validationMQTTTopic()]]
+ deviceTelemetryTopic: [null, [Validators.required, this.validationMQTTTopic()]]
})
});
this.mqttDeviceProfileTransportConfigurationFormGroup.valueChanges.subscribe(() => {
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index 34ff3df061..3e74194207 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/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',
- deviceRpcRequestTopic: 'v1/devices/me/rpc/request/',
- deviceRpcResponseTopic: 'v1/devices/me/rpc/response/'
+ deviceAttributesTopic: 'v1/devices/me/attributes'
};
transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
break;
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 5912cc27d0..59ea876868 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -795,15 +795,11 @@
"support-level-wildcards": "Single [+] and multi-level [#] 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": "[+] is suitable for any topic level. Ex.: v1/devices/+/telemetry or +/devices/+/attributes.",
+ "single-level-wildcards-hint": "[+] is suitable for any topic filter level. Ex.: v1/devices/+/telemetry or +/devices/+/attributes.",
"multi-level-wildcards-hint": "[#] can replace the topic filter itself and must be the last symbol of the topic. Ex.: # or v1/devices/me/#."
},
"dialog": {