add delete link to branchDto

scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx

@@ -22,25 +22,43 @@
  * SOFTWARE.
  */
 import React, { FC } from "react";
-import { Link } from "react-router-dom";
+import { Link as ReactLink } from "react-router-dom";
-import { Branch } from "@scm-manager/ui-types";
+import { Branch, Link } from "@scm-manager/ui-types";
 import DefaultBranchTag from "./DefaultBranchTag";
+import { Icon } from "@scm-manager/ui-components";
+import { useTranslation } from "react-i18next";
 
 type Props = {
   baseUrl: string;
   branch: Branch;
+  onDelete: (url: string) => void;
 };
 
-const BranchRow: FC<Props> = ({ baseUrl, branch }) => {
+const BranchRow: FC<Props> = ({ baseUrl, branch, onDelete }) => {
   const to = `${baseUrl}/${encodeURIComponent(branch.name)}/info`;
+  const [t] = useTranslation("repos");
+
+  let deleteButton;
+  if ((branch?._links?.delete as Link)?.href) {
+    const url = (branch._links.delete as Link).href;
+    deleteButton = (
+      <a className="level-item" onClick={() => onDelete(url)}>
+        <span className="icon is-small">
+          <Icon name="trash" className="fas" title={t("branch.delete")} />
+        </span>
+      </a>
+    );
+  }
+
   return (
     <tr>
       <td>
-        <Link to={to} title={branch.name}>
+        <ReactLink to={to} title={branch.name}>
           {branch.name}
           <DefaultBranchTag defaultBranch={branch.defaultBranch} />
-        </Link>
+        </ReactLink>
       </td>
+      <td className="is-darker">{deleteButton}</td>
     </tr>
   );
 };

scm-ui/ui-webapp/src/repos/branches/components/BranchTable.tsx

@@ -21,19 +21,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
+import React, { FC } from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
+import { useTranslation } from "react-i18next";
 import BranchRow from "./BranchRow";
 import { Branch } from "@scm-manager/ui-types";
 
-type Props = WithTranslation & {
+type Props = {
   baseUrl: string;
   branches: Branch[];
+  onDelete: (url: string) => void;
 };
 
-class BranchTable extends React.Component<Props> {
+const BranchTable: FC<Props> = ({ baseUrl, branches, onDelete }) => {
-  render() {
+  const [t] = useTranslation("repos");
-    const { t } = this.props;
+
+  const renderRow = () => {
+    let rowContent = null;
+    if (branches) {
+      rowContent = branches.map((branch, index) => {
+        return <BranchRow key={index} baseUrl={baseUrl} branch={branch} onDelete={onDelete} />;
+      });
+    }
+    return rowContent;
+  };
   return (
     <table className="card-table table is-hoverable is-fullwidth is-word-break">
       <thead>
@@ -41,21 +51,9 @@ class BranchTable extends React.Component<Props> {
           <th>{t("branches.table.branches")}</th>
         </tr>
       </thead>
-        <tbody>{this.renderRow()}</tbody>
+      <tbody>{renderRow()}</tbody>
     </table>
   );
-  }
+};
 
-  renderRow() {
+export default BranchTable;
-    const { baseUrl, branches } = this.props;
-    let rowContent = null;
-    if (branches) {
-      rowContent = branches.map((branch, index) => {
-        return <BranchRow key={index} baseUrl={baseUrl} branch={branch} />;
-      });
-    }
-    return rowContent;
-  }
-}
-
-export default withTranslation("repos")(BranchTable);

scm-ui/ui-webapp/src/repos/branches/containers/BranchesOverview.tsx

@@ -37,6 +37,7 @@ import {
 } from "../modules/branches";
 import { orderBranches } from "../util/orderBranches";
 import BranchTable from "../components/BranchTable";
+import { apiClient } from "@scm-manager/ui-components/src";
 
 type Props = WithTranslation & {
   repository: Repository;
@@ -80,11 +81,15 @@ class BranchesOverview extends React.Component<Props> {
     );
   }
 
+  onDelete(url: string) {
+    apiClient.delete(url).catch(error => this.setState({ error }));
+  }
+
   renderBranchesTable() {
     const { baseUrl, branches, t } = this.props;
     if (branches && branches.length > 0) {
       orderBranches(branches);
-      return <BranchTable baseUrl={baseUrl} branches={branches} />;
+      return <BranchTable baseUrl={baseUrl} branches={branches} onDelete={this.onDelete} />;
     }
     return <Notification type="info">{t("branches.overview.noBranches")}</Notification>;
   }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java

@@ -45,6 +45,6 @@ public class BranchChangesetCollectionToDtoMapper extends ChangesetCollectionToD
   }
 
   private String createSelfLink(Repository repository, String branch) {
-    return resourceLinks.branch().history(repository.getNamespaceAndName(), branch);
+    return resourceLinks.branch().history(repository.getNamespace(), repository.getName(), branch);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchCollectionToDtoMapper.java

@@ -55,11 +55,11 @@ public class BranchCollectionToDtoMapper {
   public HalRepresentation map(Repository repository, Collection<Branch> branches) {
     return new HalRepresentation(
       createLinks(repository),
-      embedDtos(getBranchDtoList(repository.getNamespace(), repository.getName(), branches)));
+      embedDtos(getBranchDtoList(repository, branches)));
   }
 
-  public List<BranchDto> getBranchDtoList(String namespace, String name, Collection<Branch> branches) {
+  public List<BranchDto> getBranchDtoList(Repository repository, Collection<Branch> branches) {
-    return branches.stream().map(branch -> branchToDtoMapper.map(branch, new NamespaceAndName(namespace, name))).collect(toList());
+    return branches.stream().map(branch -> branchToDtoMapper.map(branch, repository)).collect(toList());
   }
 
   private Links createLinks(Repository repository) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java

@@ -134,7 +134,7 @@ public class BranchRootResource {
         .stream()
         .filter(branch -> branchName.equals(branch.getName()))
         .findFirst()
-        .map(branch -> branchToDtoMapper.map(branch, namespaceAndName))
+        .map(branch -> branchToDtoMapper.map(branch, repositoryService.getRepository()))
         .map(Response::ok)
         .orElseThrow(() -> notFound(entity("branch", branchName).in(namespaceAndName)))
         .build();
@@ -249,7 +249,7 @@ public class BranchRootResource {
         branchCommand.from(parentName);
       }
       Branch newBranch = branchCommand.branch(branchName);
-      return Response.created(URI.create(resourceLinks.branch().self(namespaceAndName, newBranch.getName()))).build();
+      return Response.created(URI.create(resourceLinks.branch().self(namespace, name, newBranch.getName()))).build();
     }
   }
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java

@@ -32,6 +32,8 @@ import org.mapstruct.Mapping;
 import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.NamespaceAndName;
+import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.web.EdisonHalAppender;
 
 import javax.inject.Inject;
@@ -46,16 +48,21 @@ public abstract class BranchToBranchDtoMapper extends HalAppenderMapper {
   private ResourceLinks resourceLinks;
 
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
-  public abstract BranchDto map(Branch branch, @Context NamespaceAndName namespaceAndName);
+  public abstract BranchDto map(Branch branch, @Context Repository repository);
 
   @ObjectFactory
-  BranchDto createDto(@Context NamespaceAndName namespaceAndName, Branch branch) {
+  BranchDto createDto(@Context Repository repository, Branch branch) {
+    NamespaceAndName namespaceAndName = new NamespaceAndName(repository.getNamespace(), repository.getName());
     Links.Builder linksBuilder = linkingTo()
-      .self(resourceLinks.branch().self(namespaceAndName, branch.getName()))
+      .self(resourceLinks.branch().self(repository.getNamespace(), repository.getName(), branch.getName()))
-      .single(linkBuilder("history", resourceLinks.branch().history(namespaceAndName, branch.getName())).build())
+      .single(linkBuilder("history", resourceLinks.branch().history(repository.getNamespace(), repository.getName(), branch.getName())).build())
       .single(linkBuilder("changeset", resourceLinks.changeset().changeset(namespaceAndName.getNamespace(), namespaceAndName.getName(), branch.getRevision())).build())
       .single(linkBuilder("source", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), branch.getRevision())).build());
 
+    if (!branch.isDefaultBranch() && RepositoryPermissions.modify(repository).isPermitted()) {
+      linksBuilder.single(linkBuilder("delete", resourceLinks.branch().delete(repository.getNamespace(), repository.getName(), branch.getName())).build());
+    }
+
     Embedded.Builder embeddedBuilder = Embedded.embeddedBuilder();
     applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), branch, namespaceAndName);
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java

@@ -56,7 +56,7 @@ class ChangesetCollectionToDtoMapperBase extends PagedCollectionToDtoMapper<Chan
   private BranchReferenceDto createBranchReferenceDto(Repository repository, String branchName) {
     BranchReferenceDto branchReferenceDto = new BranchReferenceDto();
     branchReferenceDto.setName(branchName);
-    branchReferenceDto.add(Links.linkingTo().self(resourceLinks.branch().self(repository.getNamespaceAndName(), branchName)).build());
+    branchReferenceDto.add(Links.linkingTo().self(resourceLinks.branch().self(repository.getNamespace(), repository.getName(), branchName)).build());
     return branchReferenceDto;
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultBranchLinkProvider.java

@@ -39,6 +39,6 @@ public class DefaultBranchLinkProvider implements BranchLinkProvider {
 
   @Override
   public String get(NamespaceAndName namespaceAndName, String branch) {
-    return resourceLinks.branch().self(namespaceAndName, branch);
+    return resourceLinks.branch().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), branch);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java

@@ -132,7 +132,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
         }
       }
       if (repositoryService.isSupported(Command.BRANCHES)) {
-        embeddedBuilder.with("branches", branchCollectionToDtoMapper.getBranchDtoList(namespace, name,
+        embeddedBuilder.with("branches", branchCollectionToDtoMapper.getBranchDtoList(repository,
           getListOfObjects(source.getBranches(), branchName -> Branch.normalBranch(branchName, source.getId()))));
       }
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java

@@ -25,6 +25,7 @@
 package sonia.scm.api.v2.resources;
 
 import sonia.scm.repository.NamespaceAndName;
+import sonia.scm.repository.Repository;
 import sonia.scm.security.gpg.UserPublicKeyResource;
 
 import javax.inject.Inject;
@@ -485,17 +486,21 @@ class ResourceLinks {
       branchLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, BranchRootResource.class);
     }
 
-    String self(NamespaceAndName namespaceAndName, String branch) {
+    String self(String namespace, String name, String branch) {
-      return branchLinkBuilder.method("getRepositoryResource").parameters(namespaceAndName.getNamespace(), namespaceAndName.getName()).method("branches").parameters().method("get").parameters(branch).href();
+      return branchLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("branches").parameters().method("get").parameters(branch).href();
     }
 
-    public String history(NamespaceAndName namespaceAndName, String branch) {
+    public String history(String namespace, String name, String branch) {
-      return branchLinkBuilder.method("getRepositoryResource").parameters(namespaceAndName.getNamespace(), namespaceAndName.getName()).method("branches").parameters().method("history").parameters(branch).href();
+      return branchLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("branches").parameters().method("history").parameters(branch).href();
     }
 
     public String create(String namespace, String name) {
       return branchLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("branches").parameters().method("create").parameters().href();
     }
+
+    public String delete(String namespace, String name, String branch) {
+      return branchLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("branches").parameters().method("delete").parameters(branch).href();
+    }
   }
 
   public IncomingLinks incoming() {

scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapperTest.java

@@ -24,28 +24,49 @@
 
 package sonia.scm.api.v2.resources;
 
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.NamespaceAndName;
+import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryTestData;
 
 import java.net.URI;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 class BranchToBranchDtoMapperTest {
 
-  private final URI baseUri = URI.create("https://hitchhiker.com");
+  private final URI baseUri = URI.create("https://hitchhiker.com/api/");
 
   @SuppressWarnings("unused") // Is injected
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
 
+  @Mock
+  private Subject subject;
+
   @InjectMocks
   private BranchToBranchDtoMapperImpl mapper;
 
+  @BeforeEach
+  void setupSubject() {
+    ThreadContext.bind(subject);
+  }
+
+  @AfterEach
+  void tearDown() {
+    ThreadContext.unbindSubject();
+  }
+
   @Test
   void shouldAppendLinks() {
     HalEnricherRegistry registry = new HalEnricherRegistry();
@@ -59,7 +80,37 @@ class BranchToBranchDtoMapperTest {
 
     Branch branch = Branch.normalBranch("master", "42");
 
-    BranchDto dto = mapper.map(branch, new NamespaceAndName("hitchhiker", "heart-of-gold"));
+    BranchDto dto = mapper.map(branch, RepositoryTestData.createHeartOfGold());
-    assertThat(dto.getLinks().getLinkBy("ka").get().getHref()).isEqualTo("http://hitchhiker/heart-of-gold/master");
+    assertThat(dto.getLinks().getLinkBy("ka").get().getHref()).isEqualTo("http://hitchhiker/HeartOfGold/master");
   }
+
+  @Test
+  void shouldAppendDeleteLink() {
+    Repository repository = RepositoryTestData.createHeartOfGold();
+    when(subject.isPermitted("repository:modify:" + repository.getId())).thenReturn(true);
+    Branch branch = Branch.normalBranch("master", "42");
+
+    BranchDto dto = mapper.map(branch, repository);
+    assertThat(dto.getLinks().getLinkBy("delete").get().getHref()).isEqualTo("https://hitchhiker.com/api/v2/repositories/hitchhiker/HeartOfGold/branches/master");
+  }
+
+  @Test
+  void shouldNotAppendDeleteLinkIfDefaultBranch() {
+    Repository repository = RepositoryTestData.createHeartOfGold();
+    Branch branch = Branch.defaultBranch("master", "42");
+
+    BranchDto dto = mapper.map(branch, repository);
+    assertThat(dto.getLinks().getLinkBy("delete")).isNotPresent();
+  }
+
+  @Test
+  void shouldNotAppendDeleteLinkIfNotPermitted() {
+    Repository repository = RepositoryTestData.createHeartOfGold();
+    when(subject.isPermitted("repository:modify:" + repository.getId())).thenReturn(false);
+    Branch branch = Branch.normalBranch("master", "42");
+
+    BranchDto dto = mapper.map(branch, repository);
+    assertThat(dto.getLinks().getLinkBy("delete")).isNotPresent();
+  }
+
 }

scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java

@@ -140,13 +140,13 @@ public class ResourceLinksTest {
 
   @Test
   public void shouldCreateCorrectBranchUrl() {
-    String url = resourceLinks.branch().self(new NamespaceAndName("space", "name"), "master");
+    String url = resourceLinks.branch().self("space", "name", "master");
     assertEquals(BASE_URL + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/name/branches/master", url);
   }
 
   @Test
   public void shouldCreateCorrectBranchHiostoryUrl() {
-    String url = resourceLinks.branch().history(new NamespaceAndName("space", "name"), "master");
+    String url = resourceLinks.branch().history("space", "name", "master");
     assertEquals(BASE_URL + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/name/branches/master/changesets/", url);
   }