From 8e93248dd6f33b719e8072b2f426fa1777ee2370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 14 Oct 2020 16:26:25 +0200
Subject: [PATCH] Add component for commit author

---
 .../ui-components/src/repos/CommitAuthor.tsx  | 63 +++++++++++++++++++
 scm-ui/ui-components/src/repos/index.ts       |  1 +
 scm-ui/ui-webapp/public/locales/de/repos.json |  8 ++-
 scm-ui/ui-webapp/public/locales/en/repos.json |  6 ++
 4 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 scm-ui/ui-components/src/repos/CommitAuthor.tsx

diff --git a/scm-ui/ui-components/src/repos/CommitAuthor.tsx b/scm-ui/ui-components/src/repos/CommitAuthor.tsx
new file mode 100644
index 0000000000..e371069ad3
--- /dev/null
+++ b/scm-ui/ui-components/src/repos/CommitAuthor.tsx
@@ -0,0 +1,63 @@
+/*
+ * 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 from "react";
+import { WithTranslation, withTranslation } from "react-i18next";
+import Notification from "../Notification";
+import { Me } from "@scm-manager/ui-types";
+import { connect } from "react-redux";
+import { compose } from "redux";
+
+type Props = WithTranslation & {
+  // props from global state
+  me: Me;
+};
+
+class CommitAuthor extends React.Component<Props> {
+  render() {
+    const { me, t } = this.props;
+
+    const mail = me.mail ? me.mail : me.fallbackMail;
+
+    return (
+      <>
+        {!me.mail && <Notification type="warning">{t("commit.commitAuthor.noMail")}</Notification>}
+        <span className="mb-2">
+          <strong>{t("commit.commitAuthor.author")}</strong> {`${me.displayName} <${mail}>`}
+        </span>
+      </>
+    );
+  }
+}
+
+const mapStateToProps = (state: any) => {
+  const { auth } = state;
+  const me = auth.me;
+
+  return {
+    me
+  };
+};
+
+export default compose(connect(mapStateToProps), withTranslation("repos"))(CommitAuthor);
diff --git a/scm-ui/ui-components/src/repos/index.ts b/scm-ui/ui-components/src/repos/index.ts
index 36b26495b8..f33ffbc4cb 100644
--- a/scm-ui/ui-components/src/repos/index.ts
+++ b/scm-ui/ui-components/src/repos/index.ts
@@ -52,6 +52,7 @@ export { default as RepositoryAvatar } from "./RepositoryAvatar";
 export { default as RepositoryEntry } from "./RepositoryEntry";
 export { default as RepositoryEntryLink } from "./RepositoryEntryLink";
 export { default as JumpToFileButton } from "./JumpToFileButton";
+export { default as CommitAuthor } from "./CommitAuthor";
 
 export {
   File,
diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json
index a1303555f4..ae0f222765 100644
--- a/scm-ui/ui-webapp/public/locales/de/repos.json
+++ b/scm-ui/ui-webapp/public/locales/de/repos.json
@@ -135,6 +135,12 @@
       "sources": "Sources"
     }
   },
+  "commit": {
+    "commitAuthor": {
+      "author": "Autor",
+      "noMail": "Für den aktuellen Benutzer existiert keine E-Mail-Adresse. Es wird die unten angezeigte generierte Adresse genutzt."
+    }
+  },
   "repositoryForm": {
     "subtitle": "Repository bearbeiten",
     "submit": "Speichern",
@@ -269,4 +275,4 @@
     "clickHere": "Klicken Sie hier um Ihre Datei hochzuladen.",
     "dragAndDrop": "Sie können Ihre Datei auch direkt in die Dropzone ziehen."
   }
-}
+},
diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json
index bbc21d3cad..3b05c1f48c 100644
--- a/scm-ui/ui-webapp/public/locales/en/repos.json
+++ b/scm-ui/ui-webapp/public/locales/en/repos.json
@@ -135,6 +135,12 @@
       "count_plural": "{{count}} Contributors"
     }
   },
+  "commit": {
+    "commitAuthor": {
+      "author": "Author",
+      "noMail": "We have found no email address for your current user. We will use the generated address shown below."
+    }
+  },
   "repositoryForm": {
     "subtitle": "Edit Repository",
     "submit": "Save",