[JENKINS-72854] UX improvement: make pod templates readonly from UI f…

…or NonConfigurableKubernetesCloud (#1566) Co-authored-by: Vincent Latombe <[email protected]>
jenkinsci · Jun 5, 2024 · d4efa21 · d4efa21
1 parent 41b3ef1
commit d4efa21
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/NonConfigurableKubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/NonConfigurableKubernetesCloud.java
@@ -5,6 +5,8 @@
 import hudson.model.Descriptor;
 import hudson.model.DescriptorVisibilityFilter;
 import hudson.slaves.Cloud;
+import java.util.List;
+import java.util.stream.Collectors;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
@@ -28,6 +30,14 @@ public Cloud reconfigure(@NonNull StaplerRequest req, JSONObject form) throws De
         return DescriptorImpl.class.cast(getDescriptor()).newInstance(req, form);
     }
 
+    @NonNull
+    @Override
+    public List<PodTemplate> getTemplates() {
+        return super.getTemplates().stream()
+                .peek(podTemplate -> podTemplate.setReadonlyFromUi(true))
+                .collect(Collectors.toList());
+    }
+
     @Extension
     public static class FilterImpl extends DescriptorVisibilityFilter {
         @Override

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java
@@ -190,6 +190,8 @@ protected static MessageDigest getLabelDigestFunction() {
      */
     private transient List<String> yamls;
 
+    private transient boolean readonlyFromUi;
+
     @NonNull
     public String getId() {
         return id;
@@ -1049,6 +1051,14 @@ private void optionalField(StringBuilder builder, String label, String value) {
     @Override
     public void save() {}
 
+    public boolean isReadonlyFromUi() {
+        return readonlyFromUi;
+    }
+
+    public void setReadonlyFromUi(boolean readonlyFromUi) {
+        this.readonlyFromUi = readonlyFromUi;
+    }
+
     @Extension
     public static class DescriptorImpl extends Descriptor<PodTemplate> {
 

diff --git a/src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/index.jelly b/src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/index.jelly
@@ -29,14 +29,20 @@ THE SOFTWARE.
       <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
         <j:set var="instance" value="${it}"/>
         <j:set var="descriptor" value="${instance.descriptor}"/>
+        <j:set var="readOnlyMode" value="${instance.readonlyFromUi}"/>
+        <j:if test="${instance.readonlyFromUi}">
+          <f:description>This Pod template is associated with a <strong>non-configurable</strong> cloud setup.</f:description>
+        </j:if>
 
         <!-- main body of the configuration -->
         <st:include it="${instance}" page="config.jelly"/>
 
         <l:hasAdministerOrManage>
-          <f:bottomButtonBar>
-            <f:submit value="${%Save}"/>
-          </f:bottomButtonBar>
+          <j:if test="${!instance.readonlyFromUi}">
+            <f:bottomButtonBar>
+              <f:submit value="${%Save}"/>
+            </f:bottomButtonBar>
+          </j:if>
         </l:hasAdministerOrManage>
       </f:form>
       <l:hasAdministerOrManage>

diff --git a/src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/sidepanel.jelly b/src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/sidepanel.jelly
@@ -24,7 +24,9 @@ THE SOFTWARE.
         <l:tasks>
             <l:task href="" icon="symbol-settings"
                     title="${app.hasPermission(app.MANAGE) ? '%Configure' : '%View Configuration'}"/>
-            <l:delete permission="${app.MANAGE}" title="${%Delete Pod Template}" message="${%delete.template(it.name)}"/>
+            <j:if test="${!it.readonlyFromUi}">
+                <l:delete permission="${app.MANAGE}" title="${%Delete Pod Template}" message="${%delete.template(it.name)}"/>
+            </j:if>
             <t:actions />
         </l:tasks>
     </l:side-panel>