From 5249d15fe2ab029ff231a8688e598b3fbc9714ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Smaga?= <mb.smaga@gmail.com>
Date: Wed, 8 Apr 2026 14:51:02 +0200
Subject: [PATCH] Support experimental Dashboard view (Jenkins 2.534+)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace global View/index.jelly override with class-specific
SectionedView/index.jelly. The global override was an anti-pattern that
affected all view types and prevented core's experimental dashboard UI
from activating.

The new template checks the newDashboardPage experimental flag:
- When enabled: delegates to core's new-view-page.jelly for the
  modern app bar layout with inline widgets
- When disabled: renders the classic layout without calling it.items
  (preserving the JENKINS-37174 performance fix)

Also guards viewTabs rendering in SectionedView/main.jelly behind the
dashboard flag check to prevent duplicate tab bars.

No minimum Jenkins version change required — the l:userExperimentalFlag
tag gracefully returns null on Jenkins < 2.534.

Fixes #84
---
 .../resources/hudson/model/View/index.jelly   | 58 ----------------
 .../sectioned_view/SectionedView/index.jelly  | 67 +++++++++++++++++++
 .../sectioned_view/SectionedView/main.jelly   | 26 ++++---
 3 files changed, 82 insertions(+), 69 deletions(-)
 delete mode 100644 src/main/resources/hudson/model/View/index.jelly
 create mode 100644 src/main/resources/hudson/plugins/sectioned_view/SectionedView/index.jelly

diff --git a/src/main/resources/hudson/model/View/index.jelly b/src/main/resources/hudson/model/View/index.jelly
deleted file mode 100644
index 9732984..0000000
--- a/src/main/resources/hudson/model/View/index.jelly
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Overriding https://github.com/jenkinsci/jenkins/blob/master/core/src/main/resources/hudson/model/View/index.jelly.
-
-  The changes are kept minimal for easier updates. https://issues.jenkins-ci.org/browse/JENKINS-37174
--->
-<?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-    <l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}" norefresh="${!it.automaticRefreshEnabled}">
-        <j:set var="view" value="${it}"/> <!-- expose view to the scripts we include from owner -->
-        <st:include page="sidepanel.jelly" />
-        <l:main-panel>
-            <st:include page="view-index-top.jelly" it="${it.owner}" optional="true">
-                <!-- allow the owner to take over the top section, but we also need the default to be backward compatible -->
-                <div id="view-message">
-                    <div id="systemmessage">
-                        <j:out value="${app.systemMessage!=null ? app.markupFormatter.translate(app.systemMessage) : ''}" />
-                    </div>
-                    <t:editableDescription permission="${it.CONFIGURE}"/>
-                </div>
-            </st:include>
-
-            <j:if test="${view.class.name!='hudson.plugins.sectioned_view.SectionedView'}">
-                <!-- Do not call this as it causes all sections to filter items for no reason. -->
-                <j:set var="items" value="${it.items}"/>
-            </j:if>
-            <st:include page="main.jelly" />
-        </l:main-panel>
-        <l:header>
-            <!-- for screen resolution detection -->
-          <script id="screenResolution-script" data-use-secure-cookie="${request.secure}"/>
-          <st:adjunct includes="hudson.model.View.screen-resolution"/>
-        </l:header>
-    </l:layout>
-</st:compress>
diff --git a/src/main/resources/hudson/plugins/sectioned_view/SectionedView/index.jelly b/src/main/resources/hudson/plugins/sectioned_view/SectionedView/index.jelly
new file mode 100644
index 0000000..717efb1
--- /dev/null
+++ b/src/main/resources/hudson/plugins/sectioned_view/SectionedView/index.jelly
@@ -0,0 +1,67 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  SectionedView-specific index page.
+
+  Classic mode: renders the standard layout without calling it.items (JENKINS-37174 fix —
+  each section computes its own items, so calling getItems() at page level is redundant).
+
+  Dashboard mode (Jenkins 2.534+): delegates to core's new-view-page.jelly which provides
+  the app bar, tabs, and inline widgets. The l:userExperimentalFlag tag gracefully returns
+  null on older Jenkins where the flag class does not exist.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+  <l:userExperimentalFlag var="newDashboardPage" flagClassName="jenkins.model.experimentalflags.NewDashboardPageUserExperimentalFlag" />
+
+  <j:choose>
+    <j:when test="${newDashboardPage}">
+      <st:include page="new-view-page.jelly" />
+    </j:when>
+    <j:otherwise>
+      <l:layout title="${it.displayName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}">
+        <j:set var="view" value="${it}"/>
+        <st:include page="sidepanel.jelly" />
+        <l:main-panel>
+          <st:include page="view-index-top.jelly" it="${it.owner}" optional="true">
+            <div id="view-message">
+              <div id="systemmessage">
+                <j:out value="${app.systemMessage!=null ? app.markupFormatter.translate(app.systemMessage) : ''}" />
+              </div>
+              <t:editableDescription permission="${it.CONFIGURE}"/>
+            </div>
+          </st:include>
+
+          <!-- JENKINS-37174: Do not call it.items — each section computes its own items -->
+          <st:include page="main.jelly" />
+        </l:main-panel>
+        <l:header>
+          <script id="screenResolution-script" data-use-secure-cookie="${request.secure}"/>
+          <st:adjunct includes="hudson.model.View.screen-resolution"/>
+        </l:header>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/sectioned_view/SectionedView/main.jelly b/src/main/resources/hudson/plugins/sectioned_view/SectionedView/main.jelly
index 469fe28..850b323 100644
--- a/src/main/resources/hudson/plugins/sectioned_view/SectionedView/main.jelly
+++ b/src/main/resources/hudson/plugins/sectioned_view/SectionedView/main.jelly
@@ -24,9 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <l:userExperimentalFlag var="newDashboardPage" flagClassName="jenkins.model.experimentalflags.NewDashboardPageUserExperimentalFlag" />
+
   <j:choose>
     <j:when test="${empty(it.sections)}">
