Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5

application/src/main/java/org/thingsboard/server/actors/app/AppActor.java

@@ -103,6 +103,7 @@ public class AppActor extends RuleChainManagerActor {
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
+            case SERVER_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
                 onToDeviceActorMsg((TenantAwareMsg) msg);
                 break;
             default:

application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java

@@ -82,6 +82,7 @@ public class TenantActor extends RuleChainManagerActor {
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
+            case SERVER_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
                 onToDeviceActorMsg((DeviceAwareMsg) msg);
                 break;
             case RULE_CHAIN_TO_RULE_CHAIN_MSG:

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java

@@ -34,7 +34,9 @@ import org.thingsboard.server.common.msg.TbMsg;
         name = "rpc call reply",
         configClazz = TbSendRpcReplyNodeConfiguration.class,
         nodeDescription = "Sends reply to the RPC call from device",
-        nodeDetails = "Expects messages with any message type. Will forward message body to the device."
+        nodeDetails = "Expects messages with any message type. Will forward message body to the device.",
+        uiResources = {"static/rulenode/rulenode-core-config.js"},
+        configDirective = "tbActionNodeRpcReplyConfig"
 )
 public class TbSendRPCReplyNode implements TbNode {
 

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java

@@ -39,9 +39,11 @@ import java.util.concurrent.TimeUnit;
 @RuleNode(
         type = ComponentType.ACTION,
         name = "rpc call request",
-        configClazz = TbSendRpcReplyNodeConfiguration.class,
+        configClazz = TbSendRpcRequestNodeConfiguration.class,
         nodeDescription = "Sends one-way RPC call to device",
-        nodeDetails = "Expects messages with \"method\" and \"params\". Will forward response from device to next nodes."
+        nodeDetails = "Expects messages with \"method\" and \"params\". Will forward response from device to next nodes.",
+        uiResources = {"static/rulenode/rulenode-core-config.js"},
+        configDirective = "tbActionNodeRpcRequestConfig"
 )
 public class TbSendRPCRequestNode implements TbNode {