From 00322110cda766824cd022e841075dd2051b363c Mon Sep 17 00:00:00 2001
From: Kalin Chan <kalin.chan@payara.fish>
Date: Tue, 20 Aug 2024 17:00:51 +0100
Subject: [PATCH] FISH-6579 Hide ssl tab when security is disabled

---
 .../src/main/resources/configuration/httpListenerTabs.inc   | 6 +++++-
 .../web/src/main/resources/grizzly/listenerTabs.inc         | 6 +++++-
 .../web/src/main/resources/grizzly/protocolTabs.inc         | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
index bac61847017..b9eaecef73a 100644
--- a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
+++ b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <sun:tabSet id="listenerTabs" immediate="$boolean{true}" selected="#{sessionScope.httpListenerTabs}">
     <sun:tab id="generalTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.networkListener.listenerTab}" toolTip="$resource{i18n_web.grizzly.networkListener.listenerTab} Tab" >
@@ -47,7 +48,10 @@
         gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" rendered="#{pageSession.protocolMap['securityEnabled']}">
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedProtocolName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="httpListenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerSSL.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
diff --git a/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc b/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
index 25c56e3e25c..f9f5944eb3d 100644
--- a/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
+++ b/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <!-- grizzly/listenerTabs.inc -->
 
@@ -49,7 +50,10 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab and empty pageSession.protocolMap['securityEnabled'] ? true : pageSession.protocolMap['securityEnabled']}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="listenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/listenerSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
diff --git a/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc b/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
index f939c297f5a..2c3516ae139 100644
--- a/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
+++ b/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <!-- grizzly/protocolTabs.jsf -->
 
@@ -49,7 +50,10 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab and empty pageSession.protocolMap['securityEnabled'] ? true : pageSession.protocolMap['securityEnabled']}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="protocolTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");