From f1bb232d24f0f72799c225a0bb0cf65fb464b4f7 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Tue, 27 Jul 2021 11:29:49 +0300 Subject: [PATCH 1/2] removed RpcError --- .../server/actors/device/DeviceActorMessageProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index a10ae17b88..e91e55bacb 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -518,7 +518,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor { String payload = hasError ? responseMsg.getError() : responseMsg.getPayload(); systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor( new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(), - payload, hasError ? RpcError.INTERNAL : null)); + payload, null)); if (requestMd.getMsg().getMsg().isPersisted()) { RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL; JsonNode response; From 733430e9d19a6f6ed5dcca5d3749dbfb46a6ea86 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Tue, 27 Jul 2021 10:57:34 +0300 Subject: [PATCH 2/2] UI: Fixed bug multiple input widget: when activate settings update all values not save hidden keys --- .../components/widget/lib/multiple-input-widget.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts index c5b8eb21b4..8d9d904368 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts @@ -495,8 +495,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni const serverAttributes: AttributeData[] = []; const sharedAttributes: AttributeData[] = []; const telemetry: AttributeData[] = []; - for (const key of this.visibleKeys(toSave)) { - const currentValue = this.multipleInputFormGroup.get(key.formId).value; + for (const key of toSave.keys) { + const currentValue = key.settings.dataKeyHidden ? key.value : this.multipleInputFormGroup.get(key.formId).value; if (!isEqual(currentValue, key.value) || this.settings.updateAllValues) { const attribute: AttributeData = { key: key.name,