HAL-991 - Domain mode only asks to reload configuration once

gui/src/main/java/org/jboss/as/console/client/domain/hosts/HostMgmtPresenter.java

@@ -36,6 +36,7 @@
 import com.gwtplatform.mvp.client.proxy.RevealContentEvent;
 import com.gwtplatform.mvp.client.proxy.RevealContentHandler;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
+
 import org.jboss.as.console.client.Console;
 import org.jboss.as.console.client.core.BootstrapContext;
 import org.jboss.as.console.client.core.Header;
@@ -60,6 +61,7 @@
 import org.jboss.as.console.client.shared.properties.PropertyManagement;
 import org.jboss.as.console.client.shared.properties.PropertyRecord;
 import org.jboss.as.console.client.shared.state.PerspectivePresenter;
+import org.jboss.as.console.client.shared.state.ReloadState;
 import org.jboss.as.console.client.shared.util.DMRUtil;
 import org.jboss.as.console.client.v3.dmr.AddressTemplate;
 import org.jboss.as.console.client.v3.presenter.Finder;
@@ -70,7 +72,6 @@
 import org.jboss.as.console.client.v3.stores.domain.SocketBindingStore;
 import org.jboss.as.console.client.v3.stores.domain.actions.CreateServerGroup;
 import org.jboss.as.console.client.v3.stores.domain.actions.DeleteServerGroup;
-import org.jboss.as.console.client.v3.stores.domain.actions.FilterType;
 import org.jboss.as.console.client.v3.stores.domain.actions.GroupSelection;
 import org.jboss.as.console.client.v3.stores.domain.actions.RefreshHosts;
 import org.jboss.as.console.client.v3.stores.domain.actions.RefreshServer;