-      <j:if test="${!empty(it.ownerItemGroup.items)}">
+      <j:if test="${!empty(it.ownerItemGroup.items) and !newDashboardPage}">
         <j:set var="views" value="${it.owner.views}"/>
         <j:set var="currentView" value="${it}"/>
         <st:include page="viewTabs.jelly" it="${it.owner.viewsTabBar}"/>
@@ -39,16 +41,18 @@ THE SOFTWARE.
       <t:setIconSize/>
       <div class="dashboard">
         <j:if test="${!empty(it.sections)}">
-          <j:set var="views" value="${it.owner.views}"/>
-          <j:set var="currentView" value="${it}"/>
-          <j:choose>
-            <j:when test="${it.owner.class.name=='hudson.model.MyViewsProperty'}">
-              <st:include page="myViewTabs.jelly" it="${it.owner.myViewsTabBar}"/>
-            </j:when>
-            <j:otherwise>
-              <st:include page="viewTabs.jelly" it="${it.owner.viewsTabBar}"/>
-            </j:otherwise>
-          </j:choose>
+          <j:if test="${!newDashboardPage}">
+            <j:set var="views" value="${it.owner.views}"/>
+            <j:set var="currentView" value="${it}"/>
+            <j:choose>
+              <j:when test="${it.owner.class.name=='hudson.model.MyViewsProperty'}">
+                <st:include page="myViewTabs.jelly" it="${it.owner.myViewsTabBar}"/>
+              </j:when>
+              <j:otherwise>
+                <st:include page="viewTabs.jelly" it="${it.owner.viewsTabBar}"/>
+              </j:otherwise>
+            </j:choose>
+          </j:if>
           <!-- project list -->
             <j:forEach var="section" items="${it.sections}">
               <div style="${section.css}">