diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c9f471b05..09179ca9f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Added - Add support for pr merge with prior rebase ([#1332](https://github.com/scm-manager/scm-manager/pull/1332)) +- Tags overview for repository [#1331](https://github.com/scm-manager/scm-manager/pull/1331) ### Fixed - Missing synchronization during repository creation ([#1328](https://github.com/scm-manager/scm-manager/pull/1328)) +- Missing BranchCreatedEvent for mercurial ([#1334](https://github.com/scm-manager/scm-manager/pull/1334)) +- Branch not found right after creation ([#1334](https://github.com/scm-manager/scm-manager/pull/1334)) ## [2.5.0] - 2020-09-10 ### Added diff --git a/docs/de/user/repo/assets/repository-tag-detailView.png b/docs/de/user/repo/assets/repository-tag-detailView.png new file mode 100644 index 0000000000..6444ae59d6 Binary files /dev/null and b/docs/de/user/repo/assets/repository-tag-detailView.png differ diff --git a/docs/de/user/repo/assets/repository-tags-overview.png b/docs/de/user/repo/assets/repository-tags-overview.png new file mode 100644 index 0000000000..63184bbe7d Binary files /dev/null and b/docs/de/user/repo/assets/repository-tags-overview.png differ diff --git a/docs/de/user/repo/index.md b/docs/de/user/repo/index.md index e0cb07a603..2c501cf483 100644 --- a/docs/de/user/repo/index.md +++ b/docs/de/user/repo/index.md @@ -6,6 +6,7 @@ partiallyActive: true Der Bereich Repository umfasst alles auf Basis von Repositories in Namespaces. Dazu zählen alle Operationen auf Branches, der Code und Einstellungen. * [Branches](branches/) +* [Tags](tags/) * [Code](code/) * [Einstellungen](settings/) diff --git a/docs/de/user/repo/tags.md b/docs/de/user/repo/tags.md new file mode 100644 index 0000000000..932a8a143b --- /dev/null +++ b/docs/de/user/repo/tags.md @@ -0,0 +1,13 @@ +--- +title: Repository +subtitle: Tags +--- +### Übersicht +Auf der Tags-Übersicht sind die existierenden Tags nach Erstelldatum absteigend aufgeführt. Bei einem Klick auf einen Tag wird der Benutzer zur Detailseite des Tags weitergeleitet. + +![Tags Übersicht](assets/repository-tags-overview.png) + +### Tag Detailseite +Hier wird ein Befehl zum Arbeiten mit dem Tag auf einer Kommandozeile aufgeführt. + +![Tag Detailseite](assets/repository-tag-detailView.png) diff --git a/docs/en/user/repo/assets/repository-tag-detailView.png b/docs/en/user/repo/assets/repository-tag-detailView.png new file mode 100644 index 0000000000..14a50a05c9 Binary files /dev/null and b/docs/en/user/repo/assets/repository-tag-detailView.png differ diff --git a/docs/en/user/repo/assets/repository-tags-overview.png b/docs/en/user/repo/assets/repository-tags-overview.png new file mode 100644 index 0000000000..4d1623814b Binary files /dev/null and b/docs/en/user/repo/assets/repository-tags-overview.png differ diff --git a/docs/en/user/repo/index.md b/docs/en/user/repo/index.md index 4a24bbdaaf..312cc9f75d 100644 --- a/docs/en/user/repo/index.md +++ b/docs/en/user/repo/index.md @@ -5,6 +5,7 @@ partiallyActive: true The Repository area includes everything based on repositories in namespaces. This includes all operations on branches, the code and settings. * [Branches](branches/) +* [Tags](tags/) * [Code](code/) * [Settings](settings/) diff --git a/docs/en/user/repo/tags.md b/docs/en/user/repo/tags.md new file mode 100644 index 0000000000..1b5462ed3c --- /dev/null +++ b/docs/en/user/repo/tags.md @@ -0,0 +1,13 @@ +--- +title: Repository +subtitle: Tags +--- +### Overview +The tag overview shows the tags that exist for this repository. By clicking on a tag, the details page of the tag is shown. + +![Tags Overview](assets/repository-tags-overview.png) + +### Tag Details Page +This page shows a command to work with the tag on the command line. + +![Tag Details Page](assets/repository-tag-detailView.png) diff --git a/pom.xml b/pom.xml index d84f7d00a7..b4a3ae24a7 100644 --- a/pom.xml +++ b/pom.xml @@ -903,7 +903,7 @@ - 3.5.6 + 3.5.7 2.1 5.6.2 diff --git a/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java index 8de6fc82fc..20a1c0363c 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java @@ -21,21 +21,51 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository.api; +import com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import sonia.scm.event.ScmEventBus; import sonia.scm.repository.Branch; +import sonia.scm.repository.BranchCreatedEvent; +import sonia.scm.repository.Repository; import sonia.scm.repository.spi.BranchCommand; -import java.io.IOException; - /** * @since 2.0 */ public final class BranchCommandBuilder { + private static final Logger LOG = LoggerFactory.getLogger(BranchCommandBuilder.class); + + private final Repository repository; + private final BranchCommand command; + private final ScmEventBus eventBus; + private final BranchRequest request = new BranchRequest(); + + public BranchCommandBuilder(Repository repository, BranchCommand command) { + this(repository, command, ScmEventBus.getInstance()); + } + + /** + * Creates a new {@link BranchCommandBuilder}. + * + * @param command type specific command implementation + * + * @deprecated use {@link #BranchCommandBuilder(Repository, BranchCommand)} instead. + */ + @Deprecated public BranchCommandBuilder(BranchCommand command) { + this(null, command, ScmEventBus.getInstance()); + } + + @VisibleForTesting + BranchCommandBuilder(Repository repository, BranchCommand command, ScmEventBus eventBus) { + this.repository = repository; this.command = command; + this.eventBus = eventBus; } /** @@ -53,17 +83,23 @@ public final class BranchCommandBuilder { * Execute the command and create a new branch with the given name. * @param name The name of the new branch. * @return The created branch. - * @throws IOException */ public Branch branch(String name) { request.setNewBranch(name); - return command.branch(request); + Branch branch = command.branch(request); + fireCreatedEvent(branch); + return branch; + } + + private void fireCreatedEvent(Branch branch) { + if (repository != null) { + eventBus.post(new BranchCreatedEvent(repository, branch.getName())); + } else { + LOG.warn("the branch command was created without a repository, so we are not able to fire a BranchCreatedEvent"); + } } public void delete(String branchName) { command.deleteOrClose(branchName); } - - private BranchCommand command; - private BranchRequest request = new BranchRequest(); } diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java index 180751b4bd..6c97d30a94 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java @@ -21,12 +21,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository.api; public enum MergeStrategy { - MERGE_COMMIT, - FAST_FORWARD_IF_POSSIBLE, - SQUASH, - REBASE + MERGE_COMMIT("merge commit", true), + FAST_FORWARD_IF_POSSIBLE("fast forward if possible", false), + SQUASH("squash", true), + REBASE("rebase", false); + + private final String name; + private final boolean commitMessageAllowed; + + MergeStrategy(String name, boolean commitMessageAllowed) { + this.name = name; + this.commitMessageAllowed = commitMessageAllowed; + } + + public String getName() { + return name; + } + + public boolean isCommitMessageAllowed() { + return commitMessageAllowed; + } } diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java index 43f443b4bb..15f84a4ecd 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java @@ -177,7 +177,7 @@ public final class RepositoryService implements Closeable { LOG.debug("create branch command for repository {}", repository.getNamespaceAndName()); - return new BranchCommandBuilder(provider.getBranchCommand()); + return new BranchCommandBuilder(repository, provider.getBranchCommand()); } /** diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java index d7074b7f4b..b030d1cb0c 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java @@ -298,10 +298,12 @@ public final class RepositoryServiceFactory { /** * Clear caches on repository push. + * We do this synchronously, because there are often workflows which are creating branches and fetch them straight + * after the creation. * * @param event hook event */ - @Subscribe(referenceType = ReferenceType.STRONG) + @Subscribe(async = false, referenceType = ReferenceType.STRONG) public void onEvent(PostReceiveRepositoryHookEvent event) { Repository repository = event.getRepository(); @@ -324,13 +326,6 @@ public final class RepositoryServiceFactory { } } - @Subscribe(async = false) - @SuppressWarnings({"unchecked", "java:S3740", "rawtypes"}) - public void onEvent(BranchCreatedEvent event) { - RepositoryCacheKeyPredicate predicate = new RepositoryCacheKeyPredicate(event.getRepository().getId()); - cacheManager.getCache(BranchesCommandBuilder.CACHE_NAME).removeAll(predicate); - } - @Subscribe public void onEvent(PublicKeyDeletedEvent event) { cacheManager.getCache(LogCommandBuilder.CACHE_NAME).clear(); diff --git a/scm-core/src/test/java/sonia/scm/repository/api/BranchCommandBuilderTest.java b/scm-core/src/test/java/sonia/scm/repository/api/BranchCommandBuilderTest.java new file mode 100644 index 0000000000..ddf51ac3c6 --- /dev/null +++ b/scm-core/src/test/java/sonia/scm/repository/api/BranchCommandBuilderTest.java @@ -0,0 +1,105 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package sonia.scm.repository.api; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import sonia.scm.event.ScmEventBus; +import sonia.scm.repository.Branch; +import sonia.scm.repository.BranchCreatedEvent; +import sonia.scm.repository.Repository; +import sonia.scm.repository.spi.BranchCommand; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +class BranchCommandBuilderTest { + + @Mock + private BranchCommand command; + + @Mock + private ScmEventBus eventBus; + + private final Repository repository = new Repository("42", "git", "spaceships", "heart-of-gold"); + + private final String branchName = "feature/infinite_improbability_drive"; + private final Branch branch = Branch.normalBranch(branchName, "42"); + + @Nested + class Creation { + + @BeforeEach + void configureMocks() { + when(command.branch(any())).thenReturn(branch); + } + + @Test + void shouldDelegateCreationToCommand() { + BranchCommandBuilder builder = new BranchCommandBuilder(repository, command, eventBus); + Branch returnedBranch = builder.branch(branchName); + assertThat(branch).isSameAs(returnedBranch); + } + + @Test + void shouldSendBranchCreatedEvent() { + BranchCommandBuilder builder = new BranchCommandBuilder(repository, command, eventBus); + builder.branch(branchName); + + ArgumentCaptor captor = ArgumentCaptor.forClass(BranchCreatedEvent.class); + verify(eventBus).post(captor.capture()); + BranchCreatedEvent event = captor.getValue(); + assertThat(event.getBranchName()).isEqualTo("feature/infinite_improbability_drive"); + } + + @Test + void shouldNotSendEventWithoutRepository() { + BranchCommandBuilder builder = new BranchCommandBuilder(null, command, eventBus); + builder.branch(branchName); + + verify(eventBus, never()).post(any()); + } + + } + + @Nested + class Deletion { + + @Test + void shouldDelegateDeletionToCommand() { + BranchCommandBuilder builder = new BranchCommandBuilder(repository, command, eventBus); + builder.delete(branchName); + verify(command).deleteOrClose(branchName); + } + } + +} diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java index 43bfb68578..fd2ddf013d 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java @@ -30,7 +30,6 @@ import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Ref; import sonia.scm.event.ScmEventBus; import sonia.scm.repository.Branch; -import sonia.scm.repository.BranchCreatedEvent; import sonia.scm.repository.GitUtil; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.PostReceiveRepositoryHookEvent; @@ -48,9 +47,7 @@ import java.io.IOException; import java.util.List; import java.util.Set; -import static java.util.Collections.emptyList; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; +import static java.util.Collections.*; import static sonia.scm.ContextEntry.ContextBuilder.entity; public class GitBranchCommand extends AbstractGitCommand implements BranchCommand { @@ -72,8 +69,6 @@ public class GitBranchCommand extends AbstractGitCommand implements BranchComman eventBus.post(new PreReceiveRepositoryHookEvent(hookEvent)); Ref ref = git.branchCreate().setStartPoint(request.getParentBranch()).setName(request.getNewBranch()).call(); eventBus.post(new PostReceiveRepositoryHookEvent(hookEvent)); - // Clear cache synchronously to avoid branch not found in invalid cache - eventBus.post(new BranchCreatedEvent(repository, request.getNewBranch())); return Branch.normalBranch(request.getNewBranch(), GitUtil.getId(ref.getObjectId())); } catch (GitAPIException | IOException ex) { throw new InternalRepositoryException(repository, "could not create branch " + request.getNewBranch(), ex); diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitTagInformation.tsx b/scm-plugins/scm-git-plugin/src/main/js/GitTagInformation.tsx new file mode 100644 index 0000000000..d3c26ba31e --- /dev/null +++ b/scm-plugins/scm-git-plugin/src/main/js/GitTagInformation.tsx @@ -0,0 +1,48 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import React, { FC } from "react"; +import { Tag } from "@scm-manager/ui-types"; +import { useTranslation } from "react-i18next"; + +type Props = { + tag: Tag; +}; + +const GitTagInformation: FC = ({ tag }) => { + const [t] = useTranslation("plugins"); + + return ( + <> +

{t("scm-git-plugin.information.checkoutTag")}

+ 
+        
+          git checkout tags/{tag.name} -b branch/{tag.name}
+        
+
+ + ); +}; + +export default GitTagInformation; diff --git a/scm-plugins/scm-git-plugin/src/main/js/index.ts b/scm-plugins/scm-git-plugin/src/main/js/index.ts index dc7f8d11c8..49d85cb8bb 100644 --- a/scm-plugins/scm-git-plugin/src/main/js/index.ts +++ b/scm-plugins/scm-git-plugin/src/main/js/index.ts @@ -32,6 +32,7 @@ import GitGlobalConfiguration from "./GitGlobalConfiguration"; import GitBranchInformation from "./GitBranchInformation"; import GitMergeInformation from "./GitMergeInformation"; import RepositoryConfig from "./RepositoryConfig"; +import GitTagInformation from "./GitTagInformation"; // repository @@ -42,6 +43,7 @@ export const gitPredicate = (props: any) => { binder.bind("repos.repository-details.information", ProtocolInformation, gitPredicate); binder.bind("repos.branch-details.information", GitBranchInformation, gitPredicate); +binder.bind("repos.tag-details.information", GitTagInformation, gitPredicate); binder.bind("repos.repository-merge.information", GitMergeInformation, gitPredicate); binder.bind("repos.repository-avatar", GitAvatar, gitPredicate); diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json index e150ceb42b..7553856e57 100644 --- a/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json +++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json @@ -6,6 +6,7 @@ "replace": "Ein bestehendes Repository aktualisieren", "fetch": "Remote-Änderungen herunterladen", "checkout": "Branch wechseln", + "checkoutTag": "Tag als neuen Branch auschecken", "merge": { "heading": "Merge des Source Branch in den Target Branch", "checkout": "1. Sicherstellen, dass der Workspace aufgeräumt ist und der Target Branch ausgecheckt wurde.", diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json index 22eb46b9f8..23ab1ffce0 100644 --- a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json +++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json @@ -6,6 +6,7 @@ "replace": "Push an existing repository", "fetch": "Get remote changes", "checkout": "Switch branch", + "checkoutTag": "Checkout tag as new branch", "merge": { "heading": "How to merge source branch into target branch", "checkout": "1. Make sure your workspace is clean and checkout target branch", diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java index 7338c447fb..0df9332cfe 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBranchCommandTest.java @@ -104,7 +104,8 @@ public class GitBranchCommandTest extends AbstractGitCommandTestBase { @Test public void shouldThrowExceptionWhenDeletingDefaultBranch() { String branchToBeDeleted = "master"; - assertThrows(CannotDeleteDefaultBranchException.class, () -> createCommand().deleteOrClose(branchToBeDeleted)); + GitBranchCommand command = createCommand(); + assertThrows(CannotDeleteDefaultBranchException.class, () -> command.deleteOrClose(branchToBeDeleted)); } private GitBranchCommand createCommand() { @@ -130,7 +131,6 @@ public class GitBranchCommandTest extends AbstractGitCommandTestBase { List events = captor.getAllValues(); assertThat(events.get(0)).isInstanceOf(PreReceiveRepositoryHookEvent.class); assertThat(events.get(1)).isInstanceOf(PostReceiveRepositoryHookEvent.class); - assertThat(events.get(2)).isInstanceOf(BranchCreatedEvent.class); PreReceiveRepositoryHookEvent event = (PreReceiveRepositoryHookEvent) events.get(0); assertThat(event.getContext().getBranchProvider().getCreatedOrModified()).containsExactly("new_branch"); diff --git a/scm-plugins/scm-hg-plugin/src/main/js/HgTagInformation.tsx b/scm-plugins/scm-hg-plugin/src/main/js/HgTagInformation.tsx new file mode 100644 index 0000000000..e6a430ab10 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/js/HgTagInformation.tsx @@ -0,0 +1,46 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import React, { FC } from "react"; +import { useTranslation } from "react-i18next"; +import { Tag } from "@scm-manager/ui-types"; + +type Props = { + tag: Tag; +}; + +const HgTagInformation: FC = ({ tag }) => { + const [t] = useTranslation("plugins"); + + return ( + <> +