@@ -153,14 +154,15 @@ public interface MyView extends View {
     private final HostStore hostStore;
     private HandlerRegistration hostHandler;
     private List<ProfileRecord> existingProfiles;
+    private final ReloadState reloadState;
 
     @Inject
     public HostMgmtPresenter(EventBus eventBus, MyView view, MyProxy proxy, PlaceManager placeManager,
                              BootstrapContext bootstrap, Header header, HostStore hostStore, Dispatcher circuit,
                              UnauthorisedPresenter unauthorisedPresenter,  ServerStore serverStore,
                              ProfileStore profileStore, DispatchAsync dispatcher, BeanFactory factory,
                              ServerGroupDAO serverGroupDAO, ServerGroupStore serverGroupStore, SocketBindingStore socketBindingStore,
-                             CoreGUIContext statementContext) {
+                             CoreGUIContext statementContext, ReloadState reloadState) {
 
         super(eventBus, view, proxy, placeManager, header, NameTokens.HostMgmtPresenter,
                 TYPE_MainContent);
@@ -178,6 +180,7 @@ public HostMgmtPresenter(EventBus eventBus, MyView view, MyProxy proxy, PlaceMan
         this.serverGroupStore = serverGroupStore;
         this.socketBindingStore = socketBindingStore;
         this.statementContext = statementContext;
+        this.reloadState = reloadState;
     }
 
     @Override
@@ -460,8 +463,8 @@ public void onPreview(PreviewEvent event) {
 
     public void onGroupLifecycle(final String group, final LifecycleOperation op) {
         onGroupLifecycle(group, Collections.EMPTY_MAP, op);
-
     }
+
     public void onGroupLifecycle(final String group, Map<String, Object> params, final LifecycleOperation op) {
 
         // parametrized lifecycle operations
@@ -472,6 +475,8 @@ public void onGroupLifecycle(final String group, Map<String, Object> params, fin
             public void onSuccess() {
                 Console.info("Server Group "+ op.name() + " succeeded");
                 circuit.dispatch(new RefreshServer());
+                Log.debug("HostMgmtPresenter reloadState null ? " + (reloadState == null ));
+                reloadState.reset();
             }
 
             @Override

gui/src/main/java/org/jboss/as/console/client/domain/runtime/DomainRuntimePresenter.java

@@ -19,6 +19,7 @@
 import com.gwtplatform.mvp.client.proxy.RevealContentEvent;
 import com.gwtplatform.mvp.client.proxy.RevealContentHandler;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
+
 import org.jboss.as.console.client.Console;
 import org.jboss.as.console.client.core.Footer;
 import org.jboss.as.console.client.core.Header;
@@ -41,6 +42,7 @@
 import org.jboss.as.console.client.shared.model.SubsystemLoader;
 import org.jboss.as.console.client.shared.model.SubsystemRecord;
 import org.jboss.as.console.client.shared.state.PerspectivePresenter;
+import org.jboss.as.console.client.shared.state.ReloadState;
 import org.jboss.as.console.client.v3.dmr.AddressTemplate;
 import org.jboss.as.console.client.v3.presenter.Finder;
 import org.jboss.as.console.client.v3.stores.domain.HostStore;
@@ -127,14 +129,15 @@ public interface MyView extends View {
     private final PlaceManager placeManager;
     private final SubsystemLoader subsysStore;
     private final ServerGroupDAO serverGroupDAO;
+    private final ReloadState reloadState;
 
     @Inject
     public DomainRuntimePresenter(EventBus eventBus, MyView view, MyProxy proxy, PlaceManager placeManager,
                                   HostStore hostStore, SubsystemLoader subsysStore,
                                   ServerGroupDAO serverGroupDAO, Header header,
                                   Dispatcher circuit, ServerStore serverStore,
                                   HostInformationStore hostInfoStore, DispatchAsync dispatcher,
-                                  ServerGroupStore serverGroupStore, CoreGUIContext statementContext) {
+                                  ServerGroupStore serverGroupStore, CoreGUIContext statementContext, ReloadState reloadState) {
 
         super(eventBus, view, proxy, placeManager, header, NameTokens.DomainRuntimePresenter, TYPE_MainContent);
 
@@ -149,6 +152,7 @@ public DomainRuntimePresenter(EventBus eventBus, MyView view, MyProxy proxy, Pla
         this.dispatcher = dispatcher;
         this.serverGroupStore = serverGroupStore;
         this.statementContext = statementContext;
+        this.reloadState = reloadState;
     }
 
     @Override
@@ -355,6 +359,7 @@ op, params, new LifecycleCallback() {
             public void onSuccess() {
                 Console.info("Server "+op.name() + " succeeded: Server "+server);
                 circuit.dispatch(new RefreshServer());
+                reloadState.reset();
             }
 
             @Override

gui/src/main/java/org/jboss/as/console/client/domain/topology/ServerGroupOpV3.java

@@ -103,20 +103,28 @@ public void onSuccess(DMRResponse dmrResponse) {
                             ModelNode stepResult = step.getValue();
                             if (stepResult.get(RESULT).isDefined()) {
                                 String status = stepResult.get(RESULT).asString();
+                                boolean disabled = "disabled".equalsIgnoreCase(status);
+                                boolean stopped = "stopped".equalsIgnoreCase(status);
+                                boolean started = "started".equalsIgnoreCase(status);
                                 switch (op) {
                                     case START:
                                     case RESTART:
-                                        lifecycleReached = "started".equalsIgnoreCase(status);
+                                        lifecycleReached = started;
+                                        lifecycleReached |= disabled;
+                                        lifecycleReached |= stopped;
                                         break;
                                     case STOP:
-                                        lifecycleReached = "stopped".equalsIgnoreCase(status);
+                                        lifecycleReached = stopped;
+                                        lifecycleReached |= disabled;
                                         break;
                                     case SUSPEND:
                                     case RESUME:
                                         lifecycleReached = true;
                                         break;
                                     case RELOAD:
-                                        lifecycleReached = "started".equalsIgnoreCase(status);
+                                        lifecycleReached = started;
+                                        lifecycleReached |= disabled;
+                                        lifecycleReached |= stopped;
                                         break;
                                     case KILL:
                                         // not supported for server groups

gui/src/main/java/org/jboss/as/console/client/shared/state/ReloadState.java

@@ -1,6 +1,5 @@
 package org.jboss.as.console.client.shared.state;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -10,7 +9,6 @@
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import org.jboss.as.console.client.Console;
 import org.jboss.as.console.client.core.NameTokens;
-import org.jboss.as.console.client.core.UIConstants;
 import org.jboss.as.console.client.core.message.Message;
 import org.jboss.as.console.client.v3.stores.domain.actions.RefreshServer;
 import org.jboss.ballroom.client.widgets.window.DefaultWindow;