PAYARA-1663 Allow support view to be disabled

appserver/admingui/common/src/main/resources/appServer/serverInstDomainAttrs.jsf

@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2017] Payara Foundation and/or affiliates
 -->
 
 <!-- appServer/serverInstDomainAttrs.jsf -->
@@ -59,6 +60,11 @@
             setPageSessionAttribute(key="appPropertyEndpoint" value="#{sessionScope.REST_URL}/system-applications/application/__admingui/property.json")
             gf.restRequest(endpoint="#{pageSession.appPropertyEndpoint}" method="GET" result="#{requestScope.propList}");
             setPageSessionAttribute(key="appPropList" value="#{requestScope.propList.data.extraProperties.properties}");
+
+            gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/server-config/zendesk-support-configuration/get-zendesk-support-configuration" method="GET" result="#{requestScope.zenresp}");
+            if (#{requestScope.zenresp.data.extraProperties.zendeskSupportConfiguration['enabled']}){
+                setPageSessionAttribute(key="zendeskenabled", value="true");
+            }
         />   
     </event>
             <sun:form id="propertyForm">
@@ -75,6 +81,9 @@
                         //will be null if checkbox is unchecked.
                         setPageSessionAttribute(key="loadOnStartup" value="false");
                     }
+                    if(!#{pageSession.zendeskenabled}){
+                        setPageSessionAttribute(key="zendeskenabled" value="false");
+                    }
                     setAttribute(key="found" value="false");
                     if('! #{pageSession.loadOnStartup}=#{pageSession.origLoadOnStartup}'){
                         foreach (var="oneProp" list="#{pageSession.appPropList}") {
@@ -92,10 +101,14 @@
                         javaToJSON(obj="#{pageSession.appPropList}" json="#{requestScope.tmpJSON}");
                         gf.restRequest(endpoint="#{pageSession.appPropertyEndpoint}", method="POST", data="#{requestScope.tmpJSON}");
                     }
+                    createMap(result="#{pageSession.zenMap}")
+                    mapPut(map="#{pageSession.zenMap}" key="enabled" value="#{pageSession.zendeskenabled}");
+                    gf.updateEntity(endpoint="#{sessionScope.REST_URL}/configs/config/server-config/zendesk-support-configuration/set-zendesk-support-configuration" 
+                                attrs="#{pageSession.zenMap}");
                     prepareSuccessfulMsg();
                     gf.redirect(page="#{pageSession.selfPage}&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
                 />
-            </sun:button>
+            </sun:button><h:outputText value="#{pageSession.zendeskenabled}"/>
         </sun:panelGroup>
     </facet>
     </sun:title>
@@ -117,7 +130,11 @@
                         }
                     }
                 />
-            </sun:checkbox>
+            </sun:checkbox>          
+        </sun:property>
+        <sun:property id="supportEnabled"  labelAlign="left" noWrap="#{false}" overlapLabel="#{false}"
+                      label="$resource{i18nc.domain.supportEnabled}"  helpText="$resource{i18nc.domain.supportEnabledHelp}">
+            <sun:checkbox  id="supportEnabled" label="$resource{i18n.common.Enabled}" selected="#{pageSession.zendeskenabled}" selectedValue="true"  />
         </sun:property>
             <sun:property id="dummy"  >
                 <sun:staticText id="dummy"  text=" " />

appserver/admingui/common/src/main/resources/org/glassfish/common/admingui/Strings.properties

@@ -37,7 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-# Portions Copyright [2016] [Payara Foundation and/or its affiliates]
+# Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates]
 
 ## 'server' is the name of the server instance. No Not Translate it.
 tree.adminServer=server (Admin Server)
@@ -849,6 +849,8 @@ domain.loadOnStartupHelp=Load Admin Console after server startup.  This may affe
 domain.loadOnStartupDefault=Usage Based
 domain.loadOnStartupAlways=Always
 domain.loadOnStartupNever=Never
+domain.supportEnabled=Support View
+domain.supportEnabledHelp=Enable support page. The admin console must be reloaded in order to take effect.
 
 configurations.PageTitle=Configurations
 configurations.NewPageTitle=New Configuration

appserver/admingui/payara-support/src/main/resources/support/pluginTreeNodeSupport.jsf

@@ -44,8 +44,11 @@
     text="$resource{i18nhs.support.tree}"
     url="/payara_support/support/support.jsf"
     imageURL="/resource/images/support.png"
