mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 23:45:44 +01:00
add co-authors if available to changeset view
refactor ChangesetAuthor.tsx get interfaces right / fix unit test / cleanup fix table layout use Set constructor injection to bind the implementation for the new changesetTrailers API cleanup / update CHANGELOG.md cleanup fix formatting
This commit is contained in:
committed by
René Pfeuffer
parent
a712c89f6a
commit
ec57aa88fa
@@ -31,7 +31,6 @@ import {
|
||||
AvatarImage,
|
||||
AvatarWrapper,
|
||||
Button,
|
||||
ChangesetAuthor,
|
||||
ChangesetDiff,
|
||||
ChangesetId,
|
||||
changesets,
|
||||
@@ -39,6 +38,7 @@ import {
|
||||
DateFromNow,
|
||||
Level
|
||||
} from "@scm-manager/ui-components";
|
||||
import { TrailerPerson } from "@scm-manager/ui-types/src/Changesets";
|
||||
|
||||
type Props = WithTranslation & {
|
||||
changeset: Changeset;
|
||||
@@ -63,6 +63,10 @@ const BottomMarginLevel = styled(Level)`
|
||||
margin-bottom: 1rem !important;
|
||||
`;
|
||||
|
||||
const SizedTd = styled.td`
|
||||
width: 10rem;
|
||||
`;
|
||||
|
||||
class ChangesetDetails extends React.Component<Props, State> {
|
||||
constructor(props: Props) {
|
||||
super(props);
|
||||
@@ -71,6 +75,29 @@ class ChangesetDetails extends React.Component<Props, State> {
|
||||
};
|
||||
}
|
||||
|
||||
collectAvailableTrailerTypes() {
|
||||
const { changeset } = this.props;
|
||||
|
||||
// @ts-ignore
|
||||
return [...new Set(changeset.trailerPersons.map(person => person.trailerType))];
|
||||
}
|
||||
|
||||
getTrailersByType(type: string) {
|
||||
const { changeset } = this.props;
|
||||
return changeset.trailerPersons?.filter(person => person.trailerType === type);
|
||||
}
|
||||
|
||||
getTrailerPersonsByType() {
|
||||
const availableTrailerTypes: string[] = this.collectAvailableTrailerTypes();
|
||||
|
||||
let type;
|
||||
let trailerPersons = [];
|
||||
for (type of availableTrailerTypes) {
|
||||
trailerPersons.push({ type, persons: this.getTrailersByType(type) });
|
||||
}
|
||||
return trailerPersons;
|
||||
}
|
||||
|
||||
render() {
|
||||
const { changeset, repository, t } = this.props;
|
||||
const { collapsed } = this.state;
|
||||
@@ -79,6 +106,35 @@ class ChangesetDetails extends React.Component<Props, State> {
|
||||
const id = <ChangesetId repository={repository} changeset={changeset} link={false} />;
|
||||
const date = <DateFromNow date={changeset.date} />;
|
||||
|
||||
const trailerPersons = this.getTrailerPersonsByType();
|
||||
|
||||
const trailerTable = (
|
||||
<table>
|
||||
<tr>
|
||||
<SizedTd>{t("changeset.author.label") + ":"}</SizedTd>
|
||||
<td>
|
||||
<a title={changeset?.author?.mail} href={"mailto:" + changeset?.author?.mail}>
|
||||
{changeset?.author?.name}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{trailerPersons.map(p => (
|
||||
<tr>
|
||||
<SizedTd>{t("changeset.trailer.type." + p.type) + ":"}</SizedTd>
|
||||
<td className="shorten-text is-marginless">
|
||||
{p.persons
|
||||
.map(person => (
|
||||
<a title={person.mail} href={"mailto:" + person.mail}>
|
||||
{person.name}
|
||||
</a>
|
||||
))
|
||||
.reduce((prev, curr) => [prev, ", ", curr])}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</table>
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className={classNames("content", "is-marginless")}>
|
||||
@@ -101,9 +157,7 @@ class ChangesetDetails extends React.Component<Props, State> {
|
||||
</RightMarginP>
|
||||
</AvatarWrapper>
|
||||
<div className="media-content">
|
||||
<p>
|
||||
<ChangesetAuthor changeset={changeset} />
|
||||
</p>
|
||||
{trailerTable}
|
||||
<p>
|
||||
<Trans i18nKey="repos:changeset.summary" components={[id, date]} />
|
||||
</p>
|
||||
|
||||
Reference in New Issue
Block a user