From 7de1e3a6be2a5838eef5add48c23a910916eff12 Mon Sep 17 00:00:00 2001
From: Yaroslav Afenkin <91559310+yaroslavafenkin@users.noreply.github.com>
Date: Tue, 3 Dec 2024 14:40:19 +0200
Subject: [PATCH] [JENKINS-74111][JENKINS-74112][JENKINS-74113][JENKINS-74114]
 Make plugin CSP compatible

---
 .../rayh/DeveloperProfileLoader/config.jelly   | 15 +++------------
 .../au/com/rayh/ExportIpa/config.jelly         | 18 +++++-------------
 .../com/rayh/KeychainUnlockStep/config.jelly   | 15 +++------------
 .../au/com/rayh/XCodeBuilder/config.jelly      | 18 +++++-------------
 .../au/com/rayh/show-hide-attr-input.js        | 15 +++++++++++++++
 5 files changed, 31 insertions(+), 50 deletions(-)
 create mode 100644 src/main/resources/au/com/rayh/show-hide-attr-input.js

diff --git a/src/main/resources/au/com/rayh/DeveloperProfileLoader/config.jelly b/src/main/resources/au/com/rayh/DeveloperProfileLoader/config.jelly
index c0d93401..c6ff4d77 100644
--- a/src/main/resources/au/com/rayh/DeveloperProfileLoader/config.jelly
+++ b/src/main/resources/au/com/rayh/DeveloperProfileLoader/config.jelly
@@ -23,17 +23,7 @@
   ~ THE SOFTWARE.
   -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:html="jelly:html">
-    <![CDATA[
-		<script type="text/javascript">
-		<!--
-			var showOrHideAttributeInput = function(prefix, uuid) {
-				var defaultChosen = (document.getElementById(prefix + uuid).selectedIndex == 0);
-
-				document.getElementById("" + uuid).style.display = defaultChosen ? "block" : "none";
-			};
-		-->
-		</script>
-	]]>
+    <st:adjunct includes="au.com.rayh.show-hide-attr-input"/>
 
     <!-- General build settings -->
 	<j:invokeStatic var="developerProfiles" className="au.com.rayh.DeveloperProfile" method="getAllProfiles"/>
@@ -59,7 +49,8 @@
                 <j:set var="UUID" value="${descriptor.UUID}" />
 		        <j:invokeStatic var="keychainPasswordAndPaths" className="au.com.rayh.KeychainPasswordAndPathImpl" method="getAllKeycainInfo"/>
                 <f:entry title="${%Target keychain}" description="${%The combination of path and password defined in 'Credentials' for unlocking the keychain that imports the developer profile.}" field="targetKeychains" help="/plugin/xcode-plugin/help/help-importKeychainId.html">
-                    <select class="setting-input" name="keychainId" foo="${UID}" id="global-keychain-select-${UUID}" onchange="showOrHideAttributeInput('global-keychain-select-', '${UUID}')">
+                    <select class="setting-input xcode-show-hide-attr-input" name="keychainId" foo="${UID}" id="global-keychain-select-${UUID}"
+                            data-prefix="global-keychain-select-" data-uuid="${UUID}">
                         <f:option selected="${instance.keychainId==null}" value="">${%none} (${%specify one below})</f:option>
 
                         <j:forEach var="keychain" items="${keychainPasswordAndPaths}">
diff --git a/src/main/resources/au/com/rayh/ExportIpa/config.jelly b/src/main/resources/au/com/rayh/ExportIpa/config.jelly
index d1d55704..7caa1758 100644
--- a/src/main/resources/au/com/rayh/ExportIpa/config.jelly
+++ b/src/main/resources/au/com/rayh/ExportIpa/config.jelly
@@ -23,17 +23,7 @@
   ~ THE SOFTWARE.
   -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:html="jelly:html">
-    <![CDATA[
-		<script type="text/javascript">
-		<!--
-			var showOrHideAttributeInput = function(prefix, uuid) {
-				var defaultChosen = (document.getElementById(prefix + uuid).selectedIndex == 0);
-
-				document.getElementById("" + uuid).style.display = defaultChosen ? "block" : "none";
-			};
-		-->
-		</script>
-	]]>
+    <st:adjunct includes="au.com.rayh.show-hide-attr-input"/>
 
     <!-- General export settings -->
     <f:section title="${%General export settings}">
