Merge pull request #32437 from code-dot-org/csf-to-non-csf

Default to summary when toggling from standards view of csf to non-csf
code-dot-org · Dec 20, 2019 · 488427b · 488427b
2 parents 52187f7 + 202770b
commit 488427b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/apps/src/templates/sectionProgress/SectionProgress.jsx b/apps/src/templates/sectionProgress/SectionProgress.jsx
@@ -17,7 +17,8 @@ import {
   getCurrentProgress,
   getCurrentScriptData,
   setLessonOfInterest,
-  scriptDataPropType
+  scriptDataPropType,
+  setCurrentView
 } from './sectionProgressRedux';
 import {tooltipIdForLessonNumber} from './multiGridConstants';
 import {sectionDataPropType} from '@cdo/apps/redux/sectionDataRedux';
@@ -71,6 +72,7 @@ class SectionProgress extends Component {
     section: sectionDataPropType.isRequired,
     validScripts: PropTypes.arrayOf(validScriptPropType).isRequired,
     currentView: PropTypes.oneOf(Object.values(ViewType)),
+    setCurrentView: PropTypes.func.isRequired,
     scriptData: scriptDataPropType,
     loadScript: PropTypes.func.isRequired,
     setScriptId: PropTypes.func.isRequired,
@@ -83,6 +85,16 @@ class SectionProgress extends Component {
     this.props.loadScript(this.props.scriptId);
   }
 
+  componentDidUpdate() {
+    // Check if we are on a non-CSF script and
+    // currentView is Standards. If so re-set currentView to Summary since
+    // Standards doesn't apply.
+    const isCSF = this.props.scriptData && this.props.scriptData.csf;
+    if (this.props.currentView === ViewType.STANDARDS && !isCSF) {
+      this.props.setCurrentView(ViewType.SUMMARY);
+    }
+  }
+
   onChangeScript = scriptId => {
     this.props.setScriptId(scriptId);
     this.props.loadScript(scriptId);
@@ -150,8 +162,7 @@ class SectionProgress extends Component {
 
     const levelDataInitialized = scriptData && !isLoadingProgress;
     const lessons = scriptData ? scriptData.stages : [];
-    const csfCourseSelected =
-      levelDataInitialized && !scriptData.excludeCsfColumnInLegend;
+    const csfCourseSelected = levelDataInitialized && scriptData.csf;
     const summaryStyle =
       currentView === ViewType.SUMMARY ? styles.show : styles.hide;
     const detailStyle =
@@ -239,6 +250,9 @@ export default connect(
     },
     setLessonOfInterest(lessonOfInterest) {
       dispatch(setLessonOfInterest(lessonOfInterest));
+    },
+    setCurrentView(viewType) {
+      dispatch(setCurrentView(viewType));
     }
   })
 )(SectionProgress);
diff --git a/apps/test/unit/templates/sectionProgress/SectionProgressTest.js b/apps/test/unit/templates/sectionProgress/SectionProgressTest.js
@@ -18,6 +18,7 @@ describe('SectionProgress', () => {
   beforeEach(() => {
     DEFAULT_PROPS = {
       setLessonOfInterest: () => {},
+      setCurrentView: () => {},
       loadScript: () => {},
       setScriptId: () => {},
       scriptId: 1,

diff --git a/dashboard/app/models/script.rb b/dashboard/app/models/script.rb
@@ -1347,7 +1347,7 @@ def summarize(include_stages = true, user = nil, include_bonus_levels = false)
       hideable_stages: hideable_stages?,
       disablePostMilestone: disable_post_milestone?,
       isHocScript: hoc?,
-      isCSF: csf?,
+      csf: csf?,
       peerReviewsRequired: peer_reviews_to_complete || 0,
       peerReviewStage: peer_review_stage,
       student_detail_progress_view: student_detail_progress_view?,