Merge pull request code-dot-org#36586 from code-dot-org/dtp_candidate_099b95ed

DTP (Test > Production: 099b95e)

Author: bethanyaconnor

apps/src/code-studio/clientState.js

@@ -4,6 +4,7 @@
  */
 import {trySetSessionStorage} from '../utils';
 import cookies from 'js-cookie';
+// Note: sessionStorage is not shared between tabs.
 var sessionStorage = window.sessionStorage;
 
 import {mergeActivityResult} from './activityUtils';

apps/src/code-studio/initApp/loadApp.js

@@ -4,7 +4,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {TestResults} from '@cdo/apps/constants';
 import {getStore} from '../redux';
-import {mergeProgress} from '../progressRedux';
+import {clearProgress, mergeProgress} from '../progressRedux';
 import {SignInState} from '@cdo/apps/templates/currentUserRedux';
 import {setVerified} from '@cdo/apps/code-studio/verifiedTeacherRedux';
 import {
@@ -33,6 +33,7 @@ import queryString from 'query-string';
 import * as imageUtils from '@cdo/apps/imageUtils';
 import trackEvent from '../../util/trackEvent';
 import msg from '@cdo/locale';
+import _ from 'lodash';
 
 // Max milliseconds to wait for last attempt data from the server
 var LAST_ATTEMPT_TIMEOUT = 5000;
@@ -51,8 +52,22 @@ const SHARE_IMAGE_NAME = '_share_image.png';
  * @param {Object<number, TestResult>} serverProgress Mapping from levelId to TestResult
  */
 function mergeProgressData(scriptName, serverProgress) {
+  if (!serverProgress) {
+    return;
+  }
   const store = getStore();
-  store.dispatch(mergeProgress(serverProgress));
+
+  // The server returned progress. This is the source of truth.
+  // Note: Changes to the progressRedux also update the sessionStorage,
+  // so this will clear and update the sessionStorage too.
+  store.dispatch(clearProgress());
+  store.dispatch(
+    mergeProgress(
+      _.mapValues(serverProgress, level =>
+        level.submitted ? TestResults.SUBMITTED_RESULT : level.result
+      )
+    )
+  );
 
   Object.keys(serverProgress).forEach(levelId => {
     // Write down new progress in sessionStorage
@@ -392,8 +407,7 @@ function loadAppAsync(appOptions) {
         appOptions.disableSocialShare = data.disableSocialShare;
 
         // Merge progress from server (loaded via AJAX)
-        const serverProgress = data.progress || {};
-        mergeProgressData(appOptions.scriptName, serverProgress);
+        mergeProgressData(appOptions.scriptName, data.progress);
 
         if (!lastAttemptLoaded) {
           if (data.lastAttempt) {
@@ -435,6 +449,11 @@ function loadAppAsync(appOptions) {
         }
 
         const store = getStore();
+
+        // Note: We aren't guaranteed that currentUser.signInState will have been set at this point.
+        // It gets set on document.ready. However, it is highly unlikely that the server will return
+        // a response before document.ready is triggered. So far, this hasn't caused problems, so not
+        // worrying about this for now.
         const signInState = store.getState().currentUser.signInState;
         if (signInState === SignInState.SignedIn) {
           progress.showDisabledBubblesAlert();

apps/src/code-studio/progressRedux.js

@@ -304,7 +304,7 @@ const userProgressFromServer = (state, dispatch, userId = null) => {
   // If we have a userId, we can clear any progress in redux and request all progress
   // from the server.
   if (userId) {
-    dispatch({type: CLEAR_PROGRESS});
+    dispatch(clearProgress());
   }
 
   return $.ajax({
@@ -393,6 +393,10 @@ export const initProgress = ({
   isFullProgress
 });
 
+export const clearProgress = () => ({
+  type: CLEAR_PROGRESS
+});
+
 export const mergeProgress = levelProgress => ({
   type: MERGE_PROGRESS,
   levelProgress

cookbooks/Berksfile.lock

@@ -96,7 +96,7 @@ GRAPH
     sudo-user (>= 0.0.0)
   cdo-cloudwatch-agent (0.1.1)
     aws_cloudwatch (>= 0.0.0)
-  cdo-github-access (0.1.9)
+  cdo-github-access (0.1.10)
   cdo-home-ubuntu (0.1.5)
   cdo-i18n (0.0.0)
     apt (~> 2.6.0)

cookbooks/cdo-github-access/files/default/gitconfig

@@ -3,3 +3,10 @@
 [user]
 	name = Continuous Integration
 	email = dev@code.org
+
+# https://git-scm.com/docs/git-gc#_configuration
+[gc]
+    # Make git gc --auto return immediately and run in background if the system supports it. Default is true.
+    #
+    # Set false to prevent gc --auto from being interrupted by server shutdown, leaving behind large temp files.
+    autoDetach = false

cookbooks/cdo-github-access/metadata.rb

@@ -4,4 +4,4 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-github-access'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.9'
+version          '0.1.10'

dashboard/app/controllers/api_controller.rb

@@ -430,11 +430,8 @@ def user_progress_for_stage
       user_level = current_user.last_attempt(level, script)
       level_source = user_level.try(:level_source).try(:data)
 
-      response[:progress] = current_user.
-        user_levels.
-        by_stage(stage).
-        pluck(:level_id, :best_result).
-        to_h
+      # Temporarily return the full set of progress so we can overwrite what the sessionStorage changed
+      response[:progress] = summarize_user_progress(script, current_user)[:levels]
 
       if user_level
         response[:lastAttempt] = {

dashboard/test/controllers/api_controller_test.rb

@@ -618,10 +618,11 @@ class ApiControllerTest < ActionController::TestCase
       stage_position: 1,
       level_position: 1
     }
+    result = {"status" => "perfect", "result" => 100}
     assert_response :success
     body = JSON.parse(response.body)
     assert_equal nil, body['disableSocialShare']
-    assert_equal 100, body['progress'][level.id.to_s]
+    assert_equal result, body['progress'][level.id.to_s]
     assert_equal 'level source', body['lastAttempt']['source']
 
     assert_equal(

dashboard/test/integration/db_query_test.rb

@@ -51,7 +51,7 @@ def setup
       level: level.id
     )
 
-    assert_cached_queries(7) do
+    assert_cached_queries(10) do
       get user_progress_path,
         headers: {'HTTP_USER_AGENT': 'test'}
       assert_response :success

dashboard/test/ui/features/hour_of_code/hour_of_code_signed_in.feature

@@ -40,17 +40,18 @@ Scenario: Failing at puzzle 6, refreshing puzzle 6, bubble should show up as att
   When element "#runButton" is visible
   Then I verify progress in the header of the current page is "attempted" for level 6
 
+# The server should be the source of truth. If we have a stale read, that means we haven't saved the user progress.
 Scenario: Async progress write followed by a stale read
   Given I am on "http://studio.code.org/hoc/20?noautoplay=true"
   And I wait for the page to fully load
   And I verify progress in the header of the current page is "not_tried" for level 20
   Then mark the current level as completed on the client
   And I wait for 3 seconds
   And I reload the page
-  And I verify progress in the header of the current page is "perfect" for level 20
+  And I verify progress in the header of the current page is "not_tried" for level 20
   And I wait for 3 seconds
   And I navigate to the course page for "hourofcode"
-  And I verify progress for stage 1 level 20 is "perfect"
+  And I verify progress for stage 1 level 20 is "not_tried"
 
 Scenario: Progress on the server that is not on the client
   Given I am on "http://studio.code.org/hoc/20?noautoplay=true"