Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

show signature key on changeset

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-07-28 17:52:20 +02:00
parent 0c45cf21e3
commit b22ead23de
37 changed files with 806 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
View File

@@ -26,7 +26,7 @@ import { Trans, useTranslation, WithTranslation, withTranslation } from "react-i
import classNames from "classnames";
import styled from "styled-components";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import { Changeset, Repository, Tag, ParentChangeset } from "@scm-manager/ui-types";
import { Changeset, ParentChangeset, Repository, Tag } from "@scm-manager/ui-types";
import {
AvatarImage,
AvatarWrapper,
@@ -38,11 +38,12 @@ import {
changesets,
ChangesetTag,
DateFromNow,
Level,
Icon
Icon,
Level
} from "@scm-manager/ui-components";
import ContributorTable from "./ContributorTable";
import { Link as ReactLink } from "react-router-dom";
import SignatureIcon from "./SignatureIcon";
type Props = WithTranslation & {
changeset: Changeset;
@@ -63,6 +64,10 @@ const TagsWrapper = styled.div`
}
`;
const SignedIcon = styled(SignatureIcon)`
padding-left: 1rem;
`;
const BottomMarginLevel = styled(Level)`
margin-bottom: 1rem !important;
`;
@@ -74,6 +79,11 @@ const countContributors = (changeset: Changeset) => {
return 1;
};
const FlexRow = styled.div`
display: flex;
flex-direction: row;
`;
const ContributorLine = styled.div`
display: flex;
cursor: pointer;
@@ -120,12 +130,19 @@ const SeparatedParents = styled.div`
const Contributors: FC<{ changeset: Changeset }> = ({ changeset }) => {
const [t] = useTranslation("repos");
const [open, setOpen] = useState(false);
const signatureIcon = changeset?.signatures && changeset.signatures.length > 0 && (
<SignatureIcon className="mx-2" signatures={changeset.signatures} />
);
if (open) {
return (
<ContributorDetails>
<ContributorToggleLine onClick={e => setOpen(!open)}>
<Icon name="angle-down" /> {t("changeset.contributors.list")}
</ContributorToggleLine>
<FlexRow>
<ContributorToggleLine onClick={e => setOpen(!open)} className="is-ellipsis-overflow">
<Icon name="angle-down" /> {t("changeset.contributors.list")}
</ContributorToggleLine>
{signatureIcon}
</FlexRow>
<ContributorTable changeset={changeset} />
</ContributorDetails>
);
@@ -133,9 +150,10 @@ const Contributors: FC<{ changeset: Changeset }> = ({ changeset }) => {
return (
<>
<ContributorLine onClick={e => setOpen(!open)}>
<ContributorColumn>
<ContributorColumn className="is-ellipsis-overflow">
<Icon name="angle-right" /> <ChangesetAuthor changeset={changeset} />
</ContributorColumn>
{signatureIcon}
<CountColumn className={"is-hidden-mobile"}>
(
<span className="has-text-link">
@@ -190,9 +208,9 @@ class ChangesetDetails extends React.Component<Props, State> {
<AvatarImage person={changeset.author} />
</RightMarginP>
</AvatarWrapper>
<div className="media-content is-ellipsis-overflow">
<div className="media-content">
<Contributors changeset={changeset} />
<ChangesetSummary>
<ChangesetSummary className="is-ellipsis-overflow">
<p>
<Trans i18nKey="repos:changeset.summary" components={[id, date]} />
</p>

79
scm-ui/ui-webapp/src/repos/components/changesets/SignatureIcon.tsx Normal file
View File

@@ -0,0 +1,79 @@
/*
* 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 { Icon, Tooltip } from "@scm-manager/ui-components";
import { useTranslation } from "react-i18next";
//import { Signature } from "@scm-manager/ui-types";
type Props = {
signatures: any[];
className: any;
};
const SignatureIcon: FC<Props> = ({ signatures, className }) => {
const [t] = useTranslation("repos");
const signature = signatures?.length > 0 ? signatures[0] : undefined;
const createTooltipMessage = () => {
let status;
if (signature.status === "VERIFIED") {
status = t("changeset.signatureVerified");
} else if (signature.status === "INVALID") {
status = t("changeset.signatureInvalid");
} else {
status = t("changeset.signatureNotVerified");
}
if (signature.status === "NOT_FOUND") {
return `${t("changeset.signatureStatus")}: ${status}`;
}
return `${t("changeset.signedBy")}: ${signature.owner}\n${t("changeset.keyId")}: ${signature.keyId}\n${t(
"changeset.signatureStatus"
)}: ${status}\n${t("changeset.keyKontacts")}: ${signature.contacts.map((contact: string) => `\n- ${contact}`)}`;
};
const getColor = () => {
if (signature.status === "VERIFIED") {
return "success";
}
if (signature.status === "INVALID") {
return "danger";
}
return undefined;
};
if (!signature) {
return null;
}
return (
<Tooltip location="top" message={createTooltipMessage()}>
<Icon name={"key"} className={className} color={getColor()} />
</Tooltip>
);
};
export default SignatureIcon;