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..dc59f0060a --- /dev/null +++ b/scm-plugins/scm-git-plugin/src/main/js/GitTagInformation.tsx @@ -0,0 +1,52 @@ +/* + * 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"); + + if (!tag) { + return null; + } + + 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..99c7f47d08 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/js/HgTagInformation.tsx @@ -0,0 +1,50 @@ +/* + * 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"); + + if (!tag) { + return null; + } + + 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-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json index 0b63dc7c9e..3467e61a7e 100644 --- a/scm-ui/ui-webapp/public/locales/de/repos.json +++ b/scm-ui/ui-webapp/public/locales/de/repos.json @@ -83,7 +83,9 @@ } }, "tag": { - "name": "Name:" + "name": "Tag-Name", + "commit": "Commit", + "sources": "Sources" }, "code": { "sources": "Sources", diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json index 033afe4ffd..34b161bc6e 100644 --- a/scm-ui/ui-webapp/public/locales/en/repos.json +++ b/scm-ui/ui-webapp/public/locales/en/repos.json @@ -83,7 +83,9 @@ } }, "tag": { - "name": "Name:" + "name": "Tag-Name", + "commit": "Commit", + "sources": "Sources" }, "code": { "sources": "Sources", 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 ( + <> + +