lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

added remote entity events dispatch topic to be fired on deffered events dispatch (#1129)

Browse Source 
Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch.io>
This commit is contained in:
Bondar Bogdan
2021-06-07 20:28:14 +02:00
committed by GitHub
parent 40b28e212d
commit afdaeca25a
7 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java
View File

@@ -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();
}
}

7
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java
View File

@@ -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();
}
}

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java
View File

@@ -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();
}
}

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java
View File

@@ -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();
}
}

11
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java
View File

@@ -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();
}
}

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java
View File

@@ -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";

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java
View File

@@ -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<EntityModifiedEventPayload> remotelyOriginatedEvents = remotelyOriginatedEventsStore.values();
eventBus.publish(EventTopics.REMOTE_EVENT_DISPATCHED, UI.getCurrent(), remotelyOriginatedEvents);
remotelyOriginatedEvents
.forEach(eventPayload -> eventBus.publish(EventTopics.ENTITY_MODIFIED, UI.getCurrent(), eventPayload));
}