{t("scm-hg-plugin.information.checkoutTag")}

+ 
+        hg update {tag.name}
+
+ + ); +}; + +export default HgTagInformation; diff --git a/scm-plugins/scm-hg-plugin/src/main/js/index.ts b/scm-plugins/scm-hg-plugin/src/main/js/index.ts index 6fed874389..2365b1458a 100644 --- a/scm-plugins/scm-hg-plugin/src/main/js/index.ts +++ b/scm-plugins/scm-hg-plugin/src/main/js/index.ts @@ -28,6 +28,7 @@ import HgAvatar from "./HgAvatar"; import { ConfigurationBinder as cfgBinder } from "@scm-manager/ui-components"; import HgGlobalConfiguration from "./HgGlobalConfiguration"; import HgBranchInformation from "./HgBranchInformation"; +import HgTagInformation from "./HgTagInformation"; const hgPredicate = (props: any) => { return props.repository && props.repository.type === "hg"; @@ -35,6 +36,7 @@ const hgPredicate = (props: any) => { binder.bind("repos.repository-details.information", ProtocolInformation, hgPredicate); binder.bind("repos.branch-details.information", HgBranchInformation, hgPredicate); +binder.bind("repos.tag-details.information", HgTagInformation, hgPredicate); binder.bind("repos.repository-avatar", HgAvatar, hgPredicate); // bind global configuration diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json b/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json index d32847a3af..6a4a639812 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json +++ b/scm-plugins/scm-hg-plugin/src/main/resources/locales/de/plugins.json @@ -5,7 +5,8 @@ "create" : "Neues Repository erstellen", "replace" : "Ein bestehendes Repository aktualisieren", "fetch": "Remote-Änderungen herunterladen", - "checkout": "Branch wechseln" + "checkout": "Branch wechseln", + "checkoutTag": "Tag auschecken" }, "config": { "link": "Mercurial", diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json index 3792bd4a47..87f4d80ac4 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json +++ b/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json @@ -5,7 +5,8 @@ "create" : "Create a new repository", "replace" : "Push an existing repository", "fetch": "Get remote changes", - "checkout": "Switch branch" + "checkout": "Switch branch", + "checkoutTag": "Checkout tag" }, "config": { "link": "Mercurial", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index 1848823346..fff1de4a03 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -14,7 +14,7 @@ "babel-loader": "^8.0.6", "css-loader": "^3.2.0", "file-loader": "^4.2.0", - "mini-css-extract-plugin": "^0.10.0", + "mini-css-extract-plugin": "^0.11.0", "mustache": "^3.1.0", "optimize-css-assets-webpack-plugin": "^5.0.3", "react-refresh": "^0.8.0", diff --git a/scm-ui/ui-types/src/Tags.ts b/scm-ui/ui-types/src/Tags.ts index 6fc1973150..67fcf734dd 100644 --- a/scm-ui/ui-types/src/Tags.ts +++ b/scm-ui/ui-types/src/Tags.ts @@ -27,5 +27,6 @@ import { Links } from "./hal"; export type Tag = { name: string; revision: string; + date?: Date; _links: Links; }; diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json index 68e28e5d35..b9d37f64b8 100644 --- a/scm-ui/ui-webapp/public/locales/de/repos.json +++ b/scm-ui/ui-webapp/public/locales/de/repos.json @@ -31,6 +31,7 @@ "navigationLabel": "Repository", "informationNavLink": "Informationen", "branchesNavLink": "Branches", + "tagsNavLink": "Tags", "sourcesNavLink": "Code", "settingsNavLink": "Einstellungen", "generalNavLink": "Generell", @@ -69,6 +70,21 @@ "sources": "Sources", "defaultTag": "Default" }, + "tags": { + "overview": { + "title": "Übersicht aller verfügbaren Tags", + "noTags": "Keine Tags gefunden.", + "created": "Erstellt" + }, + "table": { + "tags": "Tags" + } + }, + "tag": { + "name": "Name", + "commit": "Commit", + "sources": "Sources" + }, "code": { "sources": "Sources", "commits": "Commits", diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json index d6e003a499..c917ea3629 100644 --- a/scm-ui/ui-webapp/public/locales/en/repos.json +++ b/scm-ui/ui-webapp/public/locales/en/repos.json @@ -31,6 +31,7 @@ "navigationLabel": "Repository", "informationNavLink": "Information", "branchesNavLink": "Branches", + "tagsNavLink": "Tags", "sourcesNavLink": "Code", "settingsNavLink": "Settings", "generalNavLink": "General", @@ -69,6 +70,21 @@ "sources": "Sources", "defaultTag": "Default" }, + "tags": { + "overview": { + "title": "Overview of all tags", + "noTags": "No tags found.", + "created": "Created" + }, + "table": { + "tags": "Tags" + } + }, + "tag": { + "name": "Name", + "commit": "Commit", + "sources": "Sources" + }, "code": { "sources": "Sources", "commits": "Commits", diff --git a/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx b/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx index 866ac8d849..baddb90afd 100644 --- a/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx +++ b/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx @@ -21,7 +21,7 @@ * 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 { Link } from "react-router-dom"; import { Branch } from "@scm-manager/ui-types"; import DefaultBranchTag from "./DefaultBranchTag"; @@ -31,24 +31,18 @@ type Props = { branch: Branch; }; -class BranchRow extends React.Component { - renderLink(to: string, label: string, defaultBranch?: boolean) { - return ( - - {label} - - ); - } - - render() { - const { baseUrl, branch } = this.props; - const to = `${baseUrl}/${encodeURIComponent(branch.name)}/info`; - return ( - - {this.renderLink(to, branch.name, branch.defaultBranch)} - - ); - } -} +const BranchRow: FC = ({ baseUrl, branch }) => { + const to = `${baseUrl}/${encodeURIComponent(branch.name)}/info`; + return ( + + + + {branch.name} + + + + + ); +}; export default BranchRow; diff --git a/scm-ui/ui-webapp/src/repos/branches/modules/branches.ts b/scm-ui/ui-webapp/src/repos/branches/modules/branches.ts index 9f079c2922..d7102fe9c9 100644 --- a/scm-ui/ui-webapp/src/repos/branches/modules/branches.ts +++ b/scm-ui/ui-webapp/src/repos/branches/modules/branches.ts @@ -24,7 +24,7 @@ import { FAILURE_SUFFIX, PENDING_SUFFIX, RESET_SUFFIX, SUCCESS_SUFFIX } from "../../../modules/types"; import { apiClient } from "@scm-manager/ui-components"; -import { Action, Branch, BranchRequest, Repository } from "@scm-manager/ui-types"; +import { Action, Branch, BranchRequest, Repository, Link } from "@scm-manager/ui-types"; import { isPending } from "../../../modules/pending"; import { getFailure } from "../../../modules/failure"; @@ -65,7 +65,7 @@ export function fetchBranches(repository: Repository) { return function(dispatch: any) { dispatch(fetchBranchesPending(repository)); return apiClient - .get(repository._links.branches.href) + .get((repository._links.branches as Link).href) .then(response => response.json()) .then(data => { dispatch(fetchBranchesSuccess(data, repository)); @@ -77,7 +77,7 @@ export function fetchBranches(repository: Repository) { } export function fetchBranch(repository: Repository, name: string) { - let link = repository._links.branches.href; + let link = (repository._links.branches as Link).href; if (!link.endsWith("/")) { link += "/"; } diff --git a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx index bcbb217fed..f3ef73bf36 100644 --- a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx @@ -54,6 +54,8 @@ import CodeOverview from "../codeSection/containers/CodeOverview"; import ChangesetView from "./ChangesetView"; import SourceExtensions from "../sources/containers/SourceExtensions"; import { FileControlFactory, JumpToFileButton } from "@scm-manager/ui-components"; +import TagsOverview from "../tags/container/TagsOverview"; +import TagRoot from "../tags/container/TagRoot"; type Props = RouteComponentProps & WithTranslation & { @@ -99,6 +101,12 @@ class RepositoryRoot extends React.Component { return route.location.pathname.match(regex); }; + matchesTags = (route: any) => { + const url = this.matchedUrl(); + const regex = new RegExp(`${url}/tag/.+/info`); + return route.location.pathname.match(regex); + }; + matchesCode = (route: any) => { const url = this.matchedUrl(); const regex = new RegExp(`${url}(/code)/.*`); @@ -245,6 +253,15 @@ class RepositoryRoot extends React.Component { render={() => } /> } /> + } + /> + } + /> @@ -267,6 +284,16 @@ class RepositoryRoot extends React.Component { activeOnlyWhenExact={false} title={t("repositoryRoot.menu.branchesNavLink")} /> + = ({ repository, tag }) => { + const [t] = useTranslation("repos"); + + const changesetLink = `/repo/${repository.namespace}/${repository.name}/code/changeset/${encodeURIComponent( + tag.revision + )}`; + const sourcesLink = `/repo/${repository.namespace}/${repository.name}/sources/${encodeURIComponent(tag.revision)}/`; + + return ( + <> + +