From 175a6ee6b305eab85dca51a3605bd96c2d78a9cd Mon Sep 17 00:00:00 2001
From: EBIBO <stu995106@hotmail.com.tw>
Date: Tue, 4 Oct 2022 03:18:47 +0800
Subject: [PATCH] [JENKINS-69537] Collapsing build history widget throws error
 (#7121)

---
 .../resources/hudson/widgets/HistoryWidget/index.jelly     | 7 ++++---
 war/src/main/js/filter-build-history.js                    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
index f36fa46e094c..b5d7896a5c59 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
@@ -88,10 +88,11 @@ THE SOFTWARE.
 
       <st:include page="entries.jelly" it="${page}" />
 
-      <!--The value for `page-next-build` is modified inside of `entries.jelly` on render, so set the attribute-->
-      <!--after that component has been rendered to get the correct value to use in `filter-build-history.js`-->
-      <div id="properties" page-next-build="${it.nextBuildNumberToFetch ?: it.owner.nextBuildNumber}"/>
     </l:pane>
+
+    <!--The value for `page-next-build` is modified inside of `entries.jelly` on render, so set the attribute-->
+    <!--after that component has been rendered to get the correct value to use in `filter-build-history.js`-->
+    <div id="properties" page-next-build="${it.nextBuildNumberToFetch ?: it.owner.nextBuildNumber}"/>
   </div>
   <script src="${resURL}/jsbundles/filter-build-history.js" type="text/javascript"/>
 </j:jelly>
diff --git a/war/src/main/js/filter-build-history.js b/war/src/main/js/filter-build-history.js
index 47312e354636..dead1c078550 100644
--- a/war/src/main/js/filter-build-history.js
+++ b/war/src/main/js/filter-build-history.js
@@ -518,7 +518,7 @@ const debouncedFilter = debounce(handleFilter, 300);
 
 document.addEventListener("DOMContentLoaded", function () {
   // Apply correct styling upon filter bar text change, call API after wait
-  pageSearchInput.addEventListener("input", function () {
+  pageSearchInput?.addEventListener("input", function () {
     pageSearchInputContainer.classList.add("jenkins-search--loading");
     buildHistoryContainer.classList.add("jenkins-pane--loading");
     noBuildsBanner.style.display = "none";