From 83d56fae4cdbd64767de95810e59bf4f7bcddd49 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 14 Dec 2020 11:21:42 +0200 Subject: [PATCH 1/3] Translate --- ui/src/app/locale/locale.constant-en_US.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json index 5ec07cf6cf..1bb5af2024 100644 --- a/ui/src/app/locale/locale.constant-en_US.json +++ b/ui/src/app/locale/locale.constant-en_US.json @@ -847,7 +847,8 @@ "status": "Received by edge", "deployed": "Deployed", "pending": "Pending", - "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer" + "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer", + "enter-edge-type": "Enter edge type" }, "error": { "unable-to-connect": "Unable to connect to the server! Please check your internet connection.", From 85036d053780bc8ad8a51238e142ed41aa1f0938 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 14 Dec 2020 11:32:35 +0200 Subject: [PATCH 2/3] Refactored in sync with ce-3 --- .../queue/DefaultTbClusterService.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java index 66e93ef76c..28ad5e3486 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java @@ -184,12 +184,9 @@ public class DefaultTbClusterService implements TbClusterService { byte[] msgBytes = encodingService.encode(msg); TbQueueProducer> toRuleEngineProducer = producerProvider.getRuleEngineNotificationsMsgProducer(); Set tbRuleEngineServices = new HashSet<>(partitionService.getAllServiceIds(ServiceType.TB_RULE_ENGINE)); - boolean toCore = msg.getEntityId().getEntityType().equals(EntityType.TENANT) || - msg.getEntityId().getEntityType().equals(EntityType.EDGE); - boolean toRuleEngine = !msg.getEntityId().getEntityType().equals(EntityType.EDGE); - - if (toCore) { + if (msg.getEntityId().getEntityType().equals(EntityType.TENANT) || + msg.getEntityId().getEntityType().equals(EntityType.EDGE)) { TbQueueProducer> toCoreNfProducer = producerProvider.getTbCoreNotificationsMsgProducer(); Set tbCoreServices = partitionService.getAllServiceIds(ServiceType.TB_CORE); for (String serviceId : tbCoreServices) { @@ -201,13 +198,11 @@ public class DefaultTbClusterService implements TbClusterService { // No need to push notifications twice tbRuleEngineServices.removeAll(tbCoreServices); } - if (toRuleEngine) { - for (String serviceId : tbRuleEngineServices) { - TopicPartitionInfo tpi = partitionService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceId); - ToRuleEngineNotificationMsg toRuleEngineMsg = ToRuleEngineNotificationMsg.newBuilder().setComponentLifecycleMsg(ByteString.copyFrom(msgBytes)).build(); - toRuleEngineProducer.send(tpi, new TbProtoQueueMsg<>(msg.getEntityId().getId(), toRuleEngineMsg), null); - toRuleEngineNfs.incrementAndGet(); - } + for (String serviceId : tbRuleEngineServices) { + TopicPartitionInfo tpi = partitionService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceId); + ToRuleEngineNotificationMsg toRuleEngineMsg = ToRuleEngineNotificationMsg.newBuilder().setComponentLifecycleMsg(ByteString.copyFrom(msgBytes)).build(); + toRuleEngineProducer.send(tpi, new TbProtoQueueMsg<>(msg.getEntityId().getId(), toRuleEngineMsg), null); + toRuleEngineNfs.incrementAndGet(); } } From 230a303156c42df78430a64f54b920eb3894a3d3 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 14 Dec 2020 12:37:21 +0200 Subject: [PATCH 3/3] Fixes incorrect customer user sync --- .../edge/rpc/init/DefaultSyncEdgeService.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java index 0d62beaa1b..c67a8062a0 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java @@ -311,11 +311,11 @@ public class DefaultSyncEdgeService implements SyncEdgeService { do { pageData = userService.findTenantAdmins(edge.getTenantId(), pageLink); pushUsersToEdge(pageData, edge); - syncCustomerUsers(edge); if (pageData != null && pageData.hasNext()) { pageLink = pageData.getNextPageLink(); } } while (pageData != null && pageData.hasNext()); + syncCustomerUsers(edge); } catch (Exception e) { log.error("Exception during loading edge user(s) on sync!", e); } @@ -336,6 +336,15 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } } + private void pushUsersToEdge(TextPageData pageData, Edge edge) { + if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) { + log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size()); + for (User user : pageData.getData()) { + saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null); + } + } + } + private void syncWidgetsBundleAndWidgetTypes(Edge edge) { log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName()); List widgetsBundlesToPush = new ArrayList<>(); @@ -423,15 +432,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { return tenantMailSettings; } - private void pushUsersToEdge(TextPageData pageData, Edge edge) { - if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) { - log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size()); - for (User user : pageData.getData()) { - saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null); - } - } - } - @Override public ListenableFuture processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) { log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg);