Enable new Manage Jenkins UI by default

core/src/main/java/hudson/Functions.java

@@ -86,6 +86,7 @@
 import hudson.tasks.Publisher;
 import hudson.tasks.UserAvatarResolver;
 import hudson.util.Area;
+import hudson.util.FormApply;
 import hudson.util.FormValidation.CheckMethod;
 import hudson.util.HudsonIsLoading;
 import hudson.util.HudsonIsRestarting;
@@ -217,6 +218,11 @@ public class Functions {
     public Functions() {
     }
 
+    @Restricted(NoExternalUse.class)
+    public @CheckForNull FormApply.Notification getFormApplyNotification() {
+        return FormApply.getAndClearNotification(Stapler.getCurrentRequest2());
+    }
+
     /**
      * Generates an unique ID.
      */

core/src/main/java/hudson/security/GlobalSecurityConfiguration.java

@@ -108,7 +108,7 @@ public synchronized void doConfigure(StaplerRequest2 req, StaplerResponse2 rsp)
             boolean result = configure(req, json);
             LOGGER.log(Level.FINE, "security saved: " + result);
             Jenkins.get().save();
-            FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
+            FormApply.success(req.getContextPath() + "/manage/" + getUrlName()).generateResponse(req, rsp, null);
         } catch (JSONException x) {
             LOGGER.warning(() -> "Bad JSON:\n" + json.toString(2));
             throw x;

core/src/main/java/hudson/util/FormApply.java

@@ -24,8 +24,10 @@
 
 package hudson.util;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Functions;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponses.HttpResponseException;
@@ -40,6 +42,9 @@
  * @since 1.453
  */
 public class FormApply {
+    private static final String NOTIFICATION_MESSAGE_SESSION_ATTRIBUTE = FormApply.class.getName() + ".notificationMessage";
+    private static final String NOTIFICATION_TYPE_SESSION_ATTRIBUTE = FormApply.class.getName() + ".notificationType";
+
     /**
      * Generates the response for the form submission in such a way that it handles the "apply" button
      * correctly.
@@ -56,6 +61,7 @@
                     showNotification(Messages.HttpResponses_Saved(), NotificationType.SUCCESS)
                             .generateResponse(req, rsp, node);
                 } else {
+                    setNotificationInSession(req, Messages.HttpResponses_Saved(), NotificationType.SUCCESS);
                     rsp.sendRedirect(destination);
                 }
             }
@@ -127,6 +133,52 @@
         };
     }
 
+    private static void setNotificationInSession(StaplerRequest2 req, String message, NotificationType notificationType) {
+        HttpSession session = req.getSession();
+        session.setAttribute(NOTIFICATION_MESSAGE_SESSION_ATTRIBUTE, message);
+        session.setAttribute(NOTIFICATION_TYPE_SESSION_ATTRIBUTE, notificationType.name());
+    }
+
+    public static @CheckForNull Notification getAndClearNotification(StaplerRequest2 req) {
+        HttpSession session = req.getSession(false);
+        if (session == null) {
+            return null;
+        }
+
+        String message = (String) session.getAttribute(NOTIFICATION_MESSAGE_SESSION_ATTRIBUTE);
+        String notificationType = (String) session.getAttribute(NOTIFICATION_TYPE_SESSION_ATTRIBUTE);
+        session.removeAttribute(NOTIFICATION_MESSAGE_SESSION_ATTRIBUTE);
+        session.removeAttribute(NOTIFICATION_TYPE_SESSION_ATTRIBUTE);
+
+        if (message == null || notificationType == null) {
+            return null;
+        }
+
+        try {
+            return new Notification(message, NotificationType.valueOf(notificationType));
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    public static final class Notification {
+        private final String message;
+        private final NotificationType notificationType;
+
+        private Notification(String message, NotificationType notificationType) {
+            this.message = message;
+            this.notificationType = notificationType;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public NotificationType getNotificationType() {
+            return notificationType;
+        }
+    }
+
 
     /**
      * Corresponds to types declared in <a href="https://github.com/jenkinsci/jenkins/blob/74610e024a6b8fd8feccdc51b8f7741aa6c30e3b/war/src/main/js/components/notifications/index.js#L13-L25">index.js</a>

core/src/main/java/jenkins/agents/CloudSet.java

@@ -285,7 +285,7 @@
         var clouds = new ArrayList<>(Jenkins.get().clouds);
         clouds.sort(Comparator.comparingInt(c -> getIndexOf(namesList, c)));
         Jenkins.get().clouds.replaceBy(clouds);
-        FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
+        FormApply.success(req.getContextPath() + "/manage/" + getUrlName()).generateResponse(req, rsp, null);
     }
 
     private static int getIndexOf(List<String> namesList, Cloud cloud) {

core/src/main/java/jenkins/appearance/AppearanceGlobalConfiguration.java

@@ -101,7 +101,7 @@
     public synchronized void doConfigure(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         boolean result = configure(req, req.getSubmittedForm());
         LOGGER.log(Level.FINE, "appearance saved: " + result);
-        FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
+        FormApply.success(req.getContextPath() + "/manage/" + getUrlName()).generateResponse(req, rsp, null);
     }
 
     private boolean configure(StaplerRequest2 req, JSONObject json) throws Descriptor.FormException, IOException {

core/src/main/java/jenkins/model/Jenkins.java

@@ -4045,7 +4045,7 @@ public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rs
             save();
             updateComputers(this);
             if (result)
-                FormApply.success(req.getContextPath() + '/').generateResponse(req, rsp, null);
+                FormApply.success(req.getContextPath() + "/manage/configure").generateResponse(req, rsp, null);
             else
                 FormApply.success("configure").generateResponse(req, rsp, null);    // back to config
 

core/src/main/java/jenkins/model/experimentalflags/NewManageJenkinsUserExperimentalFlag.java

@@ -24,6 +24,7 @@
 
 package jenkins.model.experimentalflags;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
 import org.kohsuke.accmod.Restricted;
@@ -46,4 +47,9 @@ public String getDisplayName() {
     public String getShortDescription() {
         return "Enables a sidebar for the Manage Jenkins pages for easier navigation.";
     }
+
+    @Override
+    public @NonNull Boolean getDefaultValue() {
+        return true;
+    }
 }

core/src/main/java/jenkins/tools/GlobalToolConfiguration.java

@@ -84,7 +84,7 @@ public Category getCategory() {
     public synchronized void doConfigure(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         boolean result = configure(req, req.getSubmittedForm());
         LOGGER.log(Level.FINE, "tools saved: " + result);
-        FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
+        FormApply.success(req.getContextPath() + "/manage/" + getUrlName()).generateResponse(req, rsp, null);
     }
 
     private boolean configure(StaplerRequest2 req, JSONObject json) throws Descriptor.FormException, IOException {

core/src/main/resources/lib/layout/layout.jelly

@@ -91,6 +91,7 @@ THE SOFTWARE.
 </j:if>
 
 <j:set var="_" value="${request2.getSession()}"/>
+<j:set var="formApplyNotification" value="${h.formApplyNotification}"/>
 <j:set var="extensionsAvailable" value="${h.extensionsAvailable}"/>
 <j:if test="${request2.servletPath=='/' || request2.servletPath==''}">
   ${h.advertiseHeaders(response2)}
@@ -155,7 +156,9 @@ THE SOFTWARE.
   </head>
   <body id="jenkins" class="${layoutType} jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}"
         data-search-url="${rootURL + '/search/suggest'}"
-        data-search-help-url="${%searchBox.url}">
+        data-search-help-url="${%searchBox.url}"
+        data-notification-message="${formApplyNotification.message}"
+        data-notification-type="${formApplyNotification.notificationType}">
     <l:command-palette />
 
     <j:if test="${layoutType!='full-screen'}">

core/src/main/resources/lib/layout/settings-subpage.jelly

@@ -101,13 +101,13 @@ THE SOFTWARE.
     <j:choose>
       <j:when test="${newManageJenkins}">
         <l:side-panel>
+          <script src="${resURL}/jsbundles/pages/manage-jenkins.js" type="text/javascript" defer="true" />
+
           <l:app-bar title="${manageJenkinsAction.displayName}" />
 
           <l:tasks>
             <l:search-bar placeholder="${%Search}" id="settings-search-bar" />
 
-            <script src="${resURL}/jsbundles/pages/manage-jenkins.js" type="text/javascript" />
-
             <j:invokeStatic var="j" className="jenkins.model.Jenkins" method="get" />
             <j:forEach var="category" items="${j.categorizedManagementLinks.entrySet()}">
               <summary class="jenkins-side-nav__heading">
@@ -139,28 +139,7 @@ THE SOFTWARE.
 
               <j:out value="${attrs.header}" />
 
-              <j:choose>
-                <j:when test="${!attrs.noDefer}">
-                  <l:defer>
-                    <l:defer.placeholder>
-                      <j:choose>
-                        <j:when test="${attrs.containsKey('placeholder')}">
-                          <j:out value="${attrs.placeholder}" />
-                        </j:when>
-                        <j:otherwise>
-                          <l:skeleton type="form" />
-                        </j:otherwise>
-                      </j:choose>
-                    </l:defer.placeholder>
-                    <l:defer.children>
-                      <d:invokeBody />
-                    </l:defer.children>
-                  </l:defer>
-                </j:when>
-                <j:otherwise>
-                  <d:invokeBody />
-                </j:otherwise>
-              </j:choose>
+              <d:invokeBody />
             </div>
           </div>
         </l:main-panel>

src/main/js/app.js

@@ -9,11 +9,25 @@ import ConfirmationLink from "@/components/confirmation-link";
 import Dialogs from "@/components/dialogs";
 import Defer from "@/components/defer";
 
+function showPageLoadNotification() {
+  const { notificationMessage, notificationType } = document.body.dataset;
+  if (!notificationMessage) {
+    return;
+  }
+
+  const options =
+    (notificationType && window.notificationBar[notificationType]) || undefined;
+  window.notificationBar.show(notificationMessage, options);
+  delete document.body.dataset.notificationMessage;
+  delete document.body.dataset.notificationType;
+}
+
 AppBar.init();
 Dropdowns.init();
 CommandPalette.init();
 Defer.init();
 Notifications.init();
+showPageLoadNotification();
 SearchBar.init();
 Tooltips.init();
 StopButtonLink.init();