+    rendered="#{requestScope.enabled}"
     >
      <!beforeCreate
         setResourceBundle(key="i18nhs" bundle="fish.payara.admingui.support.Strings");
+        gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/server-config/zendesk-support-configuration/get-zendesk-support-configuration" method="get" result="#{requestScope.resp}");
+        setAttribute(key="enabled" value="#{requestScope.resp.data.extraProperties.zendeskSupportConfiguration.enabled}");
     />
 </sun:treeNode>

appserver/payara-appserver-modules/zendesk-support/src/main/java/fish/payara/appserver/zendesk/admin/GetZendeskSupportConfigurationCommand.java

@@ -84,13 +84,14 @@ public void execute(AdminCommandContext acc) {
 
         ActionReport actionReport = acc.getActionReport();
 
-        final String[] outputHeaders = {"Email Address"};
+        final String[] outputHeaders = {"Enabled" , "Email Address"};
         ColumnFormatter columnFormatter = new ColumnFormatter(outputHeaders);
-        Object[] outputValues = {zendeskSupportConfiguration.getEmailAddress()};
+        Object[] outputValues = {zendeskSupportConfiguration.getEnabled(),zendeskSupportConfiguration.getEmailAddress()};
         columnFormatter.addRow(outputValues);
         actionReport.appendMessage(columnFormatter.toString());
 
         Map<String, Object> extraPropsMap = new HashMap<>();
+        extraPropsMap.put("enabled", zendeskSupportConfiguration.getEnabled());
         extraPropsMap.put("emailAddress", zendeskSupportConfiguration.getEmailAddress());
 
         Properties extraProps = new Properties();

appserver/payara-appserver-modules/zendesk-support/src/main/java/fish/payara/appserver/zendesk/admin/SetZendeskSupportConfigurationCommand.java

@@ -39,6 +39,7 @@
  */
 package fish.payara.appserver.zendesk.admin;
 
+import com.google.common.base.Strings;
 import com.sun.enterprise.config.serverbeans.Config;
 import fish.payara.appserver.zendesk.ZendeskSupportService;
 import fish.payara.appserver.zendesk.config.ZendeskSupportConfiguration;
@@ -78,11 +79,14 @@ public class SetZendeskSupportConfigurationCommand implements AdminCommand {
     private Target targetUtil;
 
     @Inject
-    ZendeskSupportService zendeskSupport;
+    private ZendeskSupportService zendeskSupport;
 
-    @Param(name = "emailAddress", alias = "emailaddress")
+    @Param(name = "emailAddress", alias = "emailaddress", optional = true)
     private String emailAddress;
 
+    @Param(name="enabled", optional = true)
+    private Boolean enabled;
+
     private final String target = "server-config";
 
     @Override
@@ -98,7 +102,14 @@ public void execute(AdminCommandContext acc) {
                 ConfigSupport.apply(new SingleConfigCode<ZendeskSupportConfiguration>(){
                     @Override
                     public Object run(ZendeskSupportConfiguration config) {
-                        config.setEmailAddress(emailAddress);
+
+                         if(enabled != null) {
+                            config.setEnabled(enabled);
+                        }
+                         if (!Strings.isNullOrEmpty(emailAddress)){
+                             config.setEmailAddress(emailAddress);
+                         }
+
                         return null;
                     }
                 }, zendeskSupportConfiguration);

appserver/payara-appserver-modules/zendesk-support/src/main/java/fish/payara/appserver/zendesk/config/ZendeskSupportConfiguration.java

@@ -39,6 +39,7 @@
  */
 package fish.payara.appserver.zendesk.config;
 
+import java.beans.PropertyVetoException;
 import org.glassfish.api.admin.config.ConfigExtension;
 import org.jvnet.hk2.config.Attribute;
 import org.jvnet.hk2.config.ConfigBeanProxy;
@@ -51,7 +52,11 @@
 @Configured(name="zendesk-support-configuration")
 public interface ZendeskSupportConfiguration extends ConfigBeanProxy, ConfigExtension {
 
-    @Attribute(required = true)
+    @Attribute
     String getEmailAddress();
     public void setEmailAddress(String emailAddress);
+
+    @Attribute(defaultValue = "true", dataType = Boolean.class)
+    Boolean getEnabled();
+    public void setEnabled(Boolean value);
 }