PAYARA-1404 Reload page with alert on failure (#1467)

payara · Mar 20, 2017 · c27be54 · c27be54
1 parent ee77251
commit c27be54
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java b/...-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
@@ -105,15 +105,15 @@ public static void getHazelcastClusterMembers(HandlerContext handlerCtx) {
                 @HandlerInput(name = "rows", type = List.class, required = true),
                 @HandlerInput(name = "command", type = String.class, required = true)},
             output = {
-                @HandlerOutput(name = "result", type = String.class)
+                @HandlerOutput(name = "response", type = Map.class)
             })
     public static void sendAsadminCommandToSelectedInstances(HandlerContext handlerCtx) {
         String parentEndpoint = (String) handlerCtx.getInputValue("parentEndpoint");
         String endpoint = parentEndpoint.endsWith("/") ? parentEndpoint + "send-asadmin-command" : parentEndpoint 
                 + "/" + "send-asadmin-command";
         List<HashMap> rows = (List<HashMap>) handlerCtx.getInputValue("rows");
         String command = (String) handlerCtx.getInputValue("command");
-
+        
         // Check that the text box isn't empty
         if (command != null) {
             // Get the selected rows
@@ -156,7 +156,8 @@ public static void sendAsadminCommandToSelectedInstances(HandlerContext handlerC
                 attrsMap.put("logOutput", "true");
 
                 try{
-                    RestUtil.restRequest(endpoint, attrsMap, "POST", handlerCtx, false, true);
+                    Map response = RestUtil.restRequest(endpoint, attrsMap, "POST", handlerCtx, false, false);
+                    handlerCtx.setOutputValue("response", response);
                 } catch (Exception ex) {
                     GuiUtil.handleException(handlerCtx, ex);
                 }

diff --git a/...erver/admingui/payara-console-extras/src/main/resources/hazelcast/microInstancesTable.inc b/...erver/admingui/payara-console-extras/src/main/resources/hazelcast/microInstancesTable.inc
@@ -43,8 +43,15 @@
 
                     getAllSingleMapRows(TableRowGroup="${tableRowGroup}" Rows="#{requestScope.rows}");
                     py.sendAsadminCommandToSelectedInstances(parentEndpoint="#{pageSession.parentUrl}", 
-                            rows="#{requestScope.rows}", command="#{pageSession.command}");
-
+                            rows="#{requestScope.rows}", command="#{pageSession.command}", 
+                            response="#{pageSession.commandResponse}");
+
+                    if("#{pageSession.commandResponse.data['exit_code']} = FAILURE") {
+                        prepareAlertMsg(type="error", detail="#{pageSession.commandResponse.data.message}", 
+                                summary="An error has occurred");
+                        gf.redirect(page="#{request.contextPath}/hazelcast/hazelcastMembersDomain.jsf?&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
+                    }
+
                     py.prepareSuccessfulCommandMsg();
                     gf.redirect(page="#{request.contextPath}/hazelcast/hazelcastMembersDomain.jsf?&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
                 />