From 20118c3a3e4b5fd8a7fc2ad534e0762144253c5d Mon Sep 17 00:00:00 2001
From: NotedSalmon <moreiraandre2001@gmail.com>
Date: Thu, 27 Jun 2024 12:28:55 +0100
Subject: [PATCH 1/3] FISH-5740 changed string.properties to include deployment
 group in help text. (saves making another autoname help text).

Changed dgNew.jsf to include the checkbox for autoname and added code fro, instanceNew.inc to replicate the process of autonaming an instance but use it for a deployment group instead.
---
 .../cluster/src/main/resources/dg/dgNew.jsf    | 18 +++++++++++++-----
 .../cluster/admingui/Strings.properties        |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf b/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf
index f6c5056a011..839c47d402f 100644
--- a/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf
+++ b/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf
@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2018] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 
 -->
 
@@ -69,6 +69,7 @@
         }
         
           gf.getChildrenNamesList(endpoint="#{sessionScope.REST_URL}/nodes/node", result="#{pageSession.nodesList}");
+        setPageSessionAttribute(key="autoNameSelected" value="#{false}");
     />
     </event>
     <sun:form id="propertyForm" autoComplete="off">
@@ -80,8 +81,12 @@
             <sun:button id="newButton" text="$resource{i18n.button.OK}"
                 onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) {submitAndDisable(this, '$resource{i18n.button.Processing}');}; return false;" >
             <!command
-                setAttribute(key="nameToCheck" value="#{pageSession.name}");
-                gfj.checkNameExist();
+                py.generateInstanceNameIfRequired(name="#{pageSession.name}", autoname="#{pageSession.autoNameSelected}", instanceName="#{pageSession.name}");
+                if (!#{pageSession.autoNameSelected}) {
+                    setAttribute(key="nameToCheck" value="#{pageSession.name}");
+                    gfj.checkNameExist();
+                }
+
                 createMap(result="#{requestScope.ct}");
                 mapPut(map="#{requestScope.ct}" key="id" value="#{pageSession.name}" );
                 gf.createEntity( endpoint="#{sessionScope.REST_URL}/deployment-groups/deployment-group"   attrs="#{requestScope.ct}")
@@ -98,6 +103,7 @@
                 
                 py.createDeploymentGroupInstances(deploymentGroupName="#{pageSession.name}", instanceRow="#{instances}");            
                 gf.redirect(page="#{request.contextPath}/cluster/dg/dgs.jsf?alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
+                setPageSessionAttribute(key="autoNameSelected" value="#{false}");
              />
             </sun:button>
             <sun:button id="cancelButton" immediate="#{true}" text="$resource{i18n.button.Cancel}" primary="#{false}" >
@@ -114,9 +120,11 @@
     <sun:propertySheet id="propertySheet">
         <sun:propertySheetSection id="propertySectionTextField">
             <sun:property id="NameTextProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.dg.dgName}" >
-                <sun:textField id="NameText" text="#{pageSession.name}" styleClass="required" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.dg.dgName']}" required="#{true}" />
+                <sun:textField id="NameText" text="#{pageSession.name}" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.dg.dgName']}" required="#{false}" />
             </sun:property>
-            
+            <sun:property id="AutoNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.autoName}" helpText="$resource{i18ncs.autoName.help}" >
+                <sun:checkbox id="AutoName" selected="#{pageSession.autoNameSelected}" selectedValue="#{true}" />
+            </sun:property> 
               <sun:property id="avaliableInstances" visible="#{pageSession.showInstancesSection}" labelAlign="left" noWrap="#{true}" overlapLabel="#{true}">
                 <sun:addRemove id="deploymentGroupAddRemove"
                                selectAll="$boolean{true}"
diff --git a/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties b/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
index ebcb8d351d6..cfb7f14ffb5 100644
--- a/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
+++ b/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
@@ -448,4 +448,4 @@ clusters.ejbTimers.TimerCountCol=Timer Count
 general.serverNameCol=Server Name
 
 autoName=Auto Name
-autoName.help=When enabled, will generate a name for your instance if none is provided, or will otherwise resolve any name conflicts. 
+autoName.help=When enabled, will generate a name for your instance/deployment group if none is provided, or will otherwise resolve any name conflicts. 

From c26cb2fd3f3a3a7ca2b49a0bb673d1a9a5120064 Mon Sep 17 00:00:00 2001
From: NotedSalmon <moreiraandre2001@gmail.com>
Date: Thu, 27 Jun 2024 13:45:03 +0100
Subject: [PATCH 2/3] FISH-8855 updated copyright.

---
 .../resources/org/glassfish/cluster/admingui/Strings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties b/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
index cfb7f14ffb5..d37d300ee58 100644
--- a/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
+++ b/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/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-2022] [Payara Foundation and/or its affiliates]
+# Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates]
 
 tree.clusters=Clusters (Deprecated)
 tree.dgs=Deployment Groups

From 712ec52fff620a1acba2735946192017bad276cf Mon Sep 17 00:00:00 2001
From: NotedSalmon <moreiraandre2001@gmail.com>
Date: Fri, 28 Jun 2024 12:38:43 +0100
Subject: [PATCH 3/3] FISH-8855 added a autoName.helpDg so the help text when
 creating a new deployment group is specific to deployment groups.

---
 appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf     | 2 +-
 .../org/glassfish/cluster/admingui/Strings.properties          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf b/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf
index 839c47d402f..661be3745e0 100644
--- a/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf
+++ b/appserver/admingui/cluster/src/main/resources/dg/dgNew.jsf
@@ -122,7 +122,7 @@
             <sun:property id="NameTextProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.dg.dgName}" >
                 <sun:textField id="NameText" text="#{pageSession.name}" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.dg.dgName']}" required="#{false}" />
             </sun:property>
-            <sun:property id="AutoNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.autoName}" helpText="$resource{i18ncs.autoName.help}" >
+            <sun:property id="AutoNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.autoName}" helpText="$resource{i18ncs.autoName.helpDg}" >
                 <sun:checkbox id="AutoName" selected="#{pageSession.autoNameSelected}" selectedValue="#{true}" />
             </sun:property> 
               <sun:property id="avaliableInstances" visible="#{pageSession.showInstancesSection}" labelAlign="left" noWrap="#{true}" overlapLabel="#{true}">
diff --git a/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties b/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
index d37d300ee58..27772368c42 100644
--- a/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
+++ b/appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
@@ -448,4 +448,5 @@ clusters.ejbTimers.TimerCountCol=Timer Count
 general.serverNameCol=Server Name
 
 autoName=Auto Name
-autoName.help=When enabled, will generate a name for your instance/deployment group if none is provided, or will otherwise resolve any name conflicts. 
+autoName.helpDg=When enabled, will generate a name for your deployment group if none is provided, or will otherwise resolve any name conflicts. 
+autoName.help=When enabled, will generate a name for your instance if none is provided, or will otherwise resolve any name conflicts.