stripped title handling from sb file uploader; updated more projectState related names

benjiwheeler · benjiwheeler · commit ed4c063ca258 · 2018-10-10T22:24:44.000-04:00
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
@@ -328,9 +328,7 @@ class MenuBar extends React.Component {
                                     </MenuItemTooltip>
                                 </MenuSection>
                                 <MenuSection>
-                                    <SBFileUploader
-                                        onUpdateProjectTitle={this.props.onUpdateProjectTitle}
-                                    >
+                                    <SBFileUploader>
                                         {(renderFileInput, loadProject) => (
                                             <MenuItem
                                                 onClick={loadProject}
@@ -654,7 +652,7 @@ MenuBar.propTypes = {
 };
 
 const mapStateToProps = state => {
-    const loadingState = state.scratchGui.projectId.loadingState;
+    const loadingState = state.scratchGui.projectState.loadingState;
     const user = state.session && state.session.session && state.session.session.user;
     return {
         accountMenuOpen: accountMenuOpen(state),
diff --git a/src/containers/sb-file-uploader.jsx b/src/containers/sb-file-uploader.jsx
@@ -7,7 +7,7 @@ import {defineMessages, injectIntl, intlShape} from 'react-intl';
 import analytics from '../lib/analytics';
 import log from '../lib/log';
 import {setProjectTitle} from '../reducers/project-title';
-import {onLoadedProject, onProjectUploadStarted} from '../reducers/project-state';
+import {LoadingStates, onLoadedProject, onProjectUploadStarted} from '../reducers/project-state';
 
 import {
     openLoadingProject,
@@ -61,15 +61,15 @@ class SBFileUploader extends React.Component {
                     action: 'Import Project File',
                     nonInteraction: true
                 });
-                this.props.onLoadingFinished();
+                this.props.onLoadingFinished(this.props.loadingState);
                 // Reset the file input after project is loaded
                 // This is necessary in case the user wants to reload a project
                 thisFileInput.value = null;
             })
             .catch(error => {
                 log.warn(error);
                 alert(this.props.intl.formatMessage(messages.loadError)); // eslint-disable-line no-alert
-                this.props.onLoadingFinished();
+                this.props.onLoadingFinished(this.props.loadingState);
                 // Reset the file input after project is loaded
                 // This is necessary in case the user wants to reload a project
                 thisFileInput.value = null;
@@ -82,10 +82,7 @@ class SBFileUploader extends React.Component {
                 const matches = thisFileInput.files[0].name.match(/^(.*)\.sb3$/);
                 if (matches) {
                     const truncatedProjectTitle = matches[1].substring(0, 100);
-                    this.props.onSetReduxProjectTitle(truncatedProjectTitle);
-                    if (this.props.onUpdateProjectTitle) {
-                        this.props.onUpdateProjectTitle(truncatedProjectTitle);
-                    }
+                    this.props.onSetProjectTitle(truncatedProjectTitle);
                 }
             }
         }
@@ -116,24 +113,25 @@ class SBFileUploader extends React.Component {
 SBFileUploader.propTypes = {
     children: PropTypes.func,
     intl: intlShape.isRequired,
+    loadingState: PropTypes.oneOf(LoadingStates),
     onLoadingFinished: PropTypes.func,
     onLoadingStarted: PropTypes.func,
-    onSetReduxProjectTitle: PropTypes.func,
-    onUpdateProjectTitle: PropTypes.func,
+    onSetProjectTitle: PropTypes.func,
     vm: PropTypes.shape({
         loadProject: PropTypes.func
     })
 };
 const mapStateToProps = state => ({
+    loadingState: state.scratchGui.projectState.loadingState,
     vm: state.scratchGui.vm
 });
 
 const mapDispatchToProps = dispatch => ({
-    onLoadingFinished: () => {
-        dispatch(onLoadedProject());
+    onLoadingFinished: loadingState => {
+        dispatch(onLoadedProject(loadingState));
         dispatch(closeLoadingProject());
     },
-    onSetReduxProjectTitle: title => dispatch(setProjectTitle(title)),
+    onSetProjectTitle: title => dispatch(setProjectTitle(title)),
     onLoadingStarted: () => {
         dispatch(openLoadingProject());
         dispatch(onProjectUploadStarted());
diff --git a/src/lib/hash-parser-hoc.jsx b/src/lib/hash-parser-hoc.jsx
@@ -73,10 +73,10 @@ const HashParserHOC = function (WrappedComponent) {
         setProjectId: PropTypes.func
     };
     const mapStateToProps = state => {
-        const loadingState = state.scratchGui.projectId.loadingState;
+        const loadingState = state.scratchGui.projectState.loadingState;
         return {
             isFetchingWithoutId: getIsFetchingWithoutId(loadingState),
-            reduxProjectId: state.scratchGui.projectId.projectId
+            reduxProjectId: state.scratchGui.projectState.projectId
         };
     };
     const mapDispatchToProps = dispatch => ({
diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
@@ -117,9 +117,9 @@ const ProjectFetcherHOC = function (WrappedComponent) {
     };
 
     const mapStateToProps = state => ({
-        isFetchingWithId: getIsFetchingWithId(state.scratchGui.projectId.loadingState),
-        loadingState: state.scratchGui.projectId.loadingState,
-        reduxProjectId: state.scratchGui.projectId.projectId
+        isFetchingWithId: getIsFetchingWithId(state.scratchGui.projectState.loadingState),
+        loadingState: state.scratchGui.projectState.loadingState,
+        reduxProjectId: state.scratchGui.projectState.projectId
     });
     const mapDispatchToProps = dispatch => ({
         onFetchedProjectData: (projectData, loadingState) =>
diff --git a/src/lib/project-saver-hoc.jsx b/src/lib/project-saver-hoc.jsx
@@ -21,8 +21,6 @@ import {
  * <ProjectSaverHOC>
  *     <WrappedComponent />
  * </ProjectSaverHOC>
- *
- * storeProject(projectId): undefined value will cause POST/create; defined id will cause PUT/update
  */
 const ProjectSaverHOC = function (WrappedComponent) {
     class ProjectSaverComponent extends React.Component {
@@ -49,6 +47,11 @@ const ProjectSaverHOC = function (WrappedComponent) {
                     });
             }
         }
+        /**
+         * storeProject:
+         * @param  {number|string|undefined} projectId defined value causes PUT/update; undefined causes POST/create
+         * @return {Promise} resolves with json object containing project's existing or new id
+         */
         storeProject (projectId) {
             return this.props.vm.saveProjectSb3()
                 .then(content => {
@@ -62,7 +65,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
                         assetType,
                         dataFormat,
                         body,
-                        projectId // undefined value will cause POST/create; defined id will cause PUT/update
+                        projectId
                     );
                 });
         }
@@ -97,12 +100,12 @@ const ProjectSaverHOC = function (WrappedComponent) {
         vm: PropTypes.instanceOf(VM).isRequired
     };
     const mapStateToProps = state => {
-        const loadingState = state.scratchGui.projectId.loadingState;
+        const loadingState = state.scratchGui.projectState.loadingState;
         return {
             isCreating: getIsCreating(loadingState),
             isUpdating: getIsUpdating(loadingState),
             loadingState: loadingState,
-            reduxProjectId: state.scratchGui.projectId.projectId,
+            reduxProjectId: state.scratchGui.projectState.projectId,
             vm: state.scratchGui.vm
         };
     };
diff --git a/src/lib/vm-manager-hoc.jsx b/src/lib/vm-manager-hoc.jsx
@@ -83,19 +83,19 @@ const vmManagerHOC = function (WrappedComponent) {
 
     VMManager.propTypes = {
         isLoadingWithId: PropTypes.bool,
+        loadingState: PropTypes.oneOf(LoadingStates),
         onLoadedProject: PropTypes.func,
         projectData: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
         projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-        loadingState: PropTypes.oneOf(LoadingStates),
         vm: PropTypes.instanceOf(VM).isRequired
     };
 
     const mapStateToProps = state => {
-        const loadingState = state.scratchGui.projectId.loadingState;
+        const loadingState = state.scratchGui.projectState.loadingState;
         return {
             isLoadingWithId: getIsLoadingWithId(loadingState),
-            projectData: state.scratchGui.projectId.projectData,
-            projectId: state.scratchGui.projectId.projectId,
+            projectData: state.scratchGui.projectState.projectData,
+            projectId: state.scratchGui.projectState.projectId,
             loadingState: loadingState
         };
     };
diff --git a/src/reducers/gui.js b/src/reducers/gui.js
@@ -13,7 +13,7 @@ import modalReducer, {modalsInitialState} from './modals';
 import modeReducer, {modeInitialState} from './mode';
 import monitorReducer, {monitorsInitialState} from './monitors';
 import monitorLayoutReducer, {monitorLayoutInitialState} from './monitor-layout';
-import projectIdReducer, {projectIdInitialState} from './project-state';
+import projectStateReducer, {projectStateInitialState} from './project-state';
 import projectTitleReducer, {projectTitleInitialState} from './project-title';
 import restoreDeletionReducer, {restoreDeletionInitialState} from './restore-deletion';
 import stageSizeReducer, {stageSizeInitialState} from './stage-size';
@@ -43,7 +43,7 @@ const guiInitialState = {
     modals: modalsInitialState,
     monitors: monitorsInitialState,
     monitorLayout: monitorLayoutInitialState,
-    projectId: projectIdInitialState,
+    projectState: projectStateInitialState,
     projectTitle: projectTitleInitialState,
     restoreDeletion: restoreDeletionInitialState,
     targets: targetsInitialState,
@@ -110,7 +110,7 @@ const guiReducer = combineReducers({
     modals: modalReducer,
     monitors: monitorReducer,
     monitorLayout: monitorLayoutReducer,
-    projectId: projectIdReducer,
+    projectState: projectStateReducer,
     projectTitle: projectTitleReducer,
     restoreDeletion: restoreDeletionReducer,
     targets: targetReducer,
diff --git a/src/reducers/project-state.js b/src/reducers/project-state.js
@@ -323,7 +323,7 @@ const saveRequested = () => ({
 
 export {
     reducer as default,
-    initialState as projectIdInitialState,
+    initialState as projectStateInitialState,
     LoadingState,
     LoadingStates,
     defaultProjectId,
