Integrate with Prism API plugin (#2342)

jenkinsci · Sep 26, 2023 · 09593e8 · 09593e8
1 parent c46591f
commit 09593e8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 136 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -78,6 +78,11 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>commons-text-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>prism-api</artifactId>
+      <version>1.29.0-8</version>
+    </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>snakeyaml-api</artifactId>

diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java b/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java
@@ -31,6 +31,7 @@
 import io.jenkins.plugins.casc.model.Source;
 import io.jenkins.plugins.casc.yaml.YamlSource;
 import io.jenkins.plugins.casc.yaml.YamlUtils;
+import io.jenkins.plugins.prism.PrismConfiguration;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -484,6 +485,11 @@ public void doViewExport(StaplerRequest req, StaplerResponse res) throws Excepti
         req.getView(this, "viewExport.jelly").forward(req, res);
     }
 
+    @Restricted(NoExternalUse.class)
+    public PrismConfiguration getPrismConfiguration() {
+        return PrismConfiguration.getInstance();
+    }
+
     @Restricted(NoExternalUse.class)
     public void doReference(StaplerRequest req, StaplerResponse res) throws Exception {
         if (!Jenkins.get().hasPermission(Jenkins.SYSTEM_READ)) {

diff --git a/plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/viewExport.jelly b/plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/viewExport.jelly
@@ -1,11 +1,11 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
-  <l:layout norefresh="true" type="one-column" title="${%Configuration as Code}">
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler" xmlns:p="/prism">
+  <l:layout type="one-column" title="${%Configuration as Code}">
+    <l:breadcrumb title="${%View}" />
   <l:main-panel>
-    <st:adjunct includes="
-      io.jenkins.plugins.casc.assets.prism,
-      io.jenkins.plugins.casc.assets.viewExport"
-    />
+    <st:adjunct includes="io.jenkins.plugins.casc.assets.viewExport" />
+
+    <p:prism configuration="${it.prismConfiguration}" />
     <pre>
       <code class="language-yaml">${export}</code>
     </pre>

diff --git a/plugin/src/main/resources/io/jenkins/plugins/casc/assets/prism.css b/plugin/src/main/resources/io/jenkins/plugins/casc/assets/prism.css
diff --git a/plugin/src/main/resources/io/jenkins/plugins/casc/assets/prism.js b/plugin/src/main/resources/io/jenkins/plugins/casc/assets/prism.js