Skip to content

refactor onLoadedProject() creator to handle success==false consistently; add tests of project state action creators #5362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 18, 2020
Merged

refactor onLoadedProject() creator to handle success==false consistently; add tests of project state action creators #5362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
461877b
project state loading should error if can’t load default
benjiwheeler Jan 6, 2020
50265fe
added tests for project loading states
benjiwheeler Jan 6, 2020
a4e2711
fixed typo
benjiwheeler Jan 6, 2020
3a8fe3f
reorganized switch and conditionals to be clearer; clarified test names
benjiwheeler Jan 27, 2020
2e11787
test resulting projectId; add comments; fix params
benjiwheeler Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions src/reducers/project-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -413,32 +413,31 @@ const onFetchedProjectData = (projectData, loadingState) => {
};

const onLoadedProject = (loadingState, canSave, success) => {
if (success) {
switch (loadingState) {
case LoadingState.LOADING_VM_WITH_ID:
return {
type: DONE_LOADING_VM_WITH_ID
};
case LoadingState.LOADING_VM_FILE_UPLOAD:
switch (loadingState) {
case LoadingState.LOADING_VM_WITH_ID:
if (success) {
return {type: DONE_LOADING_VM_WITH_ID};
}
// failed to load project; just keep showing current project
return {type: RETURN_TO_SHOWING};
case LoadingState.LOADING_VM_FILE_UPLOAD:
if (success) {
if (canSave) {
return {
type: DONE_LOADING_VM_TO_SAVE
};
return {type: DONE_LOADING_VM_TO_SAVE};
}
return {
type: DONE_LOADING_VM_WITHOUT_ID
};
case LoadingState.LOADING_VM_NEW_DEFAULT:
return {
type: DONE_LOADING_VM_WITHOUT_ID
};
default:
return;
return {type: DONE_LOADING_VM_WITHOUT_ID};
}
// failed to load project; just keep showing current project
return {type: RETURN_TO_SHOWING};
case LoadingState.LOADING_VM_NEW_DEFAULT:
if (success) {
return {type: DONE_LOADING_VM_WITHOUT_ID};
}
// failed to load default project; show error
return {type: START_ERROR};
Copy link
Contributor

@kchadha kchadha Feb 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to be clear, this is the piece of logic that is new to this PR, right? 
The rest of this is chunk of code is a refactor?

Copy link
Contributor Author

@benjiwheeler benjiwheeler Feb 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

default:
return;
}
return {
type: RETURN_TO_SHOWING
};
};

const doneUpdatingProject = loadingState => {
Expand Down
Loading