merge staging

Author: marybarnes37

apps/i18n/bounce/th_th.json

@@ -18,7 +18,7 @@
   "dirN": "N",
   "dirS": "S",
   "dirW": "W",
-  "doCode": "ทำ",
+  "doCode": "ทำ (do)",
   "elseCode": "ไม่เช่นนั้น",
   "finalLevel": "ขอแสดงความยินดีคุณสามารถแก้ปัญหาสุดท้ายได้แล้ว.",
   "heightParameter": "ความสูง",

apps/i18n/craft/th_th.json

@@ -13,7 +13,7 @@
   "blockActionDestroyEntity": "หายไป",
   "blockActionDetect": "ตรวจหา",
   "blockActionDetectRedstone": "ตรวจหาหินแดง",
-  "blockActionDrop": "หล่น",
+  "blockActionDrop": "ทำหล่น",
   "blockActionDropAll": "ปล่อยทั้งหมด",
   "blockActionExecute": "",
   "blockActionExplodeEntity": "ระเบิด",
@@ -84,12 +84,15 @@
   "blockTypeGlowstone": "หินเรืองแสง",
   "blockTypeGrass": "หญ้า",
   "blockTypeGravel": "ก้อนกรวด",
+  "blockTypeIce": "น้ำแข็ง",
   "blockTypeLava": "ลาวา",
   "blockTypeLogAcacia": "ซุงต้นอะเคเชีย",
   "blockTypeLogBirch": "ซุงต้นเบิช",
   "blockTypeLogJungle": "ซุงต้นไม้ป่า",
   "blockTypeLogOak": "ซุงต้นโอ๊ค",
   "blockTypeLogSpruce": "ซุงต้นสน",
+  "blockTypeNetherBrick": "อิฐเนเธอร์",
+  "blockTypeNetherrack": "หินเชื้อไฟเนเธอร์",
   "blockTypeOreCoal": "แร่ถ่านหิน",
   "blockTypeOreDiamond": "แร่เพชร",
   "blockTypeOreEmerald": "แร่มรกต",
@@ -108,6 +111,7 @@
   "blockTypeRedstoneWire": "ลวดหินแดง",
   "blockTypeSand": "ทราย",
   "blockTypeSandstone": "หินทราย",
+  "blockTypeSnow": "หิมะ",
   "blockTypeStone": "หิน",
   "blockTypeTnt": "ระเบิดทีเอ็นที",
   "blockTypeTree": "ต้นไม้",

apps/i18n/studio/th_th.json

@@ -805,7 +805,7 @@
   "whenSpriteCollidedWithPumpkin": "สัมผัสกับฟักทอง",
   "whenSpriteCollidedWithStar": "สัมผัสกับดาว",
   "whenSpriteCollidedWithSandwich": "สัมผัสกับแซนด์วิช",
-  "whenSpriteCollidedWithSnowball": "สัมผัสกับบอลหิมะ",
+  "whenSpriteCollidedWithSnowball": "สัมผัสกับก้อนหิมะ",
   "whenSpriteCollidedWithBlueFireball": "สัมผัสลูกไฟสีน้ำเงิน",
   "whenSpriteCollidedWithPurpleFireball": "สัมผัสลูกไฟสีม่วง",
   "whenSpriteCollidedWithRedFireball": "สัมผัสลูกไฟสีแดง",

apps/i18n/turtle/th_th.json

@@ -13,8 +13,8 @@
   "createSnowflakeSquare": "สร้างเกล็ดหิมะจากรูปทรงสี่เหลี่ยม",
   "createSnowflakeParallelogram": "สร้างรูปเกล็ดหิมะ ในประเภทของรูปสี่เหลี่ยมด้านขนาน",
   "createSnowflakeLine": "สร้างเกล็ดหิมะจากเส้นตรง",
-  "createSnowflakeSpiral": "สร้างรูปเกล็ดหิมะ ในประเภทของรูปเกลียว",
-  "createSnowflakeFlower": "สร้างเกล็ดหิมะรูปทรงดอกไม้",
+  "createSnowflakeSpiral": "สร้างเกล็ดหิมะแบบเกลียว",
+  "createSnowflakeFlower": "สร้างเกล็ดหิมะรูปดอกไม้",
   "createSnowflakeFractal": "สร้างรูปเกล็ดหิมะ ในประเภทของแฟร็กทัล",
   "createSnowflakeRandom": "สร้างเกล็ดหิมะรูปทรงสุ่ม",
   "createASnowflakeBranch": "สร้างสาขาของเกล็ดหิมะ",

