Redesign the Jenkins header

core/src/main/java/hudson/model/Computer.java

@@ -110,6 +110,7 @@
 import jenkins.model.IComputer;
 import jenkins.model.IDisplayExecutor;
 import jenkins.model.Jenkins;
+import jenkins.search.SearchGroup;
 import jenkins.security.ImpersonatingExecutorService;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.security.stapler.StaplerDispatchable;
@@ -1109,6 +1110,11 @@ public String getSearchUrl() {
         return getUrl();
     }
 
+    @Override
+    public SearchGroup getSearchGroup() {
+        return SearchGroup.get(SearchGroup.ComputerSearchGroup.class);
+    }
+
     /**
      * {@link RetentionStrategy} associated with this computer.
      *

core/src/main/java/hudson/model/Item.java

@@ -39,6 +39,7 @@
 import java.io.IOException;
 import java.util.Collection;
 import jenkins.model.Jenkins;
+import jenkins.search.SearchGroup;
 import jenkins.util.SystemProperties;
 import jenkins.util.io.OnMaster;
 import org.kohsuke.stapler.StaplerRequest2;
@@ -249,6 +250,11 @@ default void onCreatedFromScratch() {
      */
     void delete() throws IOException, InterruptedException;
 
+    @Override
+    default SearchGroup getSearchGroup() {
+        return SearchGroup.get(SearchGroup.ItemSearchGroup.class);
+    }
+
     PermissionGroup PERMISSIONS = new PermissionGroup(Item.class, Messages._Item_Permissions_Title());
     Permission CREATE =
             new Permission(

core/src/main/java/hudson/model/ManageJenkinsAction.java

@@ -27,6 +27,10 @@
 import hudson.Extension;
 import hudson.Util;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+import jenkins.management.AdministrativeMonitorsDecorator;
 import jenkins.management.Badge;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithContextMenu;
@@ -40,11 +44,11 @@
 import org.kohsuke.stapler.StaplerResponse2;
 
 /**
- * Adds the "Manage Jenkins" link to the top page.
+ * Adds the "Manage Jenkins" link to the navigation bar.
  *
  * @author Kohsuke Kawaguchi
  */
-@Extension(ordinal = 100) @Symbol("manageJenkins")
+@Extension(ordinal = 998) @Symbol("manageJenkins")
 public class ManageJenkinsAction implements RootAction, StaplerFallback, ModelObjectWithContextMenu {
     @Override
     public String getIconFileName() {
@@ -88,4 +92,29 @@ public void addContextMenuItem(ContextMenu menu, String url, String icon, String
         // If neither is the case, rewrite the relative URL to point to inside the /manage/ URL space
         menu.add("manage/" + url, icon, iconXml, text, post, requiresConfirmation, badge, message);
     }
+
+    @Override
+    public Badge getBadge() {
+        Jenkins jenkins = Jenkins.get();
+        AdministrativeMonitorsDecorator decorator = jenkins.getExtensionList(PageDecorator.class)
+                .get(AdministrativeMonitorsDecorator.class);
+
+        if (decorator == null) {
+            return null;
+        }
+
+        Collection<AdministrativeMonitor> activeAdministrativeMonitors = Optional.ofNullable(decorator.getMonitorsToDisplay()).orElse(Collections.emptyList());
+        boolean anySecurity = activeAdministrativeMonitors.stream().anyMatch(AdministrativeMonitor::isSecurity);
+
+        if (activeAdministrativeMonitors.isEmpty()) {
+            return null;
+        }
+
+        int size = activeAdministrativeMonitors.size();
+        String tooltip = size > 1 ? Messages.ManageJenkinsAction_notifications(size) : Messages.ManageJenkinsAction_notification(size);
+
+        return new Badge(String.valueOf(size),
+                tooltip,
+                anySecurity ? Badge.Severity.DANGER : Badge.Severity.WARNING);
+    }
 }

core/src/main/java/hudson/model/MyViewsProperty.java

@@ -301,7 +301,7 @@ public MyViewsTabBar getMyViewsTabBar() {
         return Jenkins.get().getMyViewsTabBar();
     }
 
-    @Extension @Symbol("myView")
+    @Symbol("myView")
     public static class GlobalAction implements RootAction {
 
         @Override

core/src/main/java/hudson/model/RootAction.java

@@ -24,8 +24,10 @@
 
 package hudson.model;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Extension;
 import hudson.ExtensionPoint;
+import jenkins.management.Badge;
 
 /**
  * Marker interface for actions that are added to {@link jenkins.model.Jenkins}.
@@ -38,4 +40,14 @@
  * @since 1.311
  */
 public interface RootAction extends Action, ExtensionPoint {
+
+    /**
+     * A {@link Badge} shown on the button for the action.
+     *
+     * @return badge or {@code null} if no badge should be shown.
+     * @since TODO
+     */
+    default @CheckForNull Badge getBadge() {
+        return null;
+    }
 }

core/src/main/java/hudson/model/User.java

@@ -72,6 +72,7 @@
 import jenkins.model.Loadable;
 import jenkins.model.ModelObjectWithContextMenu;
 import jenkins.scm.RunWithSCM;
+import jenkins.search.SearchGroup;
 import jenkins.security.ImpersonatingUserDetailsService2;
 import jenkins.security.LastGrantedAuthoritiesProperty;
 import jenkins.security.UserDetailsCache;
@@ -284,6 +285,11 @@ public String getSearchIcon() {
         return UserAvatarResolver.resolve(this, "48x48");
     }
 
+    @Override
+    public SearchGroup getSearchGroup() {
+        return SearchGroup.get(SearchGroup.UserSearchGroup.class);
+    }
+
     /**
      * The URL of the user page.
      */

core/src/main/java/hudson/model/View.java

@@ -94,6 +94,7 @@
 import jenkins.model.item_category.Categories;
 import jenkins.model.item_category.Category;
 import jenkins.model.item_category.ItemCategory;
+import jenkins.search.SearchGroup;
 import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.xml.XMLUtils;
 import jenkins.widgets.HasWidgets;
@@ -565,6 +566,11 @@ public String getSearchIcon() {
         return "symbol-jobs";
     }
 
+    @Override
+    public SearchGroup getSearchGroup() {
+        return SearchGroup.get(SearchGroup.ViewSearchGroup.class);
+    }
+
     /**
      * Returns the transient {@link Action}s associated with the top page.
      *

core/src/main/java/hudson/search/Search.java

@@ -29,6 +29,8 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.ExtensionComponent;
+import hudson.ExtensionList;
 import hudson.Util;
 import hudson.util.EditDistance;
 import io.jenkins.servlet.ServletExceptionWrapper;
@@ -37,12 +39,16 @@
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import jenkins.model.Jenkins;
+import jenkins.search.SearchGroup;
 import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.MemoryReductionUtil;
 import jenkins.util.SystemProperties;
@@ -171,11 +177,26 @@ public void doSuggest(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter
 
             if (iconName.startsWith("symbol")) {
                 r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(),
-                        Symbol.get(new SymbolRequest.Builder().withRaw(iconName).build())));
+                        Symbol.get(new SymbolRequest.Builder().withRaw(iconName).build()), "symbol", curItem.item.getSearchGroup().getDisplayName()));
             } else {
-                r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), iconName, "image"));
+                r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), iconName, "image", curItem.item.getSearchGroup().getDisplayName()));
             }
         }
+
+        // Sort results by group
+        ExtensionList<SearchGroup> groupsExtensionList = ExtensionList.lookup(SearchGroup.class);
+        List<ExtensionComponent<SearchGroup>> components = groupsExtensionList.getComponents();
+        Map<String, Double> searchGroupOrdinal = components.stream()
+                .collect(Collectors.toMap(
+                        (k) -> k.getInstance().getDisplayName(),
+                        ExtensionComponent::ordinal
+                ));
+        r.suggestions.sort(
+                Comparator.comparingDouble((Item item) -> searchGroupOrdinal.getOrDefault(item.getGroup(), Double.MAX_VALUE))
+                        .reversed()
+                        .thenComparing(item -> item.name)
+        );
+
         rsp.serveExposedBean(req, r, new ExportConfig());
     }
 
@@ -279,22 +300,19 @@ public static class Item {
 
         private final String icon;
 
+        private final String group;
+
         public Item(String name) {
-            this(name, null, null);
+            this(name, null, null, "symbol", null);
         }
 
-        public Item(String name, String url, String icon) {
+        public Item(String name, String url, String icon, String type, String group) {
             this.name = name;
             this.url = url;
             this.icon = icon;
-            this.type = "symbol";
-        }
-
-        public Item(String name, String url, String icon, String type) {
             this.name = name;
-            this.url = url;
-            this.icon = icon;
             this.type = type;
+            this.group = group;
         }
 
         @Exported
@@ -311,6 +329,11 @@ public String getIcon() {
         public String getType() {
             return type;
         }
+
+        @Exported
+        public String getGroup() {
+            return group;
+        }
     }
 
     private enum Mode {

core/src/main/java/hudson/search/SearchItem.java

@@ -25,6 +25,7 @@
 package hudson.search;
 
 import hudson.model.Build;
+import jenkins.search.SearchGroup;
 import org.jenkins.ui.icon.IconSpec;
 
 /**
@@ -63,6 +64,10 @@ default String getSearchIcon() {
         return "symbol-search";
     }
 
+    default SearchGroup getSearchGroup() {
+        return SearchGroup.get(SearchGroup.UnclassifiedSearchGroup.class);
+    }
+
     /**
      * Returns the {@link SearchIndex} to further search sub items inside this item.
      *

core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java

@@ -28,7 +28,6 @@
 import hudson.Extension;
 import hudson.diagnosis.ReverseProxySetupMonitor;
 import hudson.model.AdministrativeMonitor;
-import hudson.model.ManageJenkinsAction;
 import hudson.model.PageDecorator;
 import hudson.util.HudsonIsLoading;
 import hudson.util.HudsonIsRestarting;
@@ -56,9 +55,6 @@ public class AdministrativeMonitorsDecorator extends PageDecorator {
     public AdministrativeMonitorsDecorator() {
         // otherwise this would be added to every internal context menu building request
         ignoredJenkinsRestOfUrls.add("contextMenu");
-
-        // don't show here to allow admins to disable malfunctioning monitors via AdministrativeMonitorsDecorator
-        ignoredJenkinsRestOfUrls.add("configure");
     }
 
     @NonNull
@@ -163,11 +159,6 @@ public Collection<AdministrativeMonitor> getMonitorsToDisplay() {
             return null;
         }
 
-        // Don't show on Manage Jenkins
-        if (o instanceof ManageJenkinsAction) {
-            return null;
-        }
-
         // don't show for some URLs served directly by Jenkins
         if (o instanceof Jenkins) {
             String url = a.getRestOfUrl();

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

@@ -2350,7 +2350,7 @@ public String getSearchUrl() {
     public SearchIndexBuilder makeSearchIndex() {
         SearchIndexBuilder builder = super.makeSearchIndex();
 
-        this.actions.stream().filter(e -> e.getIconFileName() != null).forEach(action -> builder.add(new SearchItem() {
+        this.actions.stream().filter(e -> !(e.getIconFileName() == null || e.getUrlName() == null)).forEach(action -> builder.add(new SearchItem() {
             @Override
             public String getSearchName() {
                 return action.getDisplayName();

test/src/test/java/lib/hudson/ActionsTest.java → core/src/main/java/jenkins/model/navigation/SearchAction.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2011, CloudBees, Inc.
+ * Copyright (c) 2025, Jan Faracik
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,31 +22,29 @@
  * THE SOFTWARE.
  */
 
-package lib.hudson;
+package jenkins.model.navigation;
 
-import static org.junit.Assert.assertNotNull;
-
-import hudson.model.InvisibleAction;
+import hudson.Extension;
 import hudson.model.RootAction;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.TestExtension;
 
 /**
- * @author Kohsuke Kawaguchi
+ * TODO
  */
-public class ActionsTest {
+@Extension(ordinal = 999)
+public class SearchAction implements RootAction {
 
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+    @Override
+    public String getIconFileName() {
+        return "symbol-search";
+    }
 
-    @Test
-    public void override() throws Exception {
-        assertNotNull(j.createWebClient().goTo("").getElementById("bravo"));
+    @Override
+    public String getDisplayName() {
+        return "Search";
     }
 
-    @TestExtension
-    public static class RootActionImpl extends InvisibleAction implements RootAction {
+    @Override
+    public String getUrlName() {
+        return null;
     }
 }