@@ -41,7 +31,8 @@
             <j:set var="UUID" value="${descriptor.UUID}" />
             <f:entry title="${%Development Team}" description="${%Override the Development Team specified in the project.}" field="globalDevelopmentTeam"
                 help="/plugin/xcode-plugin/help/help-globalDevelopmentTeam.html" >
-                <select class="setting-input" name="developmentTeamName" foo="${UID}" id="global-team-select-${UUID}" onchange="showOrHideAttributeInput('global-team-select-', '${UUID}')">
+                <select class="setting-input xcode-show-hide-attr-input" name="developmentTeamName" foo="${UID}" id="global-team-select-${UUID}"
+                        data-prefix="global-team-select-" data-uuid="${UUID}">
                     <f:option selected="${instance.developmentTeamName==null}" value="">${%none} (${%specify one below})</f:option>
 
                     <j:forEach var="team" items="${descriptor.globalConfiguration.teams}">
@@ -208,7 +199,8 @@
                 <f:optionalBlock inline="true" checked="${instance.unlockKeychain == true}" field="unlockKeychain" title="${%Unlock Keychain?}" help="/plugin/xcode-plugin/help/help-unlockKeychain.html">
 		    <j:set var="UUID" value="${descriptor.UUID}" />
                     <f:entry title="${%Keychain}" description="${%The globally configured keychain to unlock for this build.}" field="globalKeychainName" help="/plugin/xcode-plugin/help/help-globalKeychainName.html">
-                        <select class="setting-input" name="keychainName" foo="${UID}" id="global-keychain-select-${UUID}" onchange="showOrHideAttributeInput('global-keychain-select-', '${UUID}')">
+                        <select class="setting-input xcode-show-hide-attr-input" name="keychainName" foo="${UID}" id="global-keychain-select-${UUID}"
+                                data-prefix="global-keychain-select-" data-uuid="${UUID}">
                             <f:option selected="${instance.keychainName==null}" value="">${%none} (${%specify one below})</f:option>
 
                             <j:forEach var="keychain" items="${descriptor.globalConfiguration.keychains}">
diff --git a/src/main/resources/au/com/rayh/KeychainUnlockStep/config.jelly b/src/main/resources/au/com/rayh/KeychainUnlockStep/config.jelly
index efaa8665..a57c527b 100644
--- a/src/main/resources/au/com/rayh/KeychainUnlockStep/config.jelly
+++ b/src/main/resources/au/com/rayh/KeychainUnlockStep/config.jelly
@@ -23,17 +23,7 @@
   ~ THE SOFTWARE.
   -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:html="jelly:html">
-    <![CDATA[
-		<script type="text/javascript">
-		<!--
-			var showOrHideAttributeInput = function(prefix, uuid) {
-				var defaultChosen = (document.getElementById(prefix + uuid).selectedIndex == 0);
-
-				document.getElementById("" + uuid).style.display = defaultChosen ? "block" : "none";
-			};
-		-->
-		</script>
-	]]>
+    <st:adjunct includes="au.com.rayh.show-hide-attr-input"/>
 
     <!-- General build settings -->
     <f:entry>
@@ -46,7 +36,8 @@
 		<j:set var="UUID" value="${descriptor.UUID}" />
         <f:entry title="${%Keychain}" description="${%The combination of path and password defined in 'Credentials' for unlocking the keychain used in this build.}" field="credentialKeychainId" help="/plugin/xcode-plugin/help/help-credentialKeychainId.html">
             <j:invokeStatic var="keychainPasswordAndPaths" className="au.com.rayh.KeychainPasswordAndPathImpl" method="getAllKeycainInfo"/>
-            <select class="setting-input" name="keychainId" foo="${UID}" id="credential-keychain-select-${UUID}" onchange="showOrHideAttributeInput('credential-keychain-select-', '${UUID}')">
+            <select class="setting-input xcode-show-hide-attr-input" name="keychainId" foo="${UID}" id="credential-keychain-select-${UUID}"
+                    data-prefix="credential-keychain-select-" data-uuid="${UUID}">
                 <f:option selected="${instance.keychainId==null}" value="">${%none} (${%specify one below})</f:option>
                 <j:forEach var="keychain" items="${keychainPasswordAndPaths}">
                     <j:if test="${keychain.getId()==instance.keychainId}">
