Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 14:35:45 +01:00
Code Issues Packages Projects Releases Activity

modify the autocomplete link structure of the index resources

Browse Source
This commit is contained in:
Mohamed Karray
2018-10-15 13:57:55 +02:00
parent 27ca8860d3
commit e891ce9850
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
View File

@@ -534,9 +534,8 @@ public class ScmRequests {
} }
public class IndexResponse extends ModelResponse<IndexResponse> { public class IndexResponse extends ModelResponse<IndexResponse> {
public static final String AUTOCOMPLETE_USERS = "_links.autocomplete.find{it.name=='users'}.href";
public static final String AUTOCOMPLETE_USERS = "_links.autocompleteUsers.href"; public static final String AUTOCOMPLETE_GROUPS = "_links.autocomplete.find{it.name=='groups'}.href";
public static final String AUTOCOMPLETE_GROUPS = "_links.autocompleteGroups.href";
public IndexResponse(Response response) { public IndexResponse(Response response) {
super(response); super(response);

9
scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java
View File

@@ -1,5 +1,7 @@
package sonia.scm.api.v2.resources; package sonia.scm.api.v2.resources;
import com.google.common.collect.Lists;
import de.otto.edison.hal.Link;
import de.otto.edison.hal.Links; import de.otto.edison.hal.Links;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import sonia.scm.SCMContextProvider; import sonia.scm.SCMContextProvider;
@@ -8,6 +10,7 @@ import sonia.scm.group.GroupPermissions;
import sonia.scm.user.UserPermissions; import sonia.scm.user.UserPermissions;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.List;
import static de.otto.edison.hal.Link.link; import static de.otto.edison.hal.Link.link;
@@ -24,6 +27,7 @@ public class IndexDtoGenerator {
public IndexDto generate() { public IndexDto generate() {
Links.Builder builder = Links.linkingTo(); Links.Builder builder = Links.linkingTo();
List<Link> autoCompleteLinks = Lists.newArrayList();
builder.self(resourceLinks.index().self()); builder.self(resourceLinks.index().self());
builder.single(link("uiPlugins", resourceLinks.uiPluginCollection().self())); builder.single(link("uiPlugins", resourceLinks.uiPluginCollection().self()));
if (SecurityUtils.getSubject().isAuthenticated()) { if (SecurityUtils.getSubject().isAuthenticated()) {
@@ -35,11 +39,12 @@ public class IndexDtoGenerator {
builder.single(link("users", resourceLinks.userCollection().self())); builder.single(link("users", resourceLinks.userCollection().self()));
} }
if (UserPermissions.autocomplete().isPermitted()) { if (UserPermissions.autocomplete().isPermitted()) {
builder.single(link("autocompleteUsers", resourceLinks.autoComplete().users())); autoCompleteLinks.add(Link.linkBuilder("autocomplete", resourceLinks.autoComplete().users()).withName("users").build());
} }
if (GroupPermissions.autocomplete().isPermitted()) { if (GroupPermissions.autocomplete().isPermitted()) {
builder.single(link("autocompleteGroups", resourceLinks.autoComplete().groups())); autoCompleteLinks.add(Link.linkBuilder("autocomplete", resourceLinks.autoComplete().groups()).withName("groups").build());
} }
builder.array(autoCompleteLinks);
if (GroupPermissions.list().isPermitted()) { if (GroupPermissions.list().isPermitted()) {
builder.single(link("groups", resourceLinks.groupCollection().self())); builder.single(link("groups", resourceLinks.groupCollection().self()));
} }

10
scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexResourceTest.java
View File

@@ -99,8 +99,9 @@ public class IndexResourceTest {
public void shouldRenderAutoCompleteLinks() { public void shouldRenderAutoCompleteLinks() {
IndexDto index = indexResource.getIndex(); IndexDto index = indexResource.getIndex();
Assertions.assertThat(index.getLinks().getLinkBy("autocompleteUsers")).matches(Optional::isPresent); Assertions.assertThat(index.getLinks().getLinksBy("autocomplete"))
Assertions.assertThat(index.getLinks().getLinkBy("autocompleteGroups")).matches(Optional::isPresent); .extracting("name")
.containsExactlyInAnyOrder("users", "groups");
} }
@Test @Test
@@ -108,8 +109,9 @@ public class IndexResourceTest {
public void userWithoutAutocompletePermissionShouldNotSeeAutoCompleteLinks() { public void userWithoutAutocompletePermissionShouldNotSeeAutoCompleteLinks() {
IndexDto index = indexResource.getIndex(); IndexDto index = indexResource.getIndex();
Assertions.assertThat(index.getLinks().getLinkBy("autocompleteUsers")).matches(o -> !o.isPresent()); Assertions.assertThat(index.getLinks().getLinksBy("autocomplete"))
Assertions.assertThat(index.getLinks().getLinkBy("autocompleteGroups")).matches(o -> !o.isPresent()); .extracting("name")
.doesNotContainSequence("users", "groups");
} }
@Test @Test