From d3bf62fdacc5a5d2dd0852673b42f6944527d823 Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Mon, 22 Oct 2018 18:12:15 -0400
Subject: [PATCH] rearranged props and overrode onError one more place
---
src/lib/project-fetcher-hoc.jsx | 5 +++--
src/lib/project-saver-hoc.jsx | 6 +++---
src/lib/vm-manager-hoc.jsx | 5 +++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
index 1a8322a07..47086812f 100644
--- a/src/lib/project-fetcher-hoc.jsx
+++ b/src/lib/project-fetcher-hoc.jsx
@@ -83,11 +83,12 @@ const ProjectFetcherHOC = function (WrappedComponent) {
const {
/* eslint-disable no-unused-vars */
assetHost,
- onFetchedProjectData: onFetchedProjectDataProp,
intl,
+ loadingState,
+ onError: onErrorProp,
+ onFetchedProjectData: onFetchedProjectDataProp,
projectHost,
projectId,
- loadingState,
reduxProjectId,
setProjectId: setProjectIdProp,
/* eslint-enable no-unused-vars */
diff --git a/src/lib/project-saver-hoc.jsx b/src/lib/project-saver-hoc.jsx
index 6d85eca4c..19cd53c23 100644
--- a/src/lib/project-saver-hoc.jsx
+++ b/src/lib/project-saver-hoc.jsx
@@ -90,14 +90,14 @@ const ProjectSaverHOC = function (WrappedComponent) {
const {
/* eslint-disable no-unused-vars */
createProject: createProjectProp,
- onCreated: onCreatedProp,
- onUpdated: onUpdatedProp,
- onError: onErrorProp,
isCreating: isCreatingProp,
isShowingWithId: isShowingWithIdProp,
isShowingWithoutId: isShowingWithoutIdProp,
isUpdating: isUpdatingProp,
loadingState,
+ onCreated: onCreatedProp,
+ onError: onErrorProp,
+ onUpdated: onUpdatedProp,
reduxProjectId,
saveProject: saveProjectProp,
/* eslint-enable no-unused-vars */
diff --git a/src/lib/vm-manager-hoc.jsx b/src/lib/vm-manager-hoc.jsx
index 6e1d0125c..bc4b1348f 100644
--- a/src/lib/vm-manager-hoc.jsx
+++ b/src/lib/vm-manager-hoc.jsx
@@ -48,17 +48,18 @@ const vmManagerHOC = function (WrappedComponent) {
this.props.onLoadedProject(this.props.loadingState, this.props.canSave);
})
.catch(e => {
- this.props.onError(e);
+ this.props.onError(`vm-manager-hoc error: ${e}`);
});
}
render () {
const {
/* eslint-disable no-unused-vars */
fontsLoaded,
+ loadingState,
+ onError: onErrorProp,
onLoadedProject: onLoadedProjectProp,
projectData,
projectId,
- loadingState,
/* eslint-enable no-unused-vars */
isLoadingWithId: isLoadingWithIdProp,
vm,
--
GitLab