changed groups list to dotted list

This commit is contained in:
Florian Scholdei
2019-02-19 15:05:55 +01:00
parent d7b1eda859
commit 7bb1f4632f
2 changed files with 102 additions and 79 deletions

View File

@@ -8,16 +8,23 @@ import {
} from "@scm-manager/ui-components";
import { compose } from "redux";
import { translate } from "react-i18next";
import injectSheet from "react-jss";
type Props = {
me: Me,
// Context props
classes: any,
t: string => string
};
type State = {};
class ProfileInfo extends React.Component<Props, State> {
const styles = {
spacing: {
padding: "0 !important"
}
};
class ProfileInfo extends React.Component<Props> {
render() {
const { me, t } = this.props;
return (
@@ -30,7 +37,7 @@ class ProfileInfo extends React.Component<Props, State> {
</figure>
</AvatarWrapper>
<div className="media-content">
<table className="table">
<table className="table content">
<tbody>
<tr>
<td className="has-text-weight-semibold">
@@ -52,18 +59,34 @@ class ProfileInfo extends React.Component<Props, State> {
<MailLink address={me.mail} />
</td>
</tr>
<tr>
<td className="has-text-weight-semibold">
{t("profile.groups")}
</td>
<td>{me.groups.join(", ")}</td>
</tr>
{this.renderGroups()}
</tbody>
</table>
</div>
</div>
);
}
renderGroups() {
const { me, t, classes } = this.props;
let groups = null;
if (me.groups.length > 0) {
groups = (
<tr>
<td className="has-text-weight-semibold">{t("profile.groups")}</td>
<td className={classes.spacing}>
<ul>
{me.groups.map((group, index) => {
return <li>{group}</li>;
})}
</ul>
</td>
</tr>
);
}
return groups;
}
}
export default compose(translate("commons"))(ProfileInfo);
export default compose(injectSheet(styles)(translate("commons")(ProfileInfo)));

View File

@@ -1,69 +1,69 @@
//@flow
import React from "react";
import type { Group } from "@scm-manager/ui-types";
import { translate } from "react-i18next";
import GroupMember from "./GroupMember";
import { DateFromNow } from "@scm-manager/ui-components";
type Props = {
group: Group,
t: string => string
};
class Details extends React.Component<Props> {
render() {
const { group, t } = this.props;
return (
<table className="table content">
<tbody>
<tr>
<td className="has-text-weight-semibold">{t("group.name")}</td>
<td>{group.name}</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.description")}</td>
<td>{group.description}</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.type")}</td>
<td>{group.type}</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.creationDate")}</td>
<td>
<DateFromNow date={group.creationDate} />
</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.lastModified")}</td>
<td>
<DateFromNow date={group.lastModified} />
</td>
</tr>
{this.renderMembers()}
</tbody>
</table>
);
}
renderMembers() {
if (this.props.group.members.length > 0) {
return (
<tr>
<td>
{this.props.t("group.members")}
<ul>
{this.props.group._embedded.members.map((member, index) => {
return <GroupMember key={index} member={member} />;
})}
</ul>
</td>
</tr>
);
} else {
return;
}
}
}
export default translate("groups")(Details);
//@flow
import React from "react";
import type { Group } from "@scm-manager/ui-types";
import { translate } from "react-i18next";
import GroupMember from "./GroupMember";
import { DateFromNow } from "@scm-manager/ui-components";
type Props = {
group: Group,
t: string => string
};
class Details extends React.Component<Props> {
render() {
const { group, t } = this.props;
return (
<table className="table content">
<tbody>
<tr>
<td className="has-text-weight-semibold">{t("group.name")}</td>
<td>{group.name}</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.description")}</td>
<td>{group.description}</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.type")}</td>
<td>{group.type}</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.creationDate")}</td>
<td>
<DateFromNow date={group.creationDate} />
</td>
</tr>
<tr>
<td className="has-text-weight-semibold">{t("group.lastModified")}</td>
<td>
<DateFromNow date={group.lastModified} />
</td>
</tr>
{this.renderMembers()}
</tbody>
</table>
);
}
renderMembers() {
if (this.props.group.members.length > 0) {
return (
<tr>
<td>
{this.props.t("group.members")}
<ul>
{this.props.group._embedded.members.map((member, index) => {
return <GroupMember key={index} member={member} />;
})}
</ul>
</td>
</tr>
);
} else {
return;
}
}
}
export default translate("groups")(Details);