From 423c2061110938b20a47c152d8f177ffbd9e7249 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Thu, 2 May 2024 15:16:22 +0200
Subject: [PATCH 1/4] use header taglib

by using the header taglib any changes done there e.g. in the searchbox
or the login, are automatically reused and double maintenance is
avoided.
 Please enter the commit message for your changes. Lines starting
---
 pom.xml                                       |  2 +-
 .../headers/LogoHeader.java                   |  9 +--
 .../CustomHeaderDecorator/header.jelly        |  1 -
 .../headers/JenkinsHeader/headerContent.jelly | 10 ++-
 .../headers/LogoHeader/headerContent.jelly    | 61 +------------------
 5 files changed, 14 insertions(+), 69 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c9ba7c..d85131c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.440.2</jenkins.version>
+    <jenkins.version>2.457-SNAPSHOT</jenkins.version>
     <gitHubRepo>jenkinsci/customizable-header-plugin</gitHubRepo>
     <node.version>20.8.0</node.version>
     <yarn.version>1.22.19</yarn.version>
diff --git a/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java b/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java
index f39af69..fdc54a4 100644
--- a/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java
+++ b/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java
@@ -6,10 +6,10 @@
 import io.jenkins.plugins.customizable_header.logo.Logo;
 import java.io.IOException;
 import java.io.StringWriter;
-import jenkins.views.PartialHeader;
+import jenkins.views.FullHeader;
 
 @Extension(ordinal = 99999)
