[JENKINS-69537] Collapsing build history widget throws error (#7121)

jenkinsci · Oct 3, 2022 · 175a6ee · 175a6ee
1 parent dc42263
commit 175a6ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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";