Make ViewDescriptor.doAutoCompleteCopyNewItemFrom honor DirectlyModifiableTopLevelItemGroup.canAdd.

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

@@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.annotation.CheckForNull;
+import jenkins.model.DirectlyModifiableTopLevelItemGroup;
 
 /**
  * Data representation of the auto-completion candidates.
@@ -106,7 +107,7 @@ public class AutoCompletionCandidates implements HttpResponse {
      *      The nearby contextual {@link ItemGroup} to resolve relative job names from.
      * @since 1.553
      */
-    public static  <T extends Item> AutoCompletionCandidates ofJobNames(final Class<T> type, final String value, ItemGroup container) {
+    public static  <T extends Item> AutoCompletionCandidates ofJobNames(final Class<T> type, final String value, final ItemGroup container) {
         final AutoCompletionCandidates candidates = new AutoCompletionCandidates();
         class Visitor extends ItemVisitor {
             String prefix;
@@ -127,8 +128,10 @@ public class AutoCompletionCandidates implements HttpResponse {
                  && i.hasPermission(Item.READ)
                     // and read permission required
                 ) {
-                    if (type.isInstance(i) && n.startsWith(value))
+                    if (type.isInstance(i) && n.startsWith(value) &&
+                            (!(container instanceof DirectlyModifiableTopLevelItemGroup) || !(i instanceof TopLevelItem) || ((DirectlyModifiableTopLevelItemGroup) container).canAdd((TopLevelItem) i))) {
                         candidates.add(n);
+                    }
 
                     // recurse
                     String oldPrefix = prefix;
@@ -153,9 +156,10 @@ public class AutoCompletionCandidates implements HttpResponse {
             if (value.startsWith("/"))
                 new Visitor("/").onItemGroup(Jenkins.getInstance());
 
+            ItemGroup parentContainer = container;
             for ( String p="../"; value.startsWith(p); p+="../") {
-                container = ((Item)container).getParent();
-                new Visitor(p).onItemGroup(container);
+                parentContainer = ((Item) parentContainer).getParent();
+                new Visitor(p).onItemGroup(parentContainer);
             }
         }
 

test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java

@@ -12,6 +12,9 @@ import org.jvnet.hudson.test.JenkinsRule;
 
 import java.util.Arrays;
 import java.util.TreeSet;
+import jenkins.model.DirectlyModifiableTopLevelItemGroup;
+import org.jvnet.hudson.test.MockFolder;
+import org.jvnet.hudson.test.TestExtension;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -60,6 +63,37 @@ public class AutoCompletionCandidatesTest {
         assertContains(c, "../bar", "../foo");
     }
 
+    /** Checks that {@link ViewDescriptor#doAutoCompleteCopyNewItemFrom} honors {@link DirectlyModifiableTopLevelItemGroup#canAdd}. */
+    @Test
+    public void canAdd() throws Exception {
+        MockFolder d1 = j.createFolder("d1");
+        d1.createProject(MockFolder.class, "sub");
+        d1.createProject(FreeStyleProject.class, "prj");
+        MockFolder d2 = j.jenkins.createProject(RestrictiveFolder.class, "d2");
+        assertContains(AutoCompletionCandidates.ofJobNames(TopLevelItem.class, "../d1/", d2), "../d1/prj");
+    }
+
+    public static class RestrictiveFolder extends MockFolder {
+
+        public RestrictiveFolder(ItemGroup parent, String name) {
+            super(parent, name);
+        }
+
+        @Override
+        public boolean canAdd(TopLevelItem item) {
+            return item instanceof FreeStyleProject;
+        }
+
+        @TestExtension("canAdd") public static class DescriptorImpl extends TopLevelItemDescriptor {
+
+            @Override public TopLevelItem newInstance(ItemGroup parent, String name) {
+                return new RestrictiveFolder(parent, name);
+            }
+
+        }
+
+    }
+
     private void assertContains(AutoCompletionCandidates c, String... values) {
         assertEquals(new TreeSet<String>(Arrays.asList(values)), new TreeSet<String>(c.getValues()));
     }