-public class LogoHeader extends PartialHeader implements SystemMessageProvider {
+public class LogoHeader extends FullHeader implements SystemMessageProvider {
 
   @Override
   public boolean isEnabled() {
@@ -37,9 +37,4 @@ public boolean hasLinks() {
   public Logo getLogo() {
     return CustomHeaderConfiguration.get().getLogo();
   }
-
-  @Override
-  public int getSupportedHeaderVersion() {
-    return 1;
-  }
 }
diff --git a/src/main/resources/io/jenkins/plugins/customizable_header/CustomHeaderDecorator/header.jelly b/src/main/resources/io/jenkins/plugins/customizable_header/CustomHeaderDecorator/header.jelly
index 0b37f9b..483260e 100644
--- a/src/main/resources/io/jenkins/plugins/customizable_header/CustomHeaderDecorator/header.jelly
+++ b/src/main/resources/io/jenkins/plugins/customizable_header/CustomHeaderDecorator/header.jelly
@@ -14,6 +14,5 @@
     <j:if test="${it.hasLinks()}">
       <script src="${rootURL}/plugin/customizable-header/js/bundles/app-nav.js" type="text/javascript"></script>
     </j:if>
-    <script src="${resURL}/jsbundles/keyboard-shortcuts.js" type="text/javascript"></script>
   </j:if>
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly b/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly
index 6dfe87c..7e2464d 100644
--- a/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly
+++ b/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly
@@ -1,6 +1,12 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
-    <st:include page="headerContent" class="jenkins.views.JenkinsHeader"/>
+<j:jelly xmlns:j="jelly:core" xmlns:h="/lib/layout/header">
+
+  <header>
+    <h:logo/>
+    <h:searchbox/>
+    <h:login/>
+  </header>
+
     <j:if test="${it.systemMessage != ''}">
         <div class="alert alert-${it.systemMessageColor} custom-header__system-message-header">
             <j:out value="${it.systemMessage}"/>
diff --git a/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly b/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly
index ea4d325..437d222 100644
--- a/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly
+++ b/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:h="/lib/layout/header">
   <template id="custom-header-icons">
     <l:icon id="external-link" src="symbol-open-outline plugin-ionicons-api" class="icon-xs"/>
   </template>
@@ -21,63 +21,8 @@
       <j:out value="${it.title}"/>
     </div>
 
-    <div class="searchbox hidden-xs">
-      <!-- search box -->
-      <j:set var="searchURL" value="${h.searchURL}"/>
-      <form action="${searchURL}" method="get" style="position:relative;" class="no-json" name="search" role="search">
-        <!-- this div is used to calculate the width of the text box -->
-        <div id="search-box-sizer"/>
-        <div id="searchform">
-          <input name="q" placeholder="${searchPlaceholder}" id="search-box" class="main-search__input" value="${request.getParameter('q')}"
-                 role="searchbox"/>
-
-          <span class="main-search__icon-leading">
-            <l:icon src="symbol-search"/>
-          </span>
-          <a href="${searchHelpUrl}" class="main-search__icon-trailing">
-            <l:icon src="symbol-help-circle"/>
-          </a>
-
-          <div id="search-box-completion" data-search-url="${searchURL}"/>
-          <st:adjunct includes="jenkins.views.JenkinsHeader.search-box"/>
-        </div>
-      </form>
-    </div>
-
-    <div class="login page-header__hyperlinks">
-      <div id="visible-am-insertion" class="page-header__am-wrapper"/>
-      <div id="visible-sec-am-insertion" class="page-header__am-wrapper"/>
-
-      <!-- login field -->
-      <j:if test="${app.useSecurity}">
-        <j:choose>
-          <j:when test="${!h.isAnonymous()}">
-            <j:invokeStatic var="user" className="hudson.model.User" method="current"/>
-            <j:choose>
-              <j:when test="${user.fullName == null || user.fullName.trim().isEmpty()}">
-                <j:set var="userName" value="${user.id}"/>
-              </j:when>
-              <j:otherwise>
-                <j:set var="userName" value="${user.fullName}"/>
-              </j:otherwise>
-            </j:choose>
-            <a href="${rootURL}/${user.url}" class="model-link">
-              <l:icon src="symbol-person-circle" class="icon-md"/>
-              <span class="hidden-xs hidden-sm">${userName}</span>
-            </a>
-            <j:if test="${app.securityRealm.canLogOut()}">
-              <a href="${rootURL}/logout">
-                <l:icon src="symbol-log-out" class="icon-md"/>
-                <span class="hidden-xs hidden-sm">${logout}</span>
-              </a>
-            </j:if>
-          </j:when>
-          <j:otherwise>
-            <st:include it="${app.securityRealm}" page="loginLink.jelly"/>
-          </j:otherwise>
-        </j:choose>
-      </j:if>
-    </div>
+    <h:searchbox/>
+    <h:login/>
   </header>
   <j:if test="${it.systemMessage != ''}">
     <div class="alert alert-${it.systemMessageColor} custom-header__system-message-header">

From ac8a876d77d3dbb12f3178d930b0b8877853b933 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Tue, 21 May 2024 19:30:22 +0100
Subject: [PATCH 2/4] Apply suggestions from code review

---
 pom.xml                                                         | 2 +-
 .../headers/JenkinsHeader/headerContent.jelly                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d85131c..019facf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.457-SNAPSHOT</jenkins.version>
+    <jenkins.version>2.459</jenkins.version>
     <gitHubRepo>jenkinsci/customizable-header-plugin</gitHubRepo>
     <node.version>20.8.0</node.version>
     <yarn.version>1.22.19</yarn.version>
diff --git a/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly b/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly
index 7e2464d..88d21da 100644
--- a/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly
+++ b/src/main/resources/io/jenkins/plugins/customizable_header/headers/JenkinsHeader/headerContent.jelly
@@ -1,7 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:h="/lib/layout/header">
 
-  <header>
+  <header id="page-header" class="page-header">
     <h:logo/>
     <h:searchbox/>
     <h:login/>

From 10dc4082078e13755178369380c165e16569ddf0 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Tue, 21 May 2024 19:45:52 +0100
Subject: [PATCH 3/4] Update headerContent.jelly

---
 .../customizable_header/headers/LogoHeader/headerContent.jelly  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly b/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly
index 437d222..70a32e6 100644
--- a/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly
+++ b/src/main/resources/io/jenkins/plugins/customizable_header/headers/LogoHeader/headerContent.jelly
@@ -3,7 +3,7 @@
   <template id="custom-header-icons">
     <l:icon id="external-link" src="symbol-open-outline plugin-ionicons-api" class="icon-xs"/>
   </template>
-  <header id="header" class="page-header custom-header__page">
+  <header id="page-header" class="page-header custom-header__page">
     <j:if test="${it.hasLinks()}">
       <div class="custom-header__app-nav">
         <button class="custom-header__app-nav-button" data-href="${rootURL}/customizable-header/getLinks">

From 426dd1f70b5145450421356051e5498fca2a4e2d Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 13 Jul 2024 13:52:50 +0200
Subject: [PATCH 4/4] stay with partial header

---
 .../plugins/customizable_header/headers/LogoHeader.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java b/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java
index fdc54a4..f39af69 100644
--- a/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java
+++ b/src/main/java/io/jenkins/plugins/customizable_header/headers/LogoHeader.java
@@ -6,10 +6,10 @@
 import io.jenkins.plugins.customizable_header.logo.Logo;
 import java.io.IOException;
 import java.io.StringWriter;
-import jenkins.views.FullHeader;
+import jenkins.views.PartialHeader;
 
 @Extension(ordinal = 99999)
-public class LogoHeader extends FullHeader implements SystemMessageProvider {
+public class LogoHeader extends PartialHeader implements SystemMessageProvider {
 
   @Override
   public boolean isEnabled() {
@@ -37,4 +37,9 @@ public boolean hasLinks() {
   public Logo getLogo() {
     return CustomHeaderConfiguration.get().getLogo();
   }
+
+  @Override
+  public int getSupportedHeaderVersion() {
+    return 1;
+  }
 }