Merge branch 'content-blocks' into ui-vertical-slice-5

Jenkinsfile

@@ -14,7 +14,7 @@ properties([
 
 def axes = [
   platforms: ['linux', 'windows'],
-  jdks: [11, 17, 19],
+  jdks: [11, 17, 21],
 ]
 
 stage('Record build') {

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5688.vb_f1ceb_4b_74c4
+export ATH_VERSION=5689.v4df8c8248244
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

core/src/main/java/hudson/Util.java

@@ -1927,4 +1927,29 @@ public static long daysElapsedSince(@NonNull Date date) {
     private static PathRemover newPathRemover(@NonNull PathRemover.PathChecker pathChecker) {
         return PathRemover.newFilteredRobustRemover(pathChecker, DELETION_RETRIES, GC_AFTER_FAILED_DELETE, WAIT_BETWEEN_DELETION_RETRIES);
     }
+
+    /**
+     * Returns SHA-256 Digest of input bytes
+     */
+    @Restricted(NoExternalUse.class)
+    public static byte[] getSHA256DigestOf(@NonNull byte[] input) {
+        try {
+                MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
+                messageDigest.update(input);
+                return messageDigest.digest();
+        } catch (NoSuchAlgorithmException noSuchAlgorithmException) {
+            throw new IllegalStateException("SHA-256 could not be instantiated, but is required to" +
+                    " be implemented by the language specification", noSuchAlgorithmException);
+        }
+    }
+
+    /**
+     * Returns Hex string of SHA-256 Digest of passed input
+     */
+    @Restricted(NoExternalUse.class)
+    public static String getHexOfSHA256DigestOf(byte[] input) throws IOException {
+        //get hex string of sha 256 of payload
+        byte[] payloadDigest = Util.getSHA256DigestOf(input);
+        return (payloadDigest != null) ? Util.toHexString(payloadDigest) : null;
+    }
 }

core/src/main/java/jenkins/security/ConfidentialStore.java

@@ -122,14 +122,16 @@ void clear() {
 
         @Override
         protected void store(ConfidentialKey key, byte[] payload) throws IOException {
-            LOGGER.fine(() -> "storing " + key.getId() + " " + Util.getDigestOf(Util.toHexString(payload)));
+            //called only from tests, get hex string of sha 256 for logging payload
+            LOGGER.fine("storing " + key.getId() + " " + Util.getHexOfSHA256DigestOf(payload));
             data.put(key.getId(), payload);
         }
 
         @Override
         protected byte[] load(ConfidentialKey key) throws IOException {
             byte[] payload = data.get(key.getId());
-            LOGGER.fine(() -> "loading " + key.getId() + " " + (payload != null ? Util.getDigestOf(Util.toHexString(payload)) : "null"));
+            //called only from tests, get hex string of sha 256 for logging payload
+            LOGGER.fine("loading " + key.getId() + " " + (payload != null ? Util.getHexOfSHA256DigestOf(payload) : "null"));
             return payload;
         }
 

core/src/main/resources/hudson/model/AllView/noJob.groovy

@@ -31,9 +31,7 @@ div {
                             a(href: "newJob", class: "content-block__link") {
                                 span(_("createJob"))
                                 span(class: "trailing-icon") {
-                                    l.icon(
-                                            class: "icon-md",
-                                            src: "symbol-arrow-right")
+                                    l.icon(src: "symbol-add")
                                 }
                             }
                         }
@@ -48,9 +46,7 @@ div {
                                 a(href: "computer/new", class: "content-block__link") {
                                     span(_("setUpAgent"))
                                     span(class: "trailing-icon") {
-                                        l.icon(
-                                                class: "icon-md",
-                                                src: "symbol-arrow-right")
+                                        l.icon(src: "symbol-computer")
                                     }
                                 }
                             }
@@ -60,9 +56,7 @@ div {
                                     a(href: "cloud/", class: "content-block__link") {
                                         span(_("setUpCloud"))
                                         span(class: "trailing-icon") {
-                                            l.icon(
-                                                    class: "icon-md",
-                                                    src: "symbol-arrow-right")
+                                            l.icon(src: "symbol-cloud")
                                         }
                                     }
                                 }
@@ -71,12 +65,10 @@ div {
                             li(class: "content-block") {
                                 a(href: "https://www.jenkins.io/redirect/distributed-builds",
                                         target: "_blank",
-                                        class: "content-block__link content-block__help-link") {
+                                        class: "content-block__link") {
                                     span(_("learnMoreDistributedBuilds"))
                                     span(class: "trailing-icon") {
-                                        l.icon(
-                                                class: "icon-md",
-                                                src: "symbol-link")
+                                        l.icon(src: "symbol-help-circle")
                                     }
                                 }
                             }

core/src/main/resources/hudson/model/View/main.groovy

@@ -22,4 +22,4 @@ if (items == null) {
             include(my.owner.viewsTabBar,"viewTabs")
         }
     }
-}
+}

core/src/main/resources/jenkins/agents/CloudSet/index.jelly

@@ -92,7 +92,7 @@ THE SOFTWARE.
                        class="content-block__link">
                       <span>${%newCloud}</span>
                       <span class="trailing-icon">
-                        <l:icon class="icon-md" src="symbol-arrow-right"/>
+                        <l:icon src="symbol-arrow-right"/>
                       </span>
                     </a>
                   </li>
@@ -102,17 +102,17 @@ THE SOFTWARE.
                      class="content-block__link">
                     <span>${%installCloudPlugin}</span>
                     <span class="trailing-icon">
-                      <l:icon class="icon-md" src="symbol-arrow-right"/>
+                      <l:icon src="symbol-plugins" />
                     </span>
                   </a>
                 </li>
                 <li class="content-block">
                   <a href="https://www.jenkins.io/redirect/distributed-builds"
-                     class="content-block__link content-block__help-link"
+                     class="content-block__link"
                      target="_blank" rel="noopener noreferrer">
                     <span>${%learnMoreDistributedBuilds}</span>
                     <span class="trailing-icon">
-                      <l:icon class="icon-md" src="symbol-link"/>
+                      <l:icon src="symbol-help-circle" />
                     </span>
                   </a>
                 </li>

core/src/test/java/hudson/UtilTest.java

@@ -28,6 +28,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -726,6 +727,24 @@ public void ifOverriddenFailure() {
         assertEquals("The class " + DerivedClassFailure.class.getName() + " must override at least one of the BaseClass.method methods", error.getMessage());
     }
 
+    @Test
+    public void testGetHexOfSHA256DigestOf() throws IOException {
+        byte[] input = new byte[] {12, 34, 16};
+        String str = Util.getHexOfSHA256DigestOf(input);
+        assertEquals(str, "134fefbd329986726407a5208107ef07c9e33da779f5068bff191733268fe997");
+    }
+
+    @Test
+    public void testGetSHA256DigestOf() {
+        byte[] input = new byte[] {12, 34, 16};
+        byte[] sha256DigestActual = Util.getSHA256DigestOf(input);
+
+        byte[] expected = new byte[]
+                { 19, 79, -17, -67, 50, -103, -122, 114, 100, 7, -91, 32, -127, 7, -17, 7, -55, -29, 61, -89, 121, -11,
+                6, -117, -1, 25, 23, 51, 38, -113, -23, -105};
+        assertArrayEquals(expected, sha256DigestActual);
+    }
+
     public static class BaseClass {
         protected String method() {
             return "base";

pom.xml

@@ -95,7 +95,7 @@ THE SOFTWARE.
 
     <access-modifier.version>1.32</access-modifier.version>
     <antlr.version>4.13.0</antlr.version>
-    <bridge-method-injector.version>1.27</bridge-method-injector.version>
+    <bridge-method-injector.version>1.28</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
     <winstone.version>6.12</winstone.version>

test/pom.xml

@@ -185,7 +185,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>cloudbees-folder</artifactId>
-      <version>6.815.v0dd5a_cb_40e0e</version>
+      <version>6.846.v23698686f0f6</version>
       <scope>test</scope>
     </dependency>
     <dependency>

war/package.json

@@ -23,9 +23,9 @@
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
-    "@babel/cli": "7.22.9",
-    "@babel/core": "7.22.9",
-    "@babel/preset-env": "7.22.9",
+    "@babel/cli": "7.22.10",
+    "@babel/core": "7.22.10",
+    "@babel/preset-env": "7.22.10",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "6.8.1",

war/src/main/scss/abstracts/mixins.scss

@@ -70,6 +70,10 @@
     box-shadow: 0 0 0 0.66rem transparent;
   }
 
+  &:focus-visible {
+    outline: none;
+  }
+
   &:not(:disabled) {
     &:hover,
     &:focus-visible {

war/src/main/scss/base/style.scss

@@ -128,6 +128,7 @@ a {
   svg {
     width: 16px;
     height: 16px;
+    flex: 0 0 auto;
     color: var(--text-color) !important;
   }
 }

war/src/main/scss/modules/content-blocks.scss

@@ -1,81 +1,50 @@
 @use "../abstracts/mixins";
 
-.content-block {
-  border-radius: 4px;
-  border: 2px solid var(--light-grey);
-}
-
-.content-block__body {
-  padding: 1.5rem;
-}
-
-.content-block__body > *:first-child {
-  margin-top: 0;
-}
-
-.content-block__body > *:last-child {
-  margin-bottom: 0;
-}
-
-.content-block__footer {
-  background-color: var(--light-grey);
-  padding: 0.5rem 1.5rem;
-}
-
-.content-block__link-list {
-  padding: 0;
-}
-
-.content-block__link-list li {
-  list-style: none;
-  width: 100%;
-
-  &:not(:last-child) {
-    margin-bottom: 0.75rem;
-  }
-}
-
 .content-block__link {
-  padding: 0.5rem 1rem;
+  @include mixins.item;
+
   display: flex;
   justify-content: space-between;
-  background-color: var(--light-grey);
-
-  @include mixins.link-dark;
-
-  &:focus {
-    outline-color: var(--focus);
+  align-items: center;
+  padding: 0.75rem 1.1rem;
+  color: var(--text-color) !important;
+  font-weight: 500;
+  text-decoration: none !important;
+
+  &::before {
+    background: var(--button-background);
   }
 
-  .trailing-icon .svg-icon {
-    &.icon-sm {
-      height: 1.25rem;
+  .trailing-icon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 1.25rem;
+    height: 1.25rem;
+
+    svg {
       width: 1.25rem;
+      height: 1.25rem;
     }
   }
 }
 
-.content-block__help-link {
-  background-color: var(--white);
-}
-
-// Empty state specific blocks
-
 .empty-state-block {
   max-width: 600px;
   margin: 0 auto;
-  margin-top: 1.5rem;
 }
 
 .empty-state-section {
-  margin-top: 2rem;
+  margin-top: var(--section-padding);
 }
 
 .empty-state-section-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0.625rem;
   padding: 0;
 
   li {
     list-style: none;
-    margin-bottom: 1rem;
   }
 }