From afdaeca25aa7fe7d5dfa15eeabaf06ccd5cb57a5 Mon Sep 17 00:00:00 2001 From: Bondar Bogdan <36962546+bogdan-bondar@users.noreply.github.com> Date: Mon, 7 Jun 2021 20:28:14 +0200 Subject: [PATCH] added remote entity events dispatch topic to be fired on deffered events dispatch (#1129) Signed-off-by: Bogdan Bondar --- .../data/filters/DsDistributionsFilterParams.java | 8 ++++++++ .../ui/common/data/filters/DsFilterParams.java | 7 +++++++ .../common/data/filters/DsManagementFilterParams.java | 9 +++++++++ .../ui/common/data/filters/SwFilterParams.java | 9 +++++++++ .../data/filters/TargetManagementFilterParams.java | 11 +++++++++++ .../eclipse/hawkbit/ui/common/event/EventTopics.java | 1 + .../ui/components/NotificationUnreadButton.java | 5 ++++- 7 files changed, 49 insertions(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java index 053d407f2..d8463aeeb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java @@ -12,6 +12,8 @@ import java.util.Objects; import org.eclipse.hawkbit.ui.common.data.providers.DistributionSetDistributionsStateDataProvider; +import com.google.common.base.MoreObjects; + /** * Filter params for {@link DistributionSetDistributionsStateDataProvider}. */ @@ -85,4 +87,10 @@ public class DsDistributionsFilterParams extends DsFilterParams { public int hashCode() { return Objects.hash(getSearchText(), getDsTypeId()); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("searchText", getSearchText()).add("dsTypeId", getDsTypeId()) + .toString(); + } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java index 22b7b623c..4785469b0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java @@ -14,6 +14,8 @@ import java.util.Objects; import org.eclipse.hawkbit.ui.common.data.providers.DistributionSetManagementStateDataProvider; import org.springframework.util.StringUtils; +import com.google.common.base.MoreObjects; + /** * Filter params for {@link DistributionSetManagementStateDataProvider}. */ @@ -82,4 +84,9 @@ public class DsFilterParams implements Serializable { public int hashCode() { return Objects.hash(getSearchText()); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("searchText", getSearchText()).toString(); + } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java index f48056b4e..b5455e46e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java @@ -14,6 +14,8 @@ import java.util.Objects; import org.eclipse.hawkbit.ui.common.data.providers.DistributionSetManagementStateDataProvider; +import com.google.common.base.MoreObjects; + /** * Filter params for {@link DistributionSetManagementStateDataProvider}. */ @@ -136,4 +138,11 @@ public class DsManagementFilterParams extends DsFilterParams { public int hashCode() { return Objects.hash(getSearchText(), isNoTagClicked(), getDistributionSetTags(), getPinnedTargetControllerId()); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("searchText", getSearchText()).add("noTagClicked", isNoTagClicked()) + .add("distributionSetTags", getDistributionSetTags()) + .add("pinnedTargetControllerId", getPinnedTargetControllerId()).toString(); + } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java index f056a8037..319ff1dcc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java @@ -14,6 +14,8 @@ import java.util.Objects; import org.eclipse.hawkbit.ui.common.data.providers.SoftwareModuleDataProvider; import org.springframework.util.StringUtils; +import com.google.common.base.MoreObjects; + /** * Filter params for {@link SoftwareModuleDataProvider}. */ @@ -135,4 +137,11 @@ public class SwFilterParams implements Serializable { public int hashCode() { return Objects.hash(getSearchText(), getSoftwareModuleTypeId(), getLastSelectedDistributionId()); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("searchText", getSearchText()) + .add("softwareModuleTypeId", getSoftwareModuleTypeId()) + .add("lastSelectedDistributionId", getLastSelectedDistributionId()).toString(); + } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java index 80af90dc9..f95619a58 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java @@ -19,6 +19,8 @@ import org.eclipse.hawkbit.ui.common.data.providers.TargetManagementStateDataPro import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import com.google.common.base.MoreObjects; + /** * Filter params for {@link TargetManagementStateDataProvider}. */ @@ -302,4 +304,13 @@ public class TargetManagementFilterParams implements Serializable { return Objects.hash(getPinnedDistId(), getSearchText(), getTargetUpdateStatusList(), isOverdueState(), getDistributionId(), isNoTagClicked(), getTargetTags(), getTargetFilterQueryId()); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("pinnedDistId", getPinnedDistId()) + .add("searchText", getSearchText()).add("targetUpdateStatusList", getTargetUpdateStatusList()) + .add("overdueState", isOverdueState()).add("distributionId", getDistributionId()) + .add("noTagClicked", isNoTagClicked()).add("targetTags", getTargetTags()) + .add("targetFilterQueryId", getTargetFilterQueryId()).toString(); + } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java index 283b280ae..886669526 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java @@ -13,6 +13,7 @@ package org.eclipse.hawkbit.ui.common.event; */ public final class EventTopics { public static final String REMOTE_EVENT_RECEIVED = "remoteEventReceived"; + public static final String REMOTE_EVENT_DISPATCHED = "remoteEventDispatched"; public static final String ENTITY_MODIFIED = "entityModified"; public static final String SELECTION_CHANGED = "selectionChanged"; public static final String TARGET_FILTER_TAB_CHANGED = "targetFilterTabChanged"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java index f6c8e697e..47e3600df 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java @@ -8,6 +8,7 @@ */ package org.eclipse.hawkbit.ui.components; +import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; @@ -158,7 +159,9 @@ public class NotificationUnreadButton extends Button { } private void dispatchEntityModifiedEvents() { - remotelyOriginatedEventsStore.values() + final Collection remotelyOriginatedEvents = remotelyOriginatedEventsStore.values(); + eventBus.publish(EventTopics.REMOTE_EVENT_DISPATCHED, UI.getCurrent(), remotelyOriginatedEvents); + remotelyOriginatedEvents .forEach(eventPayload -> eventBus.publish(EventTopics.ENTITY_MODIFIED, UI.getCurrent(), eventPayload)); }