From 808a8a4107a930d19c559c2d459fb09d2f610149 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 17 Jun 2020 16:45:53 +0200 Subject: [PATCH 1/2] fixes refetching loop for non existing changesets --- CHANGELOG.md | 1 + .../src/repos/containers/ChangesetView.tsx | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89c09ec46c..c69f0b58c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Close file lists in migration ([#1191](https://github.com/scm-manager/scm-manager/pull/1191)) - Use command in javahg.py from registrar (Upgrade to newer javahg version) ([#1192](https://github.com/scm-manager/scm-manager/pull/1192)) - Fixed wrong e-tag format ([sdorra/web-resource #1](https://github.com/sdorra/web-resources/pull/1)) +- Fixed refetching loop for non existing changesets ## [2.0.0] - 2020-06-04 ### Added diff --git a/scm-ui/ui-webapp/src/repos/containers/ChangesetView.tsx b/scm-ui/ui-webapp/src/repos/containers/ChangesetView.tsx index cbd5e38666..a57f2dfd22 100644 --- a/scm-ui/ui-webapp/src/repos/containers/ChangesetView.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/ChangesetView.tsx @@ -48,15 +48,15 @@ type Props = WithTranslation & { class ChangesetView extends React.Component { componentDidMount() { - const { fetchChangesetIfNeeded, repository } = this.props; - const id = this.props.match.params.id; + const { fetchChangesetIfNeeded, repository, id } = this.props; fetchChangesetIfNeeded(repository, id); } - componentDidUpdate() { - const { fetchChangesetIfNeeded, repository } = this.props; - const id = this.props.match.params.id; - fetchChangesetIfNeeded(repository, id); + componentDidUpdate(prevProps: Props) { + const { fetchChangesetIfNeeded, repository, id } = this.props; + if (prevProps.id !== id) { + fetchChangesetIfNeeded(repository, id); + } } render() { @@ -79,6 +79,7 @@ const mapStateToProps = (state: any, ownProps: Props) => { const loading = isFetchChangesetPending(state, repository, id); const error = getFetchChangesetFailure(state, repository, id); return { + id, changeset, error, loading From d30a4fddf794b6672998af13c45ad49002eec063 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 17 Jun 2020 16:48:16 +0200 Subject: [PATCH 2/2] added pr link to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c69f0b58c1..c891a11bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Close file lists in migration ([#1191](https://github.com/scm-manager/scm-manager/pull/1191)) - Use command in javahg.py from registrar (Upgrade to newer javahg version) ([#1192](https://github.com/scm-manager/scm-manager/pull/1192)) - Fixed wrong e-tag format ([sdorra/web-resource #1](https://github.com/sdorra/web-resources/pull/1)) -- Fixed refetching loop for non existing changesets +- Fixed refetching loop for non existing changesets ([#1203](https://github.com/scm-manager/scm-manager/pull/1203)) ## [2.0.0] - 2020-06-04 ### Added