Merge pull request code-dot-org#10292 from code-dot-org/lockableAuthorized

[axof: 234] Lockable authorized

Author: Bjvanminnen

apps/src/code-studio/components/progress/ScriptTeacherPanel.js

@@ -63,7 +63,7 @@ const ScriptTeacherPanel = React.createClass({
     ).isRequired,
     selectedSection: React.PropTypes.string,
     sectionsLoaded: React.PropTypes.bool.isRequired,
-    scriptHasLockedStages: React.PropTypes.bool.isRequired,
+    scriptHasLockableStages: React.PropTypes.bool.isRequired,
     unlockedStageNames: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
     setViewType: React.PropTypes.func.isRequired,
     selectSection: React.PropTypes.func.isRequired,
@@ -80,7 +80,7 @@ const ScriptTeacherPanel = React.createClass({
       selectedSection,
       sectionsLoaded,
       setViewType,
-      scriptHasLockedStages,
+      scriptHasLockableStages,
       unlockedStageNames
     } = this.props;
     const hasSections = Object.keys(sections).length > 0;
@@ -90,7 +90,7 @@ const ScriptTeacherPanel = React.createClass({
         <div className="content">
           <ViewAsToggle viewAs={viewAs} setViewType={setViewType}/>
           {!sectionsLoaded && <div style={styles.text}>{commonMsg.loading()}</div>}
-          {scriptHasLockedStages && hasSections &&
+          {scriptHasLockableStages && hasSections &&
             <select
               name="sections"
               style={styles.select}
@@ -104,7 +104,7 @@ const ScriptTeacherPanel = React.createClass({
               ))}
             </select>
           }
-          {scriptHasLockedStages && hasSections && this.props.viewAs === ViewType.Teacher &&
+          {scriptHasLockableStages && hasSections && this.props.viewAs === ViewType.Teacher &&
             <div>
               <div style={styles.text}>
                 {commonMsg.selectSection()}
@@ -134,7 +134,7 @@ const ScriptTeacherPanel = React.createClass({
 });
 
 export default connect((state, ownProps) => {
-  const { viewAs, sections, selectedSection, sectionsLoaded } = state.stageLock;
+  const { viewAs, sections, selectedSection, sectionsLoaded, lockableAuthorized } = state.stageLock;
   const currentSection = sections[selectedSection];
   const stages = currentSection ? currentSection.stages : {};
 
@@ -149,14 +149,16 @@ export default connect((state, ownProps) => {
     stageNames[stage.id] = stage.name;
   });
 
-  const scriptHasLockedStages = state.progress.stages.some(stage => stage.lockable);
+  // Pretend we don't have lockable stages if we're not authorized to see them
+  const scriptHasLockableStages = lockableAuthorized &&
+    state.progress.stages.some(stage => stage.lockable);
 
   return {
     viewAs,
     sections,
     selectedSection,
     sectionsLoaded,
-    scriptHasLockedStages,
+    scriptHasLockableStages,
     unlockedStageNames: unlockedStageIds.map(id => stageNames[id])
   };
 }, dispatch => ({

apps/src/code-studio/components/progress/course_progress_row.jsx

@@ -130,6 +130,6 @@ const CourseProgressRow = React.createClass({
 export default connect(state => ({
   showTeacherInfo: state.progress.showTeacherInfo &&
     state.stageLock.viewAs !== ViewType.Student,
-  lockableAuthorized: state.progress.lockableAuthorized,
+  lockableAuthorized: state.stageLock.lockableAuthorized,
   changeFocusAreaPath: state.progress.changeFocusAreaPath,
 }))(Radium(CourseProgressRow));

apps/src/code-studio/progress.js

@@ -21,9 +21,9 @@ import {
   initProgress,
   mergeProgress,
   updateFocusArea,
-  showTeacherInfo,
-  authorizeLockable
+  showTeacherInfo
 } from './progressRedux';
+import { authorizeLockable } from './stageLockRedux';
 
 var progress = module.exports;
 

apps/src/code-studio/progressRedux.js

@@ -15,7 +15,6 @@ const INIT_PROGRESS = 'progress/INIT_PROGRESS';
 const MERGE_PROGRESS = 'progress/MERGE_PROGRESS';
 const UPDATE_FOCUS_AREAS = 'progress/UPDATE_FOCUS_AREAS';
 const SHOW_TEACHER_INFO = 'progress/SHOW_TEACHER_INFO';
-const AUTHORIZE_LOCKABLE = 'progress/AUTHORIZE_LOCKABLE';
 
 const initialState = {
   currentLevelId: null,
@@ -28,8 +27,6 @@ const initialState = {
   peerReviewsRequired: {},
   peerReviewsPerformed: [],
   showTeacherInfo: false,
-  // whether user is allowed to see lockable stages
-  lockableAuthorized: false
 };
 
 /**
@@ -90,12 +87,6 @@ export default function reducer(state = initialState, action) {
     });
   }
 
-  if (action.type === AUTHORIZE_LOCKABLE) {
-    return Object.assign({}, state, {
-      lockableAuthorized: true
-    });
-  }
-
   return state;
 }
 
@@ -157,11 +148,6 @@ export const updateFocusArea = (changeFocusAreaPath, focusAreaPositions) => ({
 
 export const showTeacherInfo = () => ({ type: SHOW_TEACHER_INFO });
 
-/**
- * Authorizes the user to be able to see lockable stages
- */
-export const authorizeLockable = () => ({ type: AUTHORIZE_LOCKABLE });
-
 /* start-test-block */
 // export private function(s) to expose to unit testing
 export const __testonly__ = {

apps/src/code-studio/stageLockRedux.js

@@ -17,6 +17,7 @@ const OPEN_LOCK_DIALOG = 'stageLock/OPEN_LOCK_DIALOG';
 export const CLOSE_LOCK_DIALOG = 'stageLock/CLOSE_LOCK_DIALOG';
 export const BEGIN_SAVE = 'stageLock/BEGIN_SAVE';
 export const FINISH_SAVE = 'stageLock/FINISH_SAVE';
+const AUTHORIZE_LOCKABLE = 'progress/AUTHORIZE_LOCKABLE';
 
 export const initialState = {
   viewAs: ViewType.Teacher,
@@ -26,13 +27,21 @@ export const initialState = {
   lockDialogStageId: null,
   // The locking info for the currently selected section/stage
   lockStatus: [],
-  saving: false
+  saving: false,
+  // whether user is allowed to see lockable stages
+  lockableAuthorized: false
 };
 
 /**
  * Stage lock reducer
  */
 export default function reducer(state = initialState, action) {
+  if (action.type === AUTHORIZE_LOCKABLE) {
+    return Object.assign({}, state, {
+      lockableAuthorized: true
+    });
+  }
+
   if (action.type === SET_VIEW_TYPE) {
     return Object.assign({}, state, {
       viewAs: action.viewAs
@@ -110,6 +119,12 @@ export default function reducer(state = initialState, action) {
 }
 
 // Action creators
+
+/**
+ * Authorizes the user to be able to see lockable stages
+ */
+export const authorizeLockable = () => ({ type: AUTHORIZE_LOCKABLE });
+
 export const setViewType = viewType => {
   if (!ViewType[viewType]) {
     throw new Error('unknown ViewType: ' + viewType);