Refactor logic for restoring from localStorage

The behavior is now the same regardless of whether you're
authenticated or not!

Author: greenberga

src/actions/clients.js

@@ -18,3 +18,5 @@ export const repoExportError = createAction('REPO_EXPORT_ERROR');
 export const repoExportDisplayed = createAction('REPO_EXPORT_DISPLAYED');
 export const repoExportNotDisplayed =
   createAction('REPO_EXPORT_NOT_DISPLAYED');
+export const projectRestoredFromLastSession =
+  createAction('PROJECT_RESTORED_FROM_LAST_SESSION');

src/reducers/currentProject.js

@@ -19,6 +19,8 @@ function currentProject(stateIn, action) {
       return state.set('projectKey', action.payload.projectKey);
     case 'GIST_IMPORTED':
       return state.set('projectKey', action.payload.projectKey);
+    case 'PROJECT_RESTORED_FROM_LAST_SESSION':
+      return state.set('projectKey', action.payload.projectKey);
     default:
       return state;
   }

src/reducers/projects.js

@@ -127,6 +127,9 @@ export default function reduceProjects(stateIn, action) {
         action.payload.gistData,
       );
 
+    case 'PROJECT_RESTORED_FROM_LAST_SESSION':
+      return addProject(state, action.payload);
+
     case 'TOGGLE_LIBRARY':
       return state.updateIn(
         [action.payload.projectKey, 'enabledLibraries'],

src/sagas/errors.js

@@ -63,6 +63,11 @@ export default function* () {
     takeEvery('CHANGE_CURRENT_PROJECT', validateCurrentProject, tasks),
     takeEvery('GIST_IMPORTED', validateCurrentProject, tasks),
     takeEvery('SNAPSHOT_IMPORTED', validateCurrentProject, tasks),
+    takeEvery(
+      'PROJECT_RESTORED_FROM_LAST_SESSION',
+      validateCurrentProject,
+      tasks,
+    ),
     takeEvery('UPDATE_PROJECT_SOURCE', updateProjectSource, tasks),
     takeEvery('TOGGLE_LIBRARY', toggleLibrary, tasks),
   ]);

src/sagas/projects.js

@@ -16,14 +16,14 @@ import {
   gistNotFound,
   projectCreated,
   projectLoaded,
-  changeCurrentProject as __changeCurrentProject,
 } from '../actions/projects';
 import {
   snapshotImported,
   snapshotImportError,
   snapshotNotFound,
+  projectRestoredFromLastSession,
 } from '../actions/clients';
-import {getProjectKeys, saveCurrentProject} from '../util/projectUtils';
+import {saveCurrentProject} from '../util/projectUtils';
 import {loadGistFromId} from '../clients/github';
 import {loadAllProjects, loadProjectSnapshot} from '../clients/firebase';
 import {getCurrentUserId} from '../selectors';
@@ -51,14 +51,7 @@ export function* changeCurrentProject() {
 }
 
 export function* rehydrateProject({payload: {rehydratedProject}}) {
-  const state = yield select();
-  const allProjectKeys = getProjectKeys(state);
-  if (allProjectKeys.includes(rehydratedProject.projectKey)) {
-    yield put(__changeCurrentProject(rehydratedProject.projectKey));
-  } else {
-    yield put(projectLoaded(rehydratedProject));
-    yield put(__changeCurrentProject(rehydratedProject.projectKey));
-  }
+  yield put(projectRestoredFromLastSession(rehydratedProject));
 }
 
 export function* importSnapshot({payload: {snapshotKey}}) {