JsonHybridManager: prevent unnecessary 'hybridWidgetEvent'

Add missing break statement in switch block. Otherwise, all hybrid events will generate an additional action event of type 'hybridWidgetEvent' in addition to the normal 'hybridEvent' action event.
eclipse-scout · Jun 28, 2024 · df75127 · df75127
1 parent 839cd61
commit df75127
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 0 deletions.
diff --git a/...src/test/java/org/eclipse/scout/rt/ui/html/json/desktop/hybrid/JsonHybridManagerTest.java b/...src/test/java/org/eclipse/scout/rt/ui/html/json/desktop/hybrid/JsonHybridManagerTest.java
@@ -24,6 +24,7 @@
 import org.eclipse.scout.rt.client.ui.desktop.hybrid.DummyForm;
 import org.eclipse.scout.rt.client.ui.desktop.hybrid.HybridEvent;
 import org.eclipse.scout.rt.client.ui.desktop.hybrid.HybridManager;
+import org.eclipse.scout.rt.dataobject.DoEntityBuilder;
 import org.eclipse.scout.rt.dataobject.IDoEntity;
 import org.eclipse.scout.rt.platform.BEANS;
 import org.eclipse.scout.rt.platform.util.ObjectUtility;
@@ -35,6 +36,7 @@
 import org.eclipse.scout.rt.ui.html.json.JsonDataObjectHelper;
 import org.eclipse.scout.rt.ui.html.json.JsonEvent;
 import org.eclipse.scout.rt.ui.html.json.fixtures.UiSessionMock;
+import org.eclipse.scout.rt.ui.html.json.testing.JsonTestUtility;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
@@ -116,6 +118,64 @@ public void testPing() {
     verify(jsonHybridManager).handleModelHybridEvent(eq(HybridEvent.createHybridActionEndEvent(getHybridManager(), id)));
   }
 
+  @Test
+  public void testEventTypes() {
+    JsonHybridManager<HybridManager> jsonHybridManager = createJsonHybridManager();
+    jsonHybridManager.toJson();
+    JsonTestUtility.endRequest(m_uiSession);
+
+    // ----------
+    // Generic event
+
+    String id1 = createId();
+
+    getHybridManager().fireHybridEvent(id1, "foo");
+
+    assertEquals(1, m_uiSession.currentJsonResponse().getEventList().size());
+    JsonEvent event = m_uiSession.currentJsonResponse().getEventList().get(0);
+    assertEquals("hybridEvent", event.getType());
+    assertEquals(id1, event.getData().optString("id"));
+    assertEquals("foo", event.getData().optString("eventType"));
+    assertNull(event.getData().opt("data"));
+    JsonTestUtility.endRequest(m_uiSession);
+
+    // ----------
+    // actionEnd event
+
+    String id2 = createId();
+    IDoEntity data = BEANS.get(DoEntityBuilder.class).put("a", 123).put("b", "456").build();
+    JSONObject dataJson = new JSONObject();
+    dataJson.put("a", 123);
+    dataJson.put("b", "456");
+    registerJsonDo(dataJson, data);
+
+    getHybridManager().fireHybridActionEndEvent(id2, data);
+
+    assertEquals(1, m_uiSession.currentJsonResponse().getEventList().size());
+    event = m_uiSession.currentJsonResponse().getEventList().get(0);
+    assertEquals("hybridEvent", event.getType());
+    assertEquals(id2, event.getData().optString("id"));
+    assertEquals("hybridActionEnd", event.getData().optString("eventType"));
+    assertEquals(dataJson, event.getData().opt("data"));
+    JsonTestUtility.endRequest(m_uiSession);
+    unregisterJsonDo(dataJson);
+
+    // ----------
+    // Widget event
+
+    String id3 = createId();
+
+    getHybridManager().fireHybridWidgetEvent(id3, "bar");
+
+    assertEquals(1, m_uiSession.currentJsonResponse().getEventList().size());
+    event = m_uiSession.currentJsonResponse().getEventList().get(0);
+    assertEquals("hybridWidgetEvent", event.getType());
+    assertEquals(id3, event.getData().optString("id"));
+    assertEquals("bar", event.getData().optString("eventType"));
+    assertNull(event.getData().opt("data"));
+    JsonTestUtility.endRequest(m_uiSession);
+  }
+
   @Test
   public void testOpenForm() {
     JsonHybridManager<HybridManager> jsonHybridManager = createJsonHybridManager();

diff --git a/...tml/src/main/java/org/eclipse/scout/rt/ui/html/json/desktop/hybrid/JsonHybridManager.java b/...tml/src/main/java/org/eclipse/scout/rt/ui/html/json/desktop/hybrid/JsonHybridManager.java
@@ -114,6 +114,7 @@ protected void handleModelHybridEvent(HybridEvent event) {
     switch (event.getType()) {
       case HybridEvent.TYPE_EVENT:
         addActionEvent("hybridEvent", createJsonHybridEvent(event));
+        break;
       case HybridEvent.TYPE_WIDGET_EVENT:
         addActionEvent("hybridWidgetEvent", createJsonHybridEvent(event));
         break;