diff --git a/src/main/resources/au/com/rayh/XCodeBuilder/config.jelly b/src/main/resources/au/com/rayh/XCodeBuilder/config.jelly
index b96a5125..7e1fb616 100644
--- a/src/main/resources/au/com/rayh/XCodeBuilder/config.jelly
+++ b/src/main/resources/au/com/rayh/XCodeBuilder/config.jelly
@@ -23,17 +23,7 @@
   ~ THE SOFTWARE.
   -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:html="jelly:html">
-    <![CDATA[
-		<script type="text/javascript">
-		<!--
-			var showOrHideAttributeInput = function(prefix, uuid) {
-				var defaultChosen = (document.getElementById(prefix + uuid).selectedIndex == 0);
-
-				document.getElementById("" + uuid).style.display = defaultChosen ? "block" : "none";
-			};
-		-->
-		</script>
-	]]>
+    <st:adjunct includes="au.com.rayh.show-hide-attr-input"/>
 
     <!-- General build settings -->
     <f:section title="${%General build settings}">
@@ -41,7 +31,8 @@
             <j:set var="UUID" value="${descriptor.UUID}" />
             <f:entry title="${%Development Team}" description="${%Override the Development Team specified in the project.}" field="globalDevelopmentTeam"
                 help="/plugin/xcode-plugin/help/help-globalDevelopmentTeam.html" >
-                <select class="setting-input" name="developmentTeamName" foo="${UID}" id="global-team-select-${UUID}" onchange="showOrHideAttributeInput('global-team-select-', '${UUID}')">
+                <select class="setting-input xcode-show-hide-attr-input" name="developmentTeamName" foo="${UID}" id="global-team-select-${UUID}"
+                        data-prefix="global-team-select-" data-uuid="${UUID}">
                     <f:option selected="${instance.developmentTeamName==null}" value="">${%none} (${%specify one below})</f:option>
 
                     <j:forEach var="team" items="${descriptor.globalConfiguration.teams}">
@@ -280,7 +271,8 @@
 		            <j:set var="UUID" value="${descriptor.UUID}" />
                     <f:entry title="${%Keychain}" description="${%The combination of path and password defined in 'Credentials' for unlocking the keychain used in this build.}" field="credentialKeychainId" help="/plugin/xcode-plugin/help/help-credentialKeychainId.html">
                         <j:invokeStatic var="keychainPasswordAndPaths" className="au.com.rayh.KeychainPasswordAndPathImpl" method="getAllKeycainInfo"/>
-                        <select class="setting-input" name="keychainId" foo="${UID}" id="credential-keychain-select-${UUID}" onchange="showOrHideAttributeInput('credential-keychain-select-', '${UUID}')">
+                        <select class="setting-input xcode-show-hide-attr-input" name="keychainId" foo="${UID}" id="credential-keychain-select-${UUID}"
+                                data-prefix="credential-keychain-select-" data-uuid="${UUID}">
                             <f:option selected="${instance.keychainId==null}" value="">${%none} (${%specify one below})</f:option>
                                 <j:forEach var="keychain" items="${keychainPasswordAndPaths}">
                                     <j:if test="${keychain.getId()==instance.keychainId}">
diff --git a/src/main/resources/au/com/rayh/show-hide-attr-input.js b/src/main/resources/au/com/rayh/show-hide-attr-input.js
new file mode 100644
index 00000000..a161a2a7
--- /dev/null
+++ b/src/main/resources/au/com/rayh/show-hide-attr-input.js
@@ -0,0 +1,15 @@
+if (window["showOrHideAttributeInput"] === undefined) {
+    window.showOrHideAttributeInput = (prefix, uuid) => {
+        const defaultChosen = (document.getElementById(prefix + uuid).selectedIndex == 0);
+
+        document.getElementById("" + uuid).style.display = defaultChosen ? "block" : "none";
+    };
+}
+
+Behaviour.specify("SELECT.xcode-show-hide-attr-input", "xcode-show-hide-attr-input", 0, (element) => {
+    element.addEventListener("change", (event) => {
+        const { prefix, uuid } = event.target.dataset;
+
+        showOrHideAttributeInput(prefix, uuid);
+    });
+});