DTP (Test > Production: b2fc53be)

Gemfile.lock

@@ -384,7 +384,7 @@ GEM
       sysexits (~> 1.1)
     hashdiff (0.3.7)
     hashery (2.1.2)
-    hashie (3.4.4)
+    hashie (3.4.6)
     highline (1.6.21)
     honeybadger (3.3.0)
     html2haml (2.2.0)
@@ -498,7 +498,7 @@ GEM
     oily_png (1.2.0)
       chunky_png (~> 1.3.1)
     oj (3.3.10)
-    omniauth (1.3.1)
+    omniauth (1.3.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (4.0.0)
@@ -551,7 +551,7 @@ GEM
       multi_json (~> 1.0)
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-cache (1.6.1)
       rack (>= 0.4)
     rack-mini-profiler (0.10.1)

apps/.storybook/config.js

@@ -4,7 +4,6 @@ import { setOptions } from '@storybook/addon-options';
 import Node from '@storybook/addon-info/dist/components/Node';
 import Props from '@storybook/addon-info/dist/components/Props';
 import {Pre} from '@storybook/addon-info/dist/components/markdown/code';
-import addStoriesGroup from 'react-storybook-addon-add-stories-group';
 import experiments from '@cdo/apps/util/experiments';
 import withReduxStore from '../test/util/withReduxStore';
 
@@ -178,7 +177,6 @@ storybook.setAddon({
   }
 });
 