apps/src/authoredHintUtils.js

@@ -107,18 +107,6 @@ authoredHintUtils.getFinishedHints_ = function () {
   return authoredHintUtils.getFromLocalStorage_('finished_authored_hint_views', []);
 };
 
-/**
- * This only retrieves the hints stored in localStorage, which likely won't
- * include things from older sessions.
- *
- * TODO(ram): Grab *all* the old hint requests from the server, preferably on
- *   level load
- * @return {FinishedHint[]}
- */
-authoredHintUtils.getOldFinishedHints = function () {
-  return authoredHintUtils.getFromLocalStorage_('old_finished_authored_hint_views', []);
-};
-
 /**
  * @return {AttemptRecord}
  */

apps/src/block_utils.js

@@ -878,6 +878,9 @@ exports.createJsWrapperBlockCreator = function (
       let prefix = '';
       const values = args.map(arg => {
         const inputConfig = inputConfigs.find(input => input.name === arg.name);
+        if (!inputConfig) {
+          return;
+        }
         let inputCode = inputTypes[inputConfig.mode].generateCode(this, inputConfig);
         if (inputConfig.assignment) {
           prefix += `${inputCode} = `;

apps/src/studio/Sprite.js

@@ -439,9 +439,9 @@ export default class Sprite extends Item {
     this.lastDrawPosition = drawPosition;
   }
 
-  // TODO(ram): make x and y props consistent with Item. In sprites they
-  // represent the top left corner, in items they're the center.
   /**
+   * x and y props are not consistent with Item. In sprites they represent the
+   * top left corner, in items they're the center.
    * @override
    */
   getCenterPos() {

apps/test/unit/blockUtilsTest.js

@@ -11,6 +11,7 @@ import {
 import { parseElement, serialize } from '@cdo/apps/xml.js';
 import { expect } from '../util/configuredChai';
 import sinon from 'sinon';
+import { allowConsoleWarnings } from '../util/testUtils';
 
 describe('block utils', () => {
   describe('cleanBlocks', () => {
@@ -955,6 +956,7 @@ describe('block utils', () => {
       });
     });
     describe('custom inputs', () => {
+      allowConsoleWarnings();
       it('generates code for a statement input', () => {
         createBlock({
           func: 'runThisCallback',
@@ -1061,6 +1063,17 @@ describe('block utils', () => {
         expect(code.trim()).to.equal(
           'processAnotherStringValue("some input with a \\"quote\\" in it");');
       });
+      it('does not throw when there are extra args', () => {
+        createBlock({
+          name: 'extraArgsTest',
+          expression: 'extraArgsTest;',
+          blockText: 'run this program in strict mode',
+          args: [{name: 'EXTRA'}],
+        }, '', 'test');
+        const code = generator['test_extraArgsTest']();
+
+        expect(code.trim()).to.equal('extraArgsTest;');
+      });
     });
   });
 });

cookbooks/Berksfile.lock

@@ -73,7 +73,7 @@ GRAPH
   cdo-analytics (0.0.0)
     apt (~> 2.6.0)
     ark (>= 0.0.0)
-  cdo-apps (0.2.316)
+  cdo-apps (0.2.317)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     cdo-analytics (>= 0.0.0)

cookbooks/cdo-apps/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-apps'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.316'
+version          '0.2.317'
 
 depends 'apt'
 depends 'build-essential'

cookbooks/cdo-apps/templates/default/crontab.erb

@@ -99,10 +99,6 @@
       cronjob at:'0 10 * * *', do:deploy_dir('bin', 'cron', 'redshift_rollups')
       cronjob at:'1 7 * * 6', do:deploy_dir('bin', 'cron', 'cleanup_workshop_attendance_codes')
 
-      # 4AM UTC is 8 or 9PM PT, a low traffic time when engineers are still awake to monitor any issues that occur
-      # during the automated restarts.
-      cronjob at:'00 4 * * *', do:deploy_dir('bin', 'cron', 'restart_high_memory_frontend_services')
-
       # RDS backup window is 08:50-09:20, so by 11:50 backups should definitely be ready
       cronjob at:'50 11 * * *', do:deploy_dir('bin', 'cron', 'push_latest_rds_backup_to_secondary_account')
     end

dashboard/app/controllers/omniauth_callbacks_controller.rb

@@ -264,7 +264,7 @@ def silent_takeover(oauth_user, auth_hash)
         # This should never happen if other logic is working correctly, so notify
         Honeybadger.notify(
           error_class: 'Failed to create AuthenticationOption during silent takeover',
-          error_message: "Could not create AuthenticationOption during silent takeover for user with email #{lookup_email}"
+          error_message: "Failed for user with id #{@user.id}"
         )
         return
       end
@@ -280,7 +280,7 @@ def silent_takeover(oauth_user, auth_hash)
         # This should never happen if other logic is working correctly, so notify
         Honeybadger.notify(
           error_class: 'Failed to update User during silent takeover',
-          error_message: "Could not update user during silent takeover for user with email #{lookup_email}"
+          error_message: "Failed for user with id #{@user.id}"
         )
         return
       end
@@ -316,13 +316,6 @@ def can_connect_provider?
 
   def get_connect_provider_errors(auth_option)
     errors = auth_option.errors.full_messages
-    Honeybadger.notify(
-      error_message: "Error connecting to provider",
-      context: {
-        authentication_option: auth_option,
-        errors: errors
-      }
-    )
 
     return errors.first unless errors.empty?
     I18n.t('auth.unable_to_connect_provider', provider: I18n.t("auth.#{auth_option.credential_type}"))

dashboard/app/controllers/projects_controller.rb

@@ -91,6 +91,10 @@ class ProjectsController < ApplicationController
     spritelab: {
       name: 'New Sprite Lab Project',
     },
+    dance: {
+      name: 'New Dance Lab Project',
+      levelbuilder_required: true,
+    },
     makerlab: {
       name: 'New Maker Lab Project',
       login_required: true

dashboard/app/controllers/registrations_controller.rb

@@ -49,6 +49,12 @@ def update
     respond_to_account_update(successfully_updated)
   end
 
+  #
+  # GET /users/finish_sign_up
+  #
+  def finish_sign_up
+  end
+
   def create
     Retryable.retryable on: [Mysql2::Error, ActiveRecord::RecordNotUnique], matching: /Duplicate entry/ do
       super

dashboard/app/helpers/users_helper.rb

@@ -82,7 +82,7 @@ def check_and_apply_oauth_takeover(user)
           # We want to know when this fails
           Honeybadger.notify(
             error_class: 'Failed to create AuthenticationOption during signup oauth takeover',
-            error_message: "Could not create AuthenticationOption during signup oauth takeover for user with email #{user.email}"
+            error_message: "Failed for user with id #{user.id}"
           )
         end
       else

dashboard/app/views/devise/registrations/finish_sign_up.html.haml

@@ -89,86 +89,7 @@
     = text_field_tag 'level[reference_links][]', ref_link, placeholder: 'Additional Reference Link'
   #plusAnswerReference
     %i.fa.fa-plus-circle
-
-#callout_editor.field
-  .json_editor
-    .json_template
-      .callout_space
-        %label Callout
-        %table
-          %tr
-            %td.required Element ID
-            %td.required{colspan: 2} Localization Key
-            %td.required{colspan: 5} Callout text
-          %tr
-            %td
-              %input.element_id{type: 'text', placeholder: '#runButton'}
-            %td{colspan: 2}
-              %input.localization_key{type: 'text', placeholder: 'level_name_callout1', style: 'width: 96%'}
-            %td{colspan: 5}
-              %input.callout_text{type: 'text', placeholder: 'Text of callout', style: 'width: 97%'}
-          %tr
-            %td Qtip on callout
-            %td Qtip points to
-            %td Show when
-            %td X dist
-            %td Y dist
-            %td Classes
-            %td Reappear
-            %td Palette Category
-          %tr
-            %td
-              %select.my
-                %option{value: 'top left'} Top left
-                %option{value: 'top center'} Top center
-                %option{value: 'top right'} Top right
-                %option{value: 'right top'} Right top
-                %option{value: 'right center'} Right center
-                %option{value: 'right bottom'} Right bottom
-                %option{value: 'bottom right'} Bottom right
-                %option{value: 'bottom center'} Bottom center
-                %option{value: 'bottom left'} Bottom left
-                %option{value: 'left bottom'} Left bottom
-                %option{value: 'left center'} Left center
-                %option{value: 'left top'} Left top
-            %td
-              %select.at{style: 'width: 140px;'}
-                %option{value: 'top left'} Top left
-                %option{value: 'top center'} Top center
-                %option{value: 'top right'} Top right
-                %option{value: 'right top'} Right top
-                %option{value: 'right center'} Right center
-                %option{value: 'right bottom'} Right bottom
-                %option{value: 'bottom right'} Bottom right
-                %option{value: 'bottom center'} Bottom center
-                %option{value: 'bottom left'} Bottom left
-                %option{value: 'left bottom'} Left bottom
-                %option{value: 'left center'} Left center
-                %option{value: 'left top'} Left top
-            %td
-              %input.on{type: 'text', style: 'width: 160px;', placeholder: 'function_editor_opened'}
-            %td
-              %input.x{type: 'number', style: 'width: 40px;'}
-            %td
-              %input.y{type: 'number', style: 'width: 40px;'}
-            %td
-              %input.classes{type: 'text', placeholder: 'no-tip', style: 'width: 80px;'}
-            %td
-              %input.canReappear{type: 'checkbox', placeholder: 'false', style: 'width: 50px;'}
-            %td
-              %input.dropletPaletteCategory{type: 'text', placeholder: 'math', style: 'width: 100px;'}
-          %tr
-        %button.remove_callout{type: 'button'}
-          %i.icon-trash
-        %hr
-    #all_callouts_editor
-    %button#add_callout{type: 'button'} Add a callout
-
-  .field
-    = f.label :callout_json
-    %div{style: '-webkit-user-select: text'}
-    ~ f.text_area :callout_json, rows: 4
-
+=render partial: 'levels/editors/callouts', locals: {f: f}
 - if @level.respond_to? :free_play
   .field
     = render partial: 'levels/editors/checkboxes', locals: {f: f, field_name: :free_play, description: "Free Play"}

dashboard/app/views/levels/editors/_all.html.haml

@@ -33,8 +33,10 @@
 .field
   = f.label :start_html, 'Starting design mode html'
   %p
-    This should be equivalent to the level html created by design mode. The recommended way to generate this
-    is to add your elements in design mode, hit run, then open up the browser console and type `Applab.levelHtml`.
+    This should be equivalent to the level html created by design mode. Learn how to how to make them
+    =link_to 'here', 'https://github.com/code-dot-org/code-dot-org/wiki/%5BLevelbuilder%5D-Adding-Preloaded-Design-Elements-in-App-Lab', target: '_blank'
+
+  %p
     IMPORTANT WARNING: If you have referenced images in the HTML and/or  CODE, then you need to get fully-qualified
     code.org https URLS for these assets and update the HTML and the code to reflect these. You can quickly get full
     image urls by drag-dropping the image into the markdown section of a dummy level in levelbuilder.

dashboard/app/views/levels/editors/_applab.html.haml

@@ -47,30 +47,7 @@
     This adds a call block to the end of the toolbox for each function defined
     in the workspace (including hidden start blocks).
 
-.field
-  = link_to 'Edit Toolbox Blocks', level_edit_blocks_path( @level, :toolbox_blocks) unless @level.new_record?
-  = render partial: 'levels/editors/collapsible_block_editor', locals: {f: f, xml_id: 'toolbox'}
-
-.field
-  = link_to 'Edit Start Blocks', level_edit_blocks_path(@level, :start_blocks) unless @level.new_record?
-  = render partial: 'levels/editors/collapsible_block_editor', locals: {f: f, xml_id: 'start'}
-
-.field
-  = link_to 'Edit Required Blocks', level_edit_blocks_path(@level, :required_blocks) unless @level.new_record?
-  = render partial: 'levels/editors/collapsible_block_editor', locals: {f: f, xml_id: 'required'}
-
-.field
-  = link_to 'Edit Recommended Blocks', level_edit_blocks_path(@level, :recommended_blocks) unless @level.new_record?
-  = render partial: 'levels/editors/collapsible_block_editor', locals: {f: f, xml_id: 'recommended'}
-
-.field
-  = link_to 'Edit Initialization Blocks', level_edit_blocks_path(@level, :initialization_blocks) unless @level.new_record?
-  = render partial: 'levels/editors/collapsible_block_editor', locals: {f: f, xml_id: 'initialization'}
-
--if @level.respond_to? :solution_blocks
-  .field
-    = link_to 'Edit Solution Blocks', level_edit_blocks_path(@level, :solution_blocks) unless @level.new_record?
-    = render partial: 'levels/editors/collapsible_block_editor', locals: {f: f, xml_id: 'solution'}
+= render partial: 'levels/editors/blockly_xml_editors', locals:{f: f}
 
 .field
   = f.label :ideal, 'Ideal block number'