From 9e7da173a2a6f457cffa7eb89583a4215d271c38 Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Mon, 8 Oct 2018 17:41:15 -0400
Subject: [PATCH] changed componentWillReceiveProps to componentDidUpdate in
project-fetcher-hoc and project-metadata-hoc
---
src/lib/project-fetcher-hoc.jsx | 15 +++++++--------
src/lib/project-metadata-hoc.jsx | 7 +++----
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
index 10901d29f..751339ba1 100644
--- a/src/lib/project-fetcher-hoc.jsx
+++ b/src/lib/project-fetcher-hoc.jsx
@@ -43,16 +43,15 @@ const ProjectFetcherHOC = function (WrappedComponent) {
this.props.setInitialProjectId(props.projectId);
}
}
- // NOTE: should this be componentWillUpdate or componentWillReceiveProps?
- componentWillUpdate (nextProps) {
- if (this.props.projectHost !== nextProps.projectHost) {
- storage.setProjectHost(nextProps.projectHost);
+ componentDidUpdate (prevProps) {
+ if (prevProps.projectHost !== this.props.projectHost) {
+ storage.setProjectHost(this.props.projectHost);
}
- if (this.props.assetHost !== nextProps.assetHost) {
- storage.setAssetHost(nextProps.assetHost);
+ if (prevProps.assetHost !== this.props.assetHost) {
+ storage.setAssetHost(this.props.assetHost);
}
- if (nextProps.isFetchingProjectWithId && !this.props.isFetchingProjectWithId) {
- this.fetchProject(nextProps.reduxProjectId, nextProps.projectState);
+ if (this.props.isFetchingProjectWithId && !prevProps.isFetchingProjectWithId) {
+ this.fetchProject(this.props.reduxProjectId, this.props.projectState);
}
}
fetchProject (projectId, projectState) {
diff --git a/src/lib/project-metadata-hoc.jsx b/src/lib/project-metadata-hoc.jsx
index 82a586e02..53fec0ca4 100644
--- a/src/lib/project-metadata-hoc.jsx
+++ b/src/lib/project-metadata-hoc.jsx
@@ -21,9 +21,9 @@ const ProjectMetaDataHOC = function (WrappedComponent) {
]);
this.updateProjectMetaData(props.projectId);
}
- componentWillReceiveProps (nextProps) {
- if (nextProps.isFetchingProjectWithId && !this.props.isFetchingProjectWithId) {
- this.updateProjectMetaData(nextProps.projectId);
+ componentDidUpdate (prevProps) {
+ if (this.props.isFetchingProjectWithId && !prevProps.isFetchingProjectWithId) {
+ this.updateProjectMetaData(this.props.projectId);
}
}
updateProjectMetaData (projectId) {
@@ -80,7 +80,6 @@ const ProjectMetaDataHOC = function (WrappedComponent) {
return {
isFetchingProjectWithId: isFetchingProjectWithId(projectState),
projectId: state.scratchGui.projectId.projectId
- // token: state.session.session && state.session.session.user && state.session.session.user.token
};
};
--
GitLab