more

janfaracik · Mar 16, 2024 · 5d85564 · 5d85564
1 parent e412d9b
commit 5d85564
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 126 deletions.
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
@@ -1489,9 +1489,6 @@ public List<Action> getTransientActions() {
 //            System.out.println("Ignoring " + ignored);
         }
 
-        System.out.println(collect);
-        System.out.println("----");
-
         return collect;
     }
 }
diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -11,6 +11,10 @@
 import java.util.List;
 import javax.servlet.ServletException;
 import jenkins.management.Badge;
+import jenkins.model.menu.Group;
+import jenkins.model.menu.Semantic;
+import jenkins.model.menu.event.DropdownAction;
+import jenkins.model.menu.event.LinkAction;
 import org.apache.commons.jelly.JellyException;
 import org.jenkins.ui.icon.Icon;
 import org.jenkins.ui.icon.IconSet;
@@ -83,6 +87,20 @@ public ContextMenu add(Action action) {
             MenuItem menuItem = new MenuItem()
                     .withDisplayName(action.getDisplayName());
 
+            menuItem.badge = action.getBadge();
+            menuItem.semantic = action.getSemantic();
+            menuItem.group = action.getGroup();
+            menuItem.action = action.getAction();
+
+            if (action.getAction().getClass() == LinkAction.class) {
+                menuItem.url = ((LinkAction)action.getAction()).getUrl();
+            }
+
+            if (action.getAction().getClass() == DropdownAction.class) {
+                ContextMenu cm = new ContextMenu();
+                menuItem.subMenu = cm.addAll(((DropdownAction)action.getAction()).getActions());
+            }
+
             if (action.getIconFileName() != null && action.getIconFileName().startsWith("symbol-")) {
                 menuItem.icon = action.getIconFileName();
                 menuItem.iconXml = Symbol.get(new SymbolRequest.Builder()
@@ -230,9 +248,17 @@ class MenuItem {
         @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "read by Stapler")
         public boolean requiresConfirmation;
 
-
         private Badge badge;
 
+//        @Exported(inline = true)
+        private Group group;
+
+//        @Exported(inline = true)
+        private jenkins.model.menu.event.Action action;
+
+//        @Exported(inline = true)
+        private Semantic semantic;
+
         private String message;
 
         /**
@@ -264,6 +290,21 @@ public Badge getBadge() {
             return badge;
         }
 
+        @Exported(inline = true)
+        public Group getGroup() {
+            return group;
+        }
+
+        @Exported(inline = true)
+        public jenkins.model.menu.event.Action getAction() {
+            return action;
+        }
+
+        @Exported
+        public Semantic getSemantic() {
+            return semantic;
+        }
+
         @Exported
         public String getMessage() {
             return message;

diff --git a/core/src/main/java/jenkins/model/menu/Group.java b/core/src/main/java/jenkins/model/menu/Group.java
@@ -1,5 +1,9 @@
 package jenkins.model.menu;
 
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
+
+@ExportedBean
 public class Group {
 
     private final int order;
@@ -28,6 +32,7 @@ public static Group of(int customOrder) {
         return new Group(customOrder);
     }
 
+    @Exported
     public int getOrder() {
         return order;
     }

diff --git a/core/src/main/java/jenkins/model/menu/event/Action.java b/core/src/main/java/jenkins/model/menu/event/Action.java
@@ -1,4 +1,7 @@
 package jenkins.model.menu.event;
 
+import org.kohsuke.stapler.export.ExportedBean;
+
+@ExportedBean
 public interface Action {
 }
diff --git a/core/src/main/java/jenkins/model/menu/event/DoNothingAction.java b/core/src/main/java/jenkins/model/menu/event/DoNothingAction.java
@@ -1,3 +1,6 @@
 package jenkins.model.menu.event;
 
+import org.kohsuke.stapler.export.ExportedBean;
+
+@ExportedBean
 public final class DoNothingAction implements Action {}
diff --git a/core/src/main/java/jenkins/model/menu/event/DropdownAction.java b/core/src/main/java/jenkins/model/menu/event/DropdownAction.java
@@ -3,7 +3,10 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
 
+@ExportedBean
 public final class DropdownAction implements Action {
 
     private final List<hudson.model.Action> actions;
@@ -16,6 +19,7 @@ public static DropdownAction of(hudson.model.Action... actions) {
         return new DropdownAction(Arrays.stream(actions).collect(Collectors.toList()));
     }
 
+    @Exported(inline = true)
     public List<hudson.model.Action> getActions() {
         return actions;
     }

diff --git a/core/src/main/java/jenkins/model/menu/event/LinkAction.java b/core/src/main/java/jenkins/model/menu/event/LinkAction.java
@@ -1,5 +1,9 @@
 package jenkins.model.menu.event;
 
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
+
+@ExportedBean
 public final class LinkAction implements Action {
 
     private final String url;
@@ -12,6 +16,7 @@ public static LinkAction of(String url) {
         return new LinkAction(url);
     }
 
+    @Exported
     public String getUrl() {
         return url;
     }

diff --git a/core/src/main/java/jenkins/model/view/NewProjectActionFactory.java b/core/src/main/java/jenkins/model/view/NewProjectActionFactory.java
@@ -0,0 +1,48 @@
+package jenkins.model.view;
+
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.View;
+import java.util.Collection;
+import java.util.Set;
+import jenkins.model.TransientActionFactory;
+import jenkins.model.menu.Group;
+import jenkins.model.menu.event.LinkAction;
+
+@Extension
+public class NewProjectActionFactory extends TransientActionFactory<View> {
+
+    @Override
+    public Class<View> type() {
+        return View.class;
+    }
+
+    @Override
+    public Collection<? extends Action> createFor(View target) {
+        if (!target.hasPermission(View.CREATE)) {
+            return Set.of();
+        }
+
+        return Set.of(new Action() {
+                @Override
+                public String getDisplayName() {
+                    return "New " + target.getNewPronoun();
+                }
+
+                @Override
+                public String getIconFileName() {
+                    return "symbol-add";
+                }
+
+                @Override
+                public Group getGroup() {
+                    return Group.FIRST_IN_APP_BAR;
+                }
+
+                @Override
+                public jenkins.model.menu.event.Action getAction() {
+                    return LinkAction.of("newJob");
+                }
+        });
+    }
+}
diff --git a/core/src/main/java/jenkins/model/view/NewProjectMenuItem.java b/core/src/main/java/jenkins/model/view/NewProjectMenuItem.java