diff --git a/CHANGELOG.md b/CHANGELOG.md index ac2e9932db..208e2f7d4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Added +- Tags overview for repository [#1331](https://github.com/scm-manager/scm-manager/pull/1331) - Permissions can be specified for namespaces ([#1335](https://github.com/scm-manager/scm-manager/pull/1335)) + ### 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)) 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 bfc3100226..89b0b19eae 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 c7db350fd1..222a879543 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/scm-core/src/main/java/sonia/scm/repository/Namespace.java b/scm-core/src/main/java/sonia/scm/repository/Namespace.java index d2421c102d..8ad56c3b90 100644 --- a/scm-core/src/main/java/sonia/scm/repository/Namespace.java +++ b/scm-core/src/main/java/sonia/scm/repository/Namespace.java @@ -109,6 +109,14 @@ public class Namespace implements PermissionObject, Cloneable { .toHashCode(); } + @Override + public String toString() { + return "Namespace{" + + "namespace='" + namespace + '\'' + + ", permissions=" + permissions + + '}'; + } + @Override public Namespace clone() { try { diff --git a/scm-core/src/main/java/sonia/scm/repository/NamespaceManager.java b/scm-core/src/main/java/sonia/scm/repository/NamespaceManager.java index bdd8faac7d..01ad2815d6 100644 --- a/scm-core/src/main/java/sonia/scm/repository/NamespaceManager.java +++ b/scm-core/src/main/java/sonia/scm/repository/NamespaceManager.java @@ -27,6 +27,13 @@ package sonia.scm.repository; import java.util.Collection; import java.util.Optional; +/** + * Manages namespaces. Mind that namespaces do not have a lifecycle on their own, but only do exist through + * repositories. Therefore you cannot create or delete namespaces, but just change related settings like permissions + * associated with them. + * + * @since 2.6.0 + */ public interface NamespaceManager { /** diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryPermission.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryPermission.java index 8f91bcb8cf..49ddbd4a27 100644 --- a/scm-core/src/main/java/sonia/scm/repository/RepositoryPermission.java +++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryPermission.java @@ -119,11 +119,16 @@ public class RepositoryPermission implements PermissionObject, Serializable final RepositoryPermission other = (RepositoryPermission) obj; return Objects.equal(name, other.name) - && (verbs == null && other.verbs == null || verbs != null && other.verbs != null && CollectionUtils.isEqualCollection(verbs, other.verbs)) + && equalVerbs(other) && Objects.equal(role, other.role) && Objects.equal(groupPermission, other.groupPermission); } + public boolean equalVerbs(RepositoryPermission other) { + return verbs == null && other.verbs == null + || verbs != null && other.verbs != null && CollectionUtils.isEqualCollection(verbs, other.verbs); + } + /** * Returns the hash code value for the {@link RepositoryPermission}. * 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-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-components/src/urls.ts b/scm-ui/ui-components/src/urls.ts index 98bdb7137b..cae061b225 100644 --- a/scm-ui/ui-components/src/urls.ts +++ b/scm-ui/ui-components/src/urls.ts @@ -23,6 +23,7 @@ */ import queryString from "query-string"; +import { RouteComponentProps } from "react-router-dom"; //@ts-ignore export const contextPath = window.ctxPath || ""; @@ -80,3 +81,19 @@ function parsePageNumber(pageAsString: string) { export function getQueryStringFromLocation(location: any) { return location.search ? queryString.parse(location.search).q : undefined; } + +export function stripEndingSlash(url: string) { + if (url.endsWith("/")) { + return url.substring(0, url.length - 1); + } + return url; +} + +export function matchedUrlFromMatch(match: any) { + return stripEndingSlash(match.url); +} + +export function matchedUrl(props: RouteComponentProps) { + const match = props.match; + return matchedUrlFromMatch(match); +} diff --git a/scm-ui/ui-types/src/Repositories.ts b/scm-ui/ui-types/src/Repositories.ts index b585bffb65..02d7085892 100644 --- a/scm-ui/ui-types/src/Repositories.ts +++ b/scm-ui/ui-types/src/Repositories.ts @@ -58,6 +58,6 @@ export type NamespaceCollection = { export type RepositoryGroup = { name: string; - namespace: Namespace; + namespace?: Namespace; repositories: Repository[]; }; 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/namespaces.json b/scm-ui/ui-webapp/public/locales/de/namespaces.json index 7a687de4ff..c3cfdcb33b 100644 --- a/scm-ui/ui-webapp/public/locales/de/namespaces.json +++ b/scm-ui/ui-webapp/public/locales/de/namespaces.json @@ -5,5 +5,10 @@ "settingsNavLink": "Einstellungen", "permissionsNavLink": "Berechtigungen" } + }, + "repositoryOverview": { + "settings": { + "tooltip": "Einstellungen für den Namespace" + } } } diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json index 2e19a4f392..658cf86d8a 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/namespaces.json b/scm-ui/ui-webapp/public/locales/en/namespaces.json index a4b99c39ee..a267c03dd7 100644 --- a/scm-ui/ui-webapp/public/locales/en/namespaces.json +++ b/scm-ui/ui-webapp/public/locales/en/namespaces.json @@ -5,5 +5,10 @@ "settingsNavLink": "Settings", "permissionsNavLink": "Permissions" } + }, + "repositoryOverview": { + "settings": { + "tooltip": "Namespace related settings" + } } } diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json index d0d36d1e54..ddd889c512 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/admin/containers/Admin.tsx b/scm-ui/ui-webapp/src/admin/containers/Admin.tsx index 505a2760a1..98a308e4e3 100644 --- a/scm-ui/ui-webapp/src/admin/containers/Admin.tsx +++ b/scm-ui/ui-webapp/src/admin/containers/Admin.tsx @@ -45,6 +45,7 @@ import GlobalConfig from "./GlobalConfig"; import RepositoryRoles from "../roles/containers/RepositoryRoles"; import SingleRepositoryRole from "../roles/containers/SingleRepositoryRole"; import CreateRepositoryRole from "../roles/containers/CreateRepositoryRole"; +import { urls } from "@scm-manager/ui-components"; type Props = RouteComponentProps & WithTranslation & { @@ -54,30 +55,17 @@ type Props = RouteComponentProps & }; class Admin extends React.Component { - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - if (url.includes("role")) { - return url.substring(0, url.length - 2); - } - return url.substring(0, url.length - 1); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; matchesRoles = (route: any) => { - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const regex = new RegExp(`${url}/role/`); return route.location.pathname.match(regex); }; render() { - const { links, availablePluginsLink, installedPluginsLink, t } = this.props; + const { links, availablePluginsLink, installedPluginsLink, match, t } = this.props; - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const extensionProps = { links, url diff --git a/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx b/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx index 9829e91157..b6cbe6f144 100644 --- a/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx +++ b/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx @@ -23,7 +23,7 @@ */ import React from "react"; import { connect } from "react-redux"; -import { Route, withRouter } from "react-router-dom"; +import { Route, RouteComponentProps, withRouter } from "react-router-dom"; import { WithTranslation, withTranslation } from "react-i18next"; import { History } from "history"; import { ExtensionPoint } from "@scm-manager/ui-extensions"; @@ -34,39 +34,29 @@ import { fetchRoleByName, getFetchRoleFailure, getRoleByName, isFetchRolePending import PermissionRoleDetail from "../components/PermissionRoleDetails"; import EditRepositoryRole from "./EditRepositoryRole"; import { compose } from "redux"; +import { urls } from "@scm-manager/ui-components"; -type Props = WithTranslation & { - roleName: string; - role: RepositoryRole; - loading: boolean; - error: Error; - repositoryRolesLink: string; - disabled: boolean; +type Props = WithTranslation & + RouteComponentProps & { + roleName: string; + role: RepositoryRole; + loading: boolean; + error: Error; + repositoryRolesLink: string; + disabled: boolean; - // dispatcher function - fetchRoleByName: (p1: string, p2: string) => void; + // dispatcher function + fetchRoleByName: (p1: string, p2: string) => void; - // context objects - match: any; - history: History; -}; + // context objects + history: History; + }; class SingleRepositoryRole extends React.Component { componentDidMount() { this.props.fetchRoleByName(this.props.repositoryRolesLink, this.props.roleName); } - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 2); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - render() { const { t, loading, error, role } = this.props; @@ -80,7 +70,7 @@ class SingleRepositoryRole extends React.Component { return ; } - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const extensionProps = { role, diff --git a/scm-ui/ui-webapp/src/containers/Profile.tsx b/scm-ui/ui-webapp/src/containers/Profile.tsx index 4fe7bd4b61..d1d8a065f3 100644 --- a/scm-ui/ui-webapp/src/containers/Profile.tsx +++ b/scm-ui/ui-webapp/src/containers/Profile.tsx @@ -44,6 +44,7 @@ import ProfileInfo from "./ProfileInfo"; import { ExtensionPoint } from "@scm-manager/ui-extensions"; import SetPublicKeys from "../users/components/publicKeys/SetPublicKeys"; import SetPublicKeyNavLink from "../users/components/navLinks/SetPublicKeysNavLink"; +import { urls } from "@scm-manager/ui-components"; type Props = RouteComponentProps & WithTranslation & { @@ -54,17 +55,6 @@ type Props = RouteComponentProps & }; class Profile extends React.Component { - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 2); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - mayChangePassword = () => { const { me } = this.props; return !!me?._links?.password; @@ -76,7 +66,7 @@ class Profile extends React.Component { }; render() { - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const { me, t } = this.props; diff --git a/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx b/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx index b38974cc0e..1b7505f71f 100644 --- a/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx +++ b/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx @@ -45,6 +45,7 @@ import { Details } from "./../components/table"; import { EditGroupNavLink, SetPermissionsNavLink } from "./../components/navLinks"; import EditGroup from "./EditGroup"; import SetPermissions from "../../permissions/components/SetPermissions"; +import { urls } from "@scm-manager/ui-components"; type Props = RouteComponentProps & WithTranslation & { @@ -63,17 +64,6 @@ class SingleGroup extends React.Component { this.props.fetchGroupByName(this.props.groupLink, this.props.name); } - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 2); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - render() { const { t, loading, error, group } = this.props; @@ -85,7 +75,7 @@ class SingleGroup extends React.Component { return ; } - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const extensionProps = { group, 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/containers/BranchRoot.tsx b/scm-ui/ui-webapp/src/repos/branches/containers/BranchRoot.tsx index 713796cffa..cb2847a712 100644 --- a/scm-ui/ui-webapp/src/repos/branches/containers/BranchRoot.tsx +++ b/scm-ui/ui-webapp/src/repos/branches/containers/BranchRoot.tsx @@ -31,6 +31,7 @@ import { fetchBranch, getBranch, getFetchBranchFailure, isFetchBranchPending } f import { ErrorNotification, Loading, NotFoundError } from "@scm-manager/ui-components"; import { History } from "history"; import queryString from "query-string"; +import { urls } from "@scm-manager/ui-components"; type Props = { repository: Repository; @@ -54,21 +55,10 @@ class BranchRoot extends React.Component { fetchBranch(repository, branchName); } - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 1); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - render() { const { repository, branch, loading, error, match, location } = this.props; - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); if (error) { if (error instanceof NotFoundError && queryString.parse(location.search).create === "true") { 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/components/list/RepositoryGroupEntry.tsx b/scm-ui/ui-webapp/src/repos/components/list/RepositoryGroupEntry.tsx index cdf13dde44..936c5c2ebb 100644 --- a/scm-ui/ui-webapp/src/repos/components/list/RepositoryGroupEntry.tsx +++ b/scm-ui/ui-webapp/src/repos/components/list/RepositoryGroupEntry.tsx @@ -26,17 +26,18 @@ import { Link } from "react-router-dom"; import { CardColumnGroup, RepositoryEntry } from "@scm-manager/ui-components"; import { RepositoryGroup } from "@scm-manager/ui-types"; import { Icon } from "@scm-manager/ui-components"; +import { WithTranslation, withTranslation } from "react-i18next"; -type Props = { +type Props = WithTranslation & { group: RepositoryGroup; }; class RepositoryGroupEntry extends React.Component { render() { - const { group } = this.props; + const { group, t } = this.props; const settingsLink = group.namespace?._links?.permissions && ( - + ); const namespaceHeader = ( @@ -54,4 +55,4 @@ class RepositoryGroupEntry extends React.Component { } } -export default RepositoryGroupEntry; +export default withTranslation("namespaces")(RepositoryGroupEntry); diff --git a/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts b/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts index 7887690b37..f8b04a51c2 100644 --- a/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts +++ b/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts @@ -65,5 +65,5 @@ function sortByName(a, b) { } function findNamespace(namespaces: NamespaceCollection, namespaceToFind: string) { - return namespaces._embedded.namespaces.filter(namespace => namespace.namespace === namespaceToFind)[0]; + return namespaces._embedded.namespaces.find(namespace => namespace.namespace === namespaceToFind); } diff --git a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx index 5bc0e0d6e7..62ecd0adb3 100644 --- a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx @@ -28,6 +28,7 @@ import { Repository, Branch } from "@scm-manager/ui-types"; import Changesets from "./Changesets"; import { compose } from "redux"; import CodeActionBar from "../codeSection/components/CodeActionBar"; +import { urls } from "@scm-manager/ui-components"; type Props = WithTranslation & RouteComponentProps & { @@ -38,13 +39,6 @@ type Props = WithTranslation & }; class ChangesetsRoot extends React.Component { - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 1); - } - return url; - }; - isBranchAvailable = () => { const { branches, selectedBranch } = this.props; return branches?.filter(b => b.name === selectedBranch).length === 0; @@ -75,7 +69,7 @@ class ChangesetsRoot extends React.Component { return null; } - const url = this.stripEndingSlash(match.url); + const url = urls.stripEndingSlash(match.url); return ( <> diff --git a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx index e4d16dcfa8..f2334c5d7e 100644 --- a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx @@ -23,7 +23,7 @@ */ import React from "react"; import { connect } from "react-redux"; -import { withRouter } from "react-router-dom"; +import { RouteComponentProps, withRouter } from "react-router-dom"; import RepositoryForm from "../components/form"; import { Repository, Links } from "@scm-manager/ui-types"; import { getModifyRepoFailure, isModifyRepoPending, modifyRepo, modifyRepoReset } from "../modules/repos"; @@ -33,8 +33,9 @@ import { ExtensionPoint } from "@scm-manager/ui-extensions"; import { compose } from "redux"; import DangerZone from "./DangerZone"; import { getLinks } from "../../modules/indexResource"; +import { urls } from "@scm-manager/ui-components"; -type Props = { +type Props = RouteComponentProps & { loading: boolean; error: Error; indexLinks: Links; @@ -45,7 +46,6 @@ type Props = { // context props repository: Repository; history: History; - match: any; }; class EditRepo extends React.Component { @@ -59,21 +59,10 @@ class EditRepo extends React.Component { history.push(`/repo/${repository.namespace}/${repository.name}`); }; - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 2); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - render() { const { loading, error, repository, indexLinks } = this.props; - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const extensionProps = { repository, diff --git a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx index bcbb217fed..467bdcbecf 100644 --- a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx @@ -54,6 +54,9 @@ 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"; +import { urls } from "@scm-manager/ui-components"; type Props = RouteComponentProps & WithTranslation & { @@ -82,25 +85,20 @@ class RepositoryRoot extends React.Component { } } - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 1); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - matchesBranches = (route: any) => { - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const regex = new RegExp(`${url}/branch/.+/info`); return route.location.pathname.match(regex); }; + matchesTags = (route: any) => { + const url = urls.matchedUrl(this.props); + const regex = new RegExp(`${url}/tag/.+/info`); + return route.location.pathname.match(regex); + }; + matchesCode = (route: any) => { - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const regex = new RegExp(`${url}(/code)/.*`); return route.location.pathname.match(regex); }; @@ -118,7 +116,7 @@ class RepositoryRoot extends React.Component { evaluateDestinationForCodeLink = () => { const { repository } = this.props; - const url = `${this.matchedUrl()}/code`; + const url = `${urls.matchedUrl(this.props)}/code`; if (repository?._links?.sources) { return `${url}/sources/`; } @@ -138,7 +136,7 @@ class RepositoryRoot extends React.Component { return ; } - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const extensionProps = { repository, @@ -245,6 +243,15 @@ class RepositoryRoot extends React.Component { render={() => } /> } /> + } + /> + } + /> @@ -267,6 +274,16 @@ class RepositoryRoot extends React.Component { activeOnlyWhenExact={false} title={t("repositoryRoot.menu.branchesNavLink")} /> + void; @@ -60,20 +63,9 @@ class NamespaceRoot extends React.Component { fetchNamespace(namespacesLink, namespaceName); } - stripEndingSlash = (url: string) => { - if (url.endsWith("/")) { - return url.substring(0, url.length - 1); - } - return url; - }; - - matchedUrl = () => { - return this.stripEndingSlash(this.props.match.url); - }; - render() { const { loading, error, namespaceName, namespace, t } = this.props; - const url = this.matchedUrl(); + const url = urls.matchedUrl(this.props); const extensionProps = { namespace, diff --git a/scm-ui/ui-webapp/src/repos/tags/components/TagButtonGroup.tsx b/scm-ui/ui-webapp/src/repos/tags/components/TagButtonGroup.tsx new file mode 100644 index 0000000000..689caac1e4 --- /dev/null +++ b/scm-ui/ui-webapp/src/repos/tags/components/TagButtonGroup.tsx @@ -0,0 +1,53 @@ +/* + * 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, Repository } from "@scm-manager/ui-types"; +import { Button, ButtonAddons } from "@scm-manager/ui-components"; +import { useTranslation } from "react-i18next"; + +type Props = { + repository: Repository; + tag: Tag; +}; + +const TagButtonGroup: FC = ({ 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 ( + <> + +