Merge pull request #26721 from code-dot-org/dtp_candidate_48fe1881

DTP (Test > Production: 48fe188)

apps/Gruntfile.js

@@ -451,6 +451,7 @@ describe('entry tests', () => {
     'levels/textMatch':                    './src/sites/studio/pages/levels/textMatch.js',
     'levels/widget':                       './src/sites/studio/pages/levels/widget.js',
     'levels/_external_link':               './src/sites/studio/pages/levels/_external_link.js',
+    'levels/show':                         './src/sites/studio/pages/levels/show.js',
     'projects/index':                      './src/sites/studio/pages/projects/index.js',
     'projects/public':                     './src/sites/studio/pages/projects/public.js',
     'projects/featured':                   './src/sites/studio/pages/projects/featured.js',
@@ -491,28 +492,25 @@ describe('entry tests', () => {
     'shared_blockly_functions/edit':'./src/sites/studio/pages/shared_blockly_functions/edit.js',
   };
 
-  var otherEntries = {
-    essential: './src/sites/studio/pages/essential.js',
-    plc: './src/sites/studio/pages/plc.js',
-
-    // Build embedVideo.js in its own step (skipping factor-bundle) so that
-    // we don't have to include the large code-studio-common file in the
-    // embedded video page, keeping it fairly lightweight.
-    // (I wonder how much more we could slim it down by removing jQuery!)
-    // @see embed.html.haml
-    embedVideo: './src/sites/studio/pages/embedVideo.js',
-
-    // embedBlocks.js is just React, the babel-polyfill, and a few other dependencies
-    // in a bundle to minimize the amount of stuff we need when loading blocks
-    // in an iframe.
-    embedBlocks: './src/sites/studio/pages/embedBlocks.js',
-
-    // tutorialExplorer for code.org/learn 2016 edition.
-    tutorialExplorer: './src/tutorialExplorer/tutorialExplorer.js',
-
-    // common entry points for pegasus js
+  var pegasusEntries = {
+    // code.org
+    'code.org/public/dance': './src/sites/code.org/pages/public/dance.js',
+    'code.org/public/educate/curriculum/courses': './src/sites/code.org/pages/public/educate/curriculum/courses.js',
+    'code.org/public/educate/regional-partner/playbook': './src/sites/code.org/pages/public/educate/regional-partner/playbook.js',
+    'code.org/public/student/middle-high': './src/sites/code.org/pages/public/student/middle-high.js',
+    'code.org/public/teacher-dashboard/index': './src/sites/code.org/pages/public/teacher-dashboard/index.js',
+    'code.org/public/yourschool': './src/sites/code.org/pages/public/yourschool.js',
+    'code.org/public/yourschool/thankyou': './src/sites/code.org/pages/public/yourschool/thankyou.js',
     'code.org/views/theme_common_head_after': './src/sites/code.org/pages/views/theme_common_head_after.js',
+    'code.org/views/workshop_search' : './src/sites/code.org/pages/views/workshop_search.js',
+
+    // hourofcode.com
+    'hourofcode.com/public/index': './src/sites/hourofcode.com/pages/public/index.js',
     'hourofcode.com/views/theme_common_head_after': './src/sites/hourofcode.com/pages/views/theme_common_head_after.js',
+  };
+
+  var professionalDevelopmentEntries = {
+    'code.org/public/pd-workshop-survey/splat': './src/sites/code.org/pages/public/pd-workshop-survey/splat.js',
 
     'pd/workshop_dashboard/index': './src/sites/studio/pages/pd/workshop_dashboard/index.js',
     'pd/facilitator_program_registration/new': './src/sites/studio/pages/pd/facilitator_program_registration/new.js',
@@ -533,11 +531,30 @@ describe('entry tests', () => {
     'pd/regional_partner_contact/new': './src/sites/studio/pages/pd/regional_partner_contact/new.js',
 
     'pd/international_opt_in/new': './src/sites/studio/pages/pd/international_opt_in/new.js',
+  };
+
+  var otherEntries = {
+    essential: './src/sites/studio/pages/essential.js',
+    plc: './src/sites/studio/pages/plc.js',
+
+    // Build embedVideo.js in its own step (skipping factor-bundle) so that
+    // we don't have to include the large code-studio-common file in the
+    // embedded video page, keeping it fairly lightweight.
+    // (I wonder how much more we could slim it down by removing jQuery!)
+    // @see embed.html.haml
+    embedVideo: './src/sites/studio/pages/embedVideo.js',
+
+    // embedBlocks.js is just React, the babel-polyfill, and a few other dependencies
+    // in a bundle to minimize the amount of stuff we need when loading blocks
+    // in an iframe.
+    embedBlocks: './src/sites/studio/pages/embedBlocks.js',
+
+    // tutorialExplorer for code.org/learn 2016 edition.
+    tutorialExplorer: './src/tutorialExplorer/tutorialExplorer.js',
+
 
     'peer_reviews/dashboard': './src/sites/studio/pages/peer_reviews/dashboard.js',
 
-    'code.org/public/teacher-dashboard/index': './src/sites/code.org/pages/public/teacher-dashboard/index.js',
-    'code.org/public/pd-workshop-survey/splat': './src/sites/code.org/pages/public/pd-workshop-survey/splat.js',
 
     publicKeyCryptography: './src/publicKeyCryptography/main.js',
 
@@ -548,17 +565,8 @@ describe('entry tests', () => {
 
     'shared/_check_admin': './src/sites/studio/pages/shared/_check_admin.js',
 
-    'code.org/public/educate/curriculum/courses': './src/sites/code.org/pages/public/educate/curriculum/courses.js',
-    'code.org/views/workshop_search' : './src/sites/code.org/pages/views/workshop_search.js',
-
     'census_reviewers/review_reported_inaccuracies': './src/sites/studio/pages/census_reviewers/review_reported_inaccuracies.js',
 
-    'code.org/public/dance': './src/sites/code.org/pages/public/dance.js',
-    'code.org/public/educate/regional-partner/playbook': './src/sites/code.org/pages/public/educate/regional-partner/playbook.js',
-    'code.org/public/student/middle-high': './src/sites/code.org/pages/public/student/middle-high.js',
-    'code.org/public/yourschool': './src/sites/code.org/pages/public/yourschool.js',
-    'code.org/public/yourschool/thankyou': './src/sites/code.org/pages/public/yourschool/thankyou.js',
-    'hourofcode.com/public/index': './src/sites/hourofcode.com/pages/public/index.js',
     'regionalPartnerSearch': './src/regionalPartnerSearch/regionalPartnerSearch',
 
     cookieBanner: './src/cookieBanner/cookieBanner.js',
@@ -577,6 +585,8 @@ describe('entry tests', () => {
           appsEntries,
           codeStudioEntries,
           internalEntries,
+          pegasusEntries,
+          professionalDevelopmentEntries,
           otherEntries
         ),
         function (val) {

apps/i18n/common/en_us.json

@@ -1241,6 +1241,7 @@
   "startOver": "Start Over",
   "startOverTitle": "Are you sure you want to start over?",
   "startOverBody": "This will reset the puzzle to its start state and reset all the data you've added or changed.",
+  "statsTableFailure": "Sorry, something went wrong. Please reload the page to try again.",
   "stayHere": "Stay here",
   "stepIn": "Step in",
   "stepOut": "Step out",