From 6dbbe7c8170102ede0039d5688948c99008e88e4 Mon Sep 17 00:00:00 2001
From: Konstantin Schaper <konstantin.schaper@cloudogu.com>
Date: Fri, 27 Nov 2020 11:03:11 +0100
Subject: [PATCH] display tag signature

---
 scm-ui/ui-types/src/Changesets.ts             | 12 +-----
 scm-ui/ui-types/src/Signature.ts              | 37 +++++++++++++++++++
 scm-ui/ui-types/src/Tags.ts                   |  2 +
 .../src/repos/tags/components/TagDetail.tsx   |  9 +++--
 4 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 scm-ui/ui-types/src/Signature.ts

diff --git a/scm-ui/ui-types/src/Changesets.ts b/scm-ui/ui-types/src/Changesets.ts
index 81acd09c92..561a8c5045 100644
--- a/scm-ui/ui-types/src/Changesets.ts
+++ b/scm-ui/ui-types/src/Changesets.ts
@@ -26,6 +26,7 @@ import {Collection, Link, Links} from "./hal";
 import { Tag } from "./Tags";
 import { Branch } from "./Branches";
 import { Person } from "./Person";
+import {Signature} from "./Signature";
 
 export type Changeset = Collection & {
   id: string;
@@ -42,16 +43,7 @@ export type Changeset = Collection & {
   };
 };
 
-export type Signature = {
-  keyId: string;
-  type: string;
-  status: "VERIFIED" | "NOT_FOUND" | "INVALID";
-  owner?: string;
-  contacts?: Person[];
-  _links?: {
-    rawKey?: Link;
-  };
-}
+
 
 export type Contributor = {
   person: Person;
diff --git a/scm-ui/ui-types/src/Signature.ts b/scm-ui/ui-types/src/Signature.ts
new file mode 100644
index 0000000000..ee9cb72b16
--- /dev/null
+++ b/scm-ui/ui-types/src/Signature.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 { Person } from "./Person";
+import { Link } from "./hal";
+
+export type Signature = {
+  keyId: string;
+  type: string;
+  status: "VERIFIED" | "NOT_FOUND" | "INVALID";
+  owner?: string;
+  contacts?: Person[];
+  _links?: {
+    rawKey?: Link;
+  };
+};
diff --git a/scm-ui/ui-types/src/Tags.ts b/scm-ui/ui-types/src/Tags.ts
index 67fcf734dd..41e9bb0c6c 100644
--- a/scm-ui/ui-types/src/Tags.ts
+++ b/scm-ui/ui-types/src/Tags.ts
@@ -23,10 +23,12 @@
  */
 
 import { Links } from "./hal";
+import {Signature} from "./Signature";
 
 export type Tag = {
   name: string;
   revision: string;
   date?: Date;
+  signatures: Signature[];
   _links: Links;
 };
diff --git a/scm-ui/ui-webapp/src/repos/tags/components/TagDetail.tsx b/scm-ui/ui-webapp/src/repos/tags/components/TagDetail.tsx
index 0bbcdb56dc..5db1fe962f 100644
--- a/scm-ui/ui-webapp/src/repos/tags/components/TagDetail.tsx
+++ b/scm-ui/ui-webapp/src/repos/tags/components/TagDetail.tsx
@@ -25,7 +25,7 @@
 import React, { FC } from "react";
 import { useTranslation } from "react-i18next";
 import { Repository, Tag } from "@scm-manager/ui-types";
-import { DateFromNow } from "@scm-manager/ui-components";
+import { DateFromNow, SignatureIcon } from "@scm-manager/ui-components";
 import styled from "styled-components";
 import TagButtonGroup from "./TagButtonGroup";
 
@@ -58,9 +58,10 @@ const TagDetail: FC<Props> = ({ tag, repository }) => {
 
   return (
     <div className="media">
-      <FlexRow className="media-content subtitle">
-        <Label>{t("tag.name") + ": "} </Label> {tag.name}
-        <Created className="is-ellipsis-overflow">
+      <FlexRow className="media-content">
+        <Label className="subtitle has-text-weight-bold has-text-black">{t("tag.name") + ": "} </Label> <span className="subtitle">{tag.name}</span>
+        <SignatureIcon signatures={tag.signatures} className="ml-2 mb-5" />
+        <Created className="is-ellipsis-overflow mb-5">
           {t("tags.overview.created")} <Date date={tag.date} className="has-text-grey" />
         </Created>
       </FlexRow>