From 461877b7334ada3e34389207b80e3266b06cfcdd Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Mon, 6 Jan 2020 15:10:27 -0500
Subject: [PATCH] =?UTF-8?q?project=20state=20loading=20should=20error=20if?=
=?UTF-8?q?=20can=E2=80=99t=20load=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/reducers/project-state.js | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/reducers/project-state.js b/src/reducers/project-state.js
index 91e51bbe4..a26d7c971 100644
--- a/src/reducers/project-state.js
+++ b/src/reducers/project-state.js
@@ -17,7 +17,7 @@ const START_AUTO_UPDATING = 'scratch-gui/project-state/START_AUTO_UPDATING';
const START_CREATING_NEW = 'scratch-gui/project-state/START_CREATING_NEW';
const START_ERROR = 'scratch-gui/project-state/START_ERROR';
const START_FETCHING_NEW = 'scratch-gui/project-state/START_FETCHING_NEW';
-const START_LOADING_VM_FILE_UPLOAD = 'scratch-gui/project-state/START_LOADING_FILE_UPLOAD';
+const START_LOADING_VM_FILE_UPLOAD = 'scratch-gui/project-state/START_LOADING_VM_FILE_UPLOAD';
const START_MANUAL_UPDATING = 'scratch-gui/project-state/START_MANUAL_UPDATING';
const START_REMIXING = 'scratch-gui/project-state/START_REMIXING';
const START_UPDATING_BEFORE_CREATING_COPY = 'scratch-gui/project-state/START_UPDATING_BEFORE_CREATING_COPY';
@@ -435,10 +435,21 @@ const onLoadedProject = (loadingState, canSave, success) => {
default:
return;
}
+ } else {
+ switch (loadingState) {
+ case LoadingState.LOADING_VM_WITH_ID:
+ case LoadingState.LOADING_VM_FILE_UPLOAD:
+ return {
+ type: RETURN_TO_SHOWING
+ };
+ case LoadingState.LOADING_VM_NEW_DEFAULT:
+ return {
+ type: START_ERROR
+ };
+ default:
+ return;
+ }
}
- return {
- type: RETURN_TO_SHOWING
- };
};
const doneUpdatingProject = loadingState => {
--
GitLab