Fixed bug causing multiple requests for changesets

Fixed bug related to displaying errors

additionally: implemented i18n
This commit is contained in:
Philipp Czora
2018-09-27 16:29:33 +02:00
parent 77ed7581d4
commit 360bb807b9
12 changed files with 122 additions and 71 deletions

View File

@@ -11,7 +11,7 @@ export default class ChangesetAuthor extends React.Component<Props> {
render() {
const { changeset } = this.props;
return (
<>
<div>
{changeset.author.name}{" "}
<a
className="is-hidden-mobile"
@@ -21,7 +21,7 @@ export default class ChangesetAuthor extends React.Component<Props> {
{changeset.author.mail}
&gt;
</a>
</>
</div>
);
}
}

View File

@@ -1,8 +1,8 @@
//@flow
import React from "react";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import type { Changeset } from "@scm-manager/ui-types";
import { Image } from "@scm-manager/ui-components";
import type { Changeset } from "../../../../../scm-ui-components/packages/ui-types/src/index";
import { Image } from "../../../../../scm-ui-components/packages/ui-components/src/index";
type Props = {
changeset: Changeset
@@ -12,7 +12,7 @@ class ChangesetAvatar extends React.Component<Props> {
render() {
const { changeset } = this.props;
return (
<p className="image is-64x64">
<div className="image is-64x64">
<ExtensionPoint
name="repos.changeset-table.information"
renderAll={true}
@@ -20,7 +20,7 @@ class ChangesetAvatar extends React.Component<Props> {
>
<Image src="/images/blib.jpg" alt="Logo" />
</ExtensionPoint>
</p>
</div>
);
}
}

View File

@@ -1,7 +1,7 @@
// @flow
import ChangesetRow from "./ChangesetRow";
import React from "react";
import type { Changeset, Repository } from "@scm-manager/ui-types";
import type { Changeset, Repository } from "../../../../../scm-ui-components/packages/ui-types/src/index";
import classNames from "classnames";
type Props = {

View File

@@ -1,12 +1,15 @@
//@flow
import React from "react";
import type { Changeset, Repository } from "@scm-manager/ui-types";
import type {
Changeset,
Repository
} from "../../../../../scm-ui-components/packages/ui-types/src/index";
import classNames from "classnames";
import { translate, Interpolate } from "react-i18next";
import ChangesetAvatar from "./ChangesetAvatar";
import ChangesetId from "./ChangesetId";
import injectSheet from "react-jss";
import { DateFromNow } from "@scm-manager/ui-components";
import { DateFromNow } from "../../../../../scm-ui-components/packages/ui-components/src/index";
import ChangesetAuthor from "./ChangesetAuthor";
const styles = {
@@ -38,7 +41,7 @@ class ChangesetRow extends React.Component<Props> {
const { changeset, classes } = this.props;
const changesetLink = this.createLink(changeset);
const dateFromNow = <DateFromNow date={changeset.date} />;
const authorLine = <ChangesetAuthor changeset={changeset}/>;
const authorLine = <ChangesetAuthor changeset={changeset} />;
return (
<article className={classNames("media", classes.inner)}>
<figure className="media-left">
@@ -50,7 +53,7 @@ class ChangesetRow extends React.Component<Props> {
{changeset.description}
<br />
<Interpolate
i18nKey="changeset.summary"
i18nKey="changesets.changeset.summary"
id={changesetLink}
time={dateFromNow}
/>
@@ -63,4 +66,4 @@ class ChangesetRow extends React.Component<Props> {
}
}
export default injectSheet(styles)(translate("changesets")(ChangesetRow));
export default injectSheet(styles)(translate("repos")(ChangesetRow));