updated to conform to merged changes to error handling

Author: benjiwheeler

src/lib/project-fetcher-hoc.jsx

@@ -8,8 +8,8 @@ import {
     LoadingStates,
     defaultProjectId,
     getIsFetchingWithId,
-    onError,
     onFetchedProjectData,
+    projectError,
     setProjectId
 } from '../reducers/project-state';
 
@@ -127,7 +127,7 @@ const ProjectFetcherHOC = function (WrappedComponent) {
         reduxProjectId: state.scratchGui.projectState.projectId
     });
     const mapDispatchToProps = dispatch => ({
-        onError: error => dispatch(onError(error)),
+        onError: error => dispatch(projectError(error)),
         onFetchedProjectData: (projectData, loadingState) =>
             dispatch(onFetchedProjectData(projectData, loadingState)),
         setProjectId: projectId => dispatch(setProjectId(projectId))

src/lib/vm-manager-hoc.jsx

@@ -8,9 +8,9 @@ import AudioEngine from 'scratch-audio';
 
 import {
     LoadingStates,
-    onError,
+    getIsLoadingWithId,
     onLoadedProject,
-    getIsLoadingWithId
+    projectError
 } from '../reducers/project-state';
 
 /*
@@ -98,7 +98,7 @@ const vmManagerHOC = function (WrappedComponent) {
     };
 
     const mapDispatchToProps = dispatch => ({
-        onError: error => dispatch(onError(error)),
+        onError: error => dispatch(projectError(error)),
         onLoadedProject: (loadingState, canSave) =>
             dispatch(onLoadedProject(loadingState, canSave))
     });

src/reducers/project-state.js

@@ -361,7 +361,7 @@ const doneUpdatingProject = loadingState => {
     }
 };
 
-const onError = error => ({
+const projectError = error => ({
     type: START_ERROR,
     error: error
 });
@@ -399,24 +399,24 @@ export {
     LoadingStates,
     createProject,
     defaultProjectId,
+    doneCreatingProject,
+    doneUpdatingProject,
     getIsCreating,
     getIsError,
-    getIsFetchingWithoutId,
     getIsFetchingWithId,
+    getIsFetchingWithoutId,
     getIsLoadingWithId,
-    getIsUpdating,
     getIsShowingProject,
     getIsShowingWithId,
     getIsShowingWithoutId,
-    doneCreatingProject,
-    projectError,
+    getIsUpdating,
     onFetchedProjectData,
     onLoadedProject,
     onProjectUploadStarted,
-    doneUpdatingProject,
-    requestNewProject,
+    projectError,
     remixProject,
-    updateProject,
+    requestNewProject,
     saveProjectAsCopy,
-    setProjectId
+    setProjectId,
+    updateProject
 };

test/unit/reducers/project-state-reducer.test.js

@@ -276,7 +276,7 @@ test('projectError from various states should show error', () => {
             error: null,
             loadingState: startState
         };
-        const action = onError({message: 'Error string'});
+        const action = projectError({message: 'Error string'});
         const resultState = projectStateReducer(initialState, action);
         expect(resultState.loadingState).toBe(LoadingState.ERROR);
         expect(resultState.error).toEqual({message: 'Error string'});
@@ -288,7 +288,7 @@ test('projectError from showing project should show error', () => {
         error: null,
         loadingState: LoadingState.FETCHING_WITH_ID
     };
-    const action = onError({message: 'Error string'});
+    const action = projectError({message: 'Error string'});
     const resultState = projectStateReducer(initialState, action);
     expect(resultState.loadingState).toBe(LoadingState.ERROR);
     expect(resultState.error).toEqual({message: 'Error string'});