Merge pull request #1420 from jwang1919/fix-instructions-bar-maximize-bug

#1398 Unhide instructions component on START_EDITING_INSTRUCTIONS state.

Author: outoftime

src/actions/ui.js

@@ -61,6 +61,8 @@ export const closeTopBarMenu = createAction(
 
 export const startEditingInstructions = createAction(
   'START_EDITING_INSTRUCTIONS',
+  projectKey => ({projectKey}),
+  (_projectKey, timestamp = Date.now()) => ({timestamp}),
 );
 
 export const cancelEditingInstructions = createAction(

src/components/TopBar/index.jsx

@@ -107,7 +107,8 @@ export default function TopBar({
         onExportGist={onExportGist}
         onExportRepo={onExportRepo}
         onExportToClassroom={onExportToClassroom}
-        onStartEditingInstructions={onStartEditingInstructions}
+        onStartEditingInstructions={
+          partial(onStartEditingInstructions, currentProjectKey)}
       />
     </header>
   );

src/containers/TopBar.js

@@ -95,8 +95,8 @@ function mapDispatchToProps(dispatch) {
       dispatch(logOut());
     },
 
-    onStartEditingInstructions() {
-      dispatch(startEditingInstructions());
+    onStartEditingInstructions(projectKey) {
+      dispatch(startEditingInstructions(projectKey));
     },
 
     onStartLogIn() {

src/reducers/projects.js

@@ -201,6 +201,14 @@ export default function reduceProjects(stateIn, action) {
         action.meta.timestamp,
       );
 
+    case 'START_EDITING_INSTRUCTIONS':
+      return unhideComponent(
+        state,
+        action.payload.projectKey,
+        'instructions',
+        action.meta.timestamp,
+      );
+
     default:
       return state;
   }