-storybook.setAddon(addStoriesGroup);
 storybook.addDecorator(story => {
   var rendered = story();
   return (

apps/Gruntfile.js

@@ -714,16 +714,6 @@ describe('entry tests', () => {
     }
   },
 
-  config.strip_code = {
-    options: {
-      start_comment: 'start-test-block',
-      end_comment: 'end-test-block'
-    },
-    all: {
-      src: ['build/js/*.js']
-    }
-  };
-
   config.notify = {
     'js-build': {options: {message: 'JS build completed.'}},
     sass: {options: {message: 'SASS build completed.'}},
@@ -771,7 +761,6 @@ describe('entry tests', () => {
     'newer:copy:src',
     'newer:copy:lib',
     'locales',
-    'newer:strip_code',
     'ejs'
   ]);
 

apps/i18n/common/en_us.json

@@ -225,6 +225,7 @@
   "copyright": "Copyright",
   "correct": "Correct",
   "correctAnswer": "That is the correct answer.",
+  "count": "Count",
   "country": "Country",
   "course": "Course",
   "courseBlocksCsfExpressHeading": "Computer Science Fundamentals Express Courses",
@@ -354,6 +355,7 @@
   "done": "Done",
   "dontForget": "Don't forget",
   "downloadCSV": "Download CSV",
+  "downloadAssessmentCSV": "Download CSV of student responses",
   "dragBlocksToMatch": "Drag the blocks to match",
   "dropletBlock_addOperator_description": "Add two numbers",
   "dropletBlock_addOperator_signatureOverride": "Add operator",
@@ -728,7 +730,7 @@
   "moveStudents": "Move students",
   "moveStudentsConfirm": "No, I want to move student(s) to be in the new section only.",
   "moveToSection": "Move to section",
-  "multipleChoiceQuestionsOverview": "Multiple choice questions overview ({numSubmissions} submissions / {numStudents} students)",
+  "multipleChoiceQuestionsOverview": "Multiple choice questions overview ({numSubmissions} / {numStudents} students)",
   "multipleChoiceStudentOverview": "Multiple choice questions overview ({studentName})",
   "myCourses": "My Courses",
   "myProjects": "My Projects",
@@ -930,6 +932,7 @@
   "puzzleRatingQuestion": "Did you like this puzzle?",
   "puzzleTitle": "Puzzle {puzzle_number} of {stage_total}",
   "question": "Question",
+  "questionText": "Question text",
   "quickActions": "Quick actions",
   "rateButtonsLabel": "Rate:",
   "readonlyWorkspaceHeader": "View only: ",
@@ -1143,6 +1146,7 @@
   "thankyou": "Thank you",
   "thankyouForAnswer": "Thank you for submitting an answer.",
   "thumbnailWarning": "Note: You must finish running your app to create a thumbnail, before you can publish your app.",
+  "timestamp": "Time stamp",
   "toggleBlocksErrorMsg": "You need to correct an error in your program before it can be shown as blocks.",
   "tooFewBody": "Please select two answers before submitting.",
   "tooFewTitle": "Too few answers.",

apps/package.json

@@ -80,10 +80,8 @@
     "chalk": "^1.1.3",
     "chrome-serialport": "bcjordan/chrome-serialport#2",
     "classnames": "^2.2.5",
-    "codecov": "^1.0.1",
     "codemirror": "5.5",
     "codemirror-spell-checker": "^1.1.2",
-    "connect-livereload": "0.5.3",
     "copy-webpack-plugin": "^3.0.0",
     "css-loader": "^0.23.1",
     "csv-parse": "^1.1.7",
@@ -117,10 +115,7 @@
     "grunt-karma": "^2.0.0",
     "grunt-newer": "1.1.1",
     "grunt-notify": "0.4.5",
-    "grunt-open": "^0.2.3",
-    "grunt-parallel": "^0.5.1",
     "grunt-sass": "1.1.0",
-    "grunt-strip-code": "0.1.2",
     "grunt-webpack": "^2.0.1",
     "hammerjs": "^2.0.8",
     "history": "^2.0.1",
@@ -150,7 +145,7 @@
     "messageformat": "0.2.2",
     "mocha": "^3.1.2",
     "mock-firmata": "0.2.0",
-    "moment": "2.14.1",
+    "moment": "^2.19.3",
     "newrelic": "^1.27.2",
     "node-js-marker-clusterer": "^1.0.0",
     "node-sass": "^4.0.0",
@@ -166,10 +161,10 @@
     "react-addons-test-utils": "~15.4.0",
     "react-bootstrap": "0.30.1",
     "react-color": "^2.11.7",
-    "react-datepicker": "0.37.0",
+    "react-datepicker": "1.5.0",
     "react-dom": "~15.4.0",
     "react-google-charts": "^1.5.5",
-    "react-idle-timer": "1.3.3",
+    "react-idle-timer": "1.5.2",
     "react-lazy-load": "3.0.10",
     "react-motion": "0.4.5",
     "react-onclickoutside": "^5.7.1",
@@ -179,7 +174,6 @@
     "react-router": "2.6.0",
     "react-select": "^1.2.1",
     "react-sticky": "5.0.5",
-    "react-storybook-addon-add-stories-group": "0.1.0",
     "react-tether": "^0.5.2",
     "react-tooltip": "^3.2.7",
     "react-virtualized": "^9.18.5",
@@ -225,7 +219,6 @@
     "filesaver.js": "0.2.0",
     "jshint": "^2.9.5",
     "jszip": "3.0.0",
-    "moment": "^2.14.1",
     "object-fit-images": "^3.2.3",
     "qrcode.react": "^0.8.0",
     "query-string": "4.1.0",

apps/src/calc/calc.js

@@ -1203,11 +1203,9 @@ function onReportComplete(response) {
   displayFeedback();
 }
 
-/* start-test-block */
 // export private function(s) to expose to unit testing
-Calc.__testonly__ = {
+Calc.__testonly__ = IN_UNIT_TEST ? {
   displayGoal: displayGoal,
   displayComplexUserExpressions: displayComplexUserExpressions,
   appState: appState
-};
-/* end-test-block */
+} : {};

apps/src/code-studio/progressRedux.js

@@ -570,12 +570,10 @@ export const progressionsFromLevels = levels => {
   return progressions;
 };
 
-/* start-test-block */
 // export private function(s) to expose to unit testing
-export const __testonly__ = {
+export const __testonly__ = IN_UNIT_TEST ? {
   bestResultLevelId,
   peerReviewLesson,
   peerReviewLevels,
   PEER_REVIEW_ID
-};
-/* end-test-block */
+} : {};

apps/src/jigsaw/jigsaw.js

@@ -144,6 +144,7 @@ Jigsaw.init = function (config) {
 
   config.enableShowCode = false;
   config.enableShowBlockCount = false;
+  config.showUnusedBlocks = false;
 
   var onMount = function () {
     studioApp().init(config);

apps/src/lib/ui/accounts/AddPasswordForm.jsx

@@ -1,5 +1,6 @@
 import React, {PropTypes} from 'react';
 import i18n from '@cdo/locale';
+import * as utils from '../../../utils';
 import color from '@cdo/apps/util/color';
 import {Field} from '../SystemDialog/SystemDialog';
 import BootstrapButton from './BootstrapButton';
@@ -116,6 +117,7 @@ export default class AddPasswordForm extends React.Component {
         message: SUCCESS_STATE
       }
     });
+    utils.reload();
   };
 
   onFailure = (error) => {

apps/src/redux/instructions.js

@@ -33,7 +33,6 @@ const LOCALSTORAGE_OVERLAY_SEEN_FLAG = 'instructionsOverlaySeenOnce';
  */
 const instructionsInitialState = {
   noInstructionsWhenCollapsed: false,
-  hasInlineImages: false,
   shortInstructions: undefined,
   shortInstructions2: undefined,
   longInstructions: undefined,
@@ -64,7 +63,6 @@ export default function reducer(state = {...instructionsInitialState}, action) {
     }
     const {
       noInstructionsWhenCollapsed,
-      hasInlineImages,
       shortInstructions,
       shortInstructions2,
       longInstructions,
@@ -82,7 +80,6 @@ export default function reducer(state = {...instructionsInitialState}, action) {
     }
     return Object.assign({}, state, {
       noInstructionsWhenCollapsed,
-      hasInlineImages,
       shortInstructions,
       shortInstructions2,
       longInstructions,
@@ -148,11 +145,10 @@ export default function reducer(state = {...instructionsInitialState}, action) {
 
 export const setInstructionsConstants = ({noInstructionsWhenCollapsed,
     shortInstructions, shortInstructions2, longInstructions,
-    hasContainedLevels, hasInlineImages, overlayVisible, teacherMarkdown, levelVideos,
+    hasContainedLevels, overlayVisible, teacherMarkdown, levelVideos,
     mapReference, referenceLinks}) => ({
   type: SET_CONSTANTS,
   noInstructionsWhenCollapsed,
-  hasInlineImages,
   shortInstructions,
   shortInstructions2,
   longInstructions,
@@ -343,7 +339,6 @@ export const determineInstructionsConstants = config => {
 
   return {
     noInstructionsWhenCollapsed: !!noInstructionsWhenCollapsed,
-    hasInlineImages: !!config.skin.instructions2ImageSubstitutions,
     overlayVisible: !!shouldShowOverlay,
     shortInstructions,
     shortInstructions2,

apps/src/redux/pageConstants.js

@@ -21,7 +21,6 @@ var ALLOWED_KEYS = new Set([
   'isSubmittable',
   'isSubmitted',
   'noInstructionsWhenCollapsed',
-  'hasInlineImages',
   'puzzleNumber',
   'stageTotal',
   'showDebugButtons',

apps/src/templates/BaseDialog.jsx

@@ -6,8 +6,8 @@ import React, {PropTypes} from 'react';
  * semi-transparent backdrop. Can be closed by clicking the x, clicking the
  * backdrop, or pressing esc.
  */
-var BaseDialog = React.createClass({
-  propTypes: {
+export default class BaseDialog extends React.Component {
+  static propTypes = {
     isOpen: PropTypes.bool,
     handleClose: PropTypes.func,
     uncloseable: PropTypes.bool,
@@ -22,45 +22,45 @@ var BaseDialog = React.createClass({
     fixedWidth: PropTypes.number,
     fixedHeight: PropTypes.number,
     style: PropTypes.object,
-  },
+  };
 
-  componentDidMount: function () {
+  componentDidMount() {
     this.focusDialog();
-  },
+  }
 
-  componentDidUpdate: function () {
+  componentDidUpdate() {
     this.focusDialog();
-  },
+  }
 
-  handleKeyDown: function (event) {
+  handleKeyDown = (event) => {
     if (event.key === 'Escape') {
       this.closeDialog();
     }
     this.props.handleKeyDown && this.props.handleKeyDown(event);
-  },
+  };
 
-  closeDialog: function () {
+  closeDialog = () => {
     if (!this.props.uncloseable && this.props.handleClose) {
       this.props.handleClose();
     }
-  },
+  };
 
   /** @returns {Array.<Element>} */
   getTabbableElements() {
     return [].slice.call(this.refs.dialog.querySelectorAll('a,button,input'));
-  },
+  }
 
-  focusDialog: function () {
+  focusDialog() {
     // Don't steal focus if the active element is already a descendant of the
     // dialog - prevents focus loss on updates of open BaseDialog components.
     const descendantIsActive = document.activeElement && this.refs.dialog &&
         this.refs.dialog.contains(document.activeElement);
     if (this.props.isOpen && !descendantIsActive) {
       this.refs.dialog.focus();
     }
-  },
+  }
 
-  render: function () {
+  render() {
     if (!this.props.isOpen && !this.props.hideBackdrop) {
       return <div></div>;
     }
@@ -147,5 +147,4 @@ var BaseDialog = React.createClass({
       </div>
     );
   }
-});
-module.exports = BaseDialog;
+}

apps/src/templates/Dialog.jsx

@@ -125,8 +125,9 @@ Icon.propTypes = {
   src: PropTypes.string.isRequired,
 };
 
-const Dialog = React.createClass({
-  propTypes: Object.assign({}, BaseDialog.propTypes, {
+export default class Dialog extends React.Component {
+  static propTypes = {
+    ...BaseDialog.propTypes,
     children: childrenOfType(
       Icon,
       Title,
@@ -143,9 +144,9 @@ const Dialog = React.createClass({
     confirmText: whenNoChildOfTypes(Buttons),
     onConfirm: whenNoChildOfTypes(Buttons),
     confirmType: whenNoChildOfTypes(Buttons),
-  }),
+  };
 
-  handleKeyDown(event) {
+  handleKeyDown = (event) => {
     // Focus the next button, input or link when tab is pressed, to prevent the
     // user from selecting elements outside of the dialog.
     if (event.key === 'Tab') {
@@ -158,7 +159,7 @@ const Dialog = React.createClass({
       }
       event.preventDefault();
     }
-  },
+  };
 
   render() {
     var children = [];
@@ -204,7 +205,4 @@ const Dialog = React.createClass({
       </BaseDialog>
     );
   }
-});
-
-
-export default Dialog;
+}