You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/04/04 13:27:08 UTC

[incubator-hop] branch master updated: Use Server Push to update the UI after executing workflow/pipeline

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 18b5614  Use Server Push to update the UI after executing workflow/pipeline
     new 91a1ce1  Merge pull request #730 from HiromuHota/HOP-2740
18b5614 is described below

commit 18b5614af5df42add1316e098d78e8ca7cc6ed57
Author: Hiromu Hota <hi...@gmail.com>
AuthorDate: Sat Apr 3 16:40:08 2021 -0700

    Use Server Push to update the UI after executing workflow/pipeline
---
 .../org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java    | 3 +++
 .../org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
index 2ff44ae..083bafa 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
@@ -74,6 +74,7 @@ import org.apache.hop.ui.core.gui.HopNamespace;
 import org.apache.hop.ui.core.widget.CheckBoxToolTip;
 import org.apache.hop.ui.core.widget.OsHelper;
 import org.apache.hop.ui.hopgui.HopGui;
+import org.apache.hop.ui.hopgui.ServerPushSessionFacade;
 import org.apache.hop.ui.hopgui.CanvasFacade;
 import org.apache.hop.ui.hopgui.CanvasListener;
 import org.apache.hop.ui.hopgui.HopGuiExtensionPoint;
@@ -3778,6 +3779,7 @@ public class HopGuiPipelineGraph extends HopGuiAbstractGraph
   public void start() {
     try {
       pipelineMeta.setShowDialog(pipelineMeta.isAlwaysShowRunOptions());
+      ServerPushSessionFacade.start();
       Thread thread =
           new Thread(
               () ->
@@ -3790,6 +3792,7 @@ public class HopGuiPipelineGraph extends HopGuiAbstractGraph
                               } else {
                                 pipelineRunDelegate.executePipeline(
                                     hopGui.getLog(), pipelineMeta, false, false, LogLevel.BASIC);
+                                ServerPushSessionFacade.stop();
                               }
                             } catch (Throwable e) {
                               new ErrorDialog(
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
index 9f99edf..7b37a2d 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
@@ -56,6 +56,7 @@ import org.apache.hop.ui.core.gui.HopNamespace;
 import org.apache.hop.ui.core.widget.CheckBoxToolTip;
 import org.apache.hop.ui.core.widget.OsHelper;
 import org.apache.hop.ui.hopgui.HopGui;
+import org.apache.hop.ui.hopgui.ServerPushSessionFacade;
 import org.apache.hop.ui.hopgui.CanvasFacade;
 import org.apache.hop.ui.hopgui.CanvasListener;
 import org.apache.hop.ui.hopgui.context.GuiContextUtil;
@@ -1412,6 +1413,7 @@ public class HopGuiWorkflowGraph extends HopGuiAbstractGraph
   @Override
   public void start() {
     workflowMeta.setShowDialog(workflowMeta.isAlwaysShowRunOptions());
+    ServerPushSessionFacade.start();
     Thread thread =
         new Thread() {
           @Override
@@ -1422,6 +1424,7 @@ public class HopGuiWorkflowGraph extends HopGuiAbstractGraph
                       try {
                         workflowRunDelegate.executeWorkflow(
                             hopGui.getVariables(), workflowMeta, null);
+                        ServerPushSessionFacade.stop();
                       } catch (Exception e) {
                         new ErrorDialog(
                             getShell(),