Merge pull request #30961 from code-dot-org/dtp_candidate_e09c1493

DTP (Test > Production: e09c149)

apps/src/code-studio/components/SoundList.jsx

@@ -43,7 +43,7 @@ export default class SoundList extends React.Component {
         this.props.selectedSound.name === sound.name ? true : false;
       return (
         <SoundListEntry
-          key={sound.name}
+          key={sound.sourceUrl}
           assetChosen={this.props.assetChosen}
           soundMetadata={sound}
           isSelected={isSelected}

apps/src/maze/beeBlocks.js

@@ -6,6 +6,7 @@ var msg = require('./locale');
 var blockUtils = require('../block_utils');
 
 var OPERATORS = [['=', '=='], ['<', '<'], ['>', '>']];
+const RTL_OPERATORS = [['=', '=='], ['>', '<'], ['<', '>']];
 
 var TOOLTIPS = {
   '==': Blockly.Msg.LOGIC_COMPARE_TOOLTIP_EQ,
@@ -231,7 +232,7 @@ function addConditionalComparisonBlock(blockly, generator, name, type, arg1) {
       );
       this.appendDummyInput().appendTitle(' ');
       this.appendDummyInput().appendTitle(
-        new blockly.FieldDropdown(OPERATORS),
+        new blockly.FieldDropdown(Blockly.RTL ? RTL_OPERATORS : OPERATORS),
         'OP'
       );
       this.appendDummyInput().appendTitle(' ');

apps/src/storage/dataBrowser/DataTableView.jsx

@@ -9,7 +9,7 @@ import FontAwesome from '../../templates/FontAwesome';
 import PropTypes from 'prop-types';
 import Radium from 'radium';
 import React from 'react';
-import {changeView, showWarning} from '../redux/data';
+import {changeView, showWarning, tableType} from '../redux/data';
 import * as dataStyles from './dataStyles';
 import color from '../../util/color';
 import {connect} from 'react-redux';
@@ -68,6 +68,7 @@ class DataTableView extends React.Component {
     // from redux state
     tableColumns: PropTypes.arrayOf(PropTypes.string).isRequired,
     tableName: PropTypes.string.isRequired,
+    tableListMap: PropTypes.object.isRequired,
     // "if all of the keys are integers, and more than half of the keys between 0 and
     // the maximum key in the object have non-empty values, then Firebase will render
     // it as an array."
@@ -207,7 +208,12 @@ class DataTableView extends React.Component {
         />
         <div style={debugDataStyle}>{this.getTableJson()}</div>
         {!this.state.showDebugView && (
-          <DataTable getColumnNames={this.getColumnNames} />
+          <DataTable
+            getColumnNames={this.getColumnNames}
+            readOnly={
+              this.props.tableListMap[this.props.tableName] === tableType.SHARED
+            }
+          />
         )}
       </div>
     );
@@ -219,7 +225,8 @@ export default connect(
     view: state.data.view,
     tableColumns: state.data.tableColumns || [],
     tableRecords: state.data.tableRecords || {},
-    tableName: state.data.tableName || ''
+    tableName: state.data.tableName || '',
+    tableListMap: state.data.tableListMap || {}
   }),
   dispatch => ({
     onShowWarning(warningMsg, warningTitle) {

config/adhoc.yml.erb

@@ -4,6 +4,10 @@ chef_local_mode: true
 stub_school_data: true
 db_writer: 'mysql://root@localhost/'
 
+# needed by storage_id helper
+poste_secret: not a real secret
+
+
 # Engineers need to be able to see raw HTTP error pages so they can debug their feature branch on an adhoc.
 custom_error_response: false
 

cookbooks/Berksfile.lock

@@ -68,7 +68,7 @@ GRAPH
   cdo-analytics (0.0.0)
     apt (~> 2.6.0)
     ark (>= 0.0.0)
-  cdo-apps (0.2.365)
+  cdo-apps (0.2.382)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     cdo-analytics (>= 0.0.0)
@@ -92,20 +92,20 @@ GRAPH
     poise-service (>= 0.0.0)
     sudo-user (>= 0.0.0)
   cdo-authorized-keys (0.1.2)
-  cdo-awscli (0.1.10)
+  cdo-awscli (0.1.11)
     apt (~> 2.6.0)
     poise-python (>= 0.0.0)
     sudo-user (>= 0.0.0)
-  cdo-cloudwatch-extra-metrics (0.1.6)
+  cdo-cloudwatch-extra-metrics (0.1.7)
     ark (>= 0.0.0)
-  cdo-cloudwatch-logger (0.1.9)
+  cdo-cloudwatch-logger (0.1.10)
     cdo-awscli (>= 0.0.0)
     poise-service (>= 0.0.0)
     sudo-user (>= 0.0.0)
   cdo-freegeoip (0.1.2)
     ark (>= 0.0.0)
     poise-service (>= 0.0.0)
-  cdo-github-access (0.1.8)
+  cdo-github-access (0.1.9)
   cdo-home-ubuntu (0.1.3)
   cdo-i18n (0.0.0)
     apt (~> 2.6.0)
@@ -114,7 +114,7 @@ GRAPH
     build-essential (>= 0.0.0)
   cdo-jemalloc (0.1.2)
     ark (>= 0.0.0)
-  cdo-mysql (0.1.13)
+  cdo-mysql (0.1.18)
     apt (~> 2.6.0)
   cdo-newrelic (0.1.18)
     apt (>= 0.0.0)
@@ -133,12 +133,12 @@ GRAPH
   cdo-ruby (0.2.13)
     apt (~> 2.6.0)
     sudo-user (>= 0.0.0)
-  cdo-secrets (0.1.7)
+  cdo-secrets (0.1.8)
   cdo-tippecanoe (0.1.2)
     ark (>= 0.0.0)
-  cdo-users (0.1.25)
+  cdo-users (0.1.26)
     apt (~> 2.6.0)
-  cdo-varnish (0.3.225)
+  cdo-varnish (0.3.243)
     apt (>= 0.0.0)
   chef-client (11.3.0)
     cron (>= 4.2.0)
@@ -174,7 +174,7 @@ GRAPH
   seven_zip (3.1.1)
     windows (>= 0.0.0)
   ssl_certificate (2.1.0)
-  sudo-user (0.1.1)
+  sudo-user (0.1.3)
     ohai (>= 0.0.0)
   ulimit (1.0.0)
   windows (6.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.365'
+version          '0.2.382'
 
 depends 'apt'
 depends 'build-essential'

cookbooks/cdo-awscli/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures AWS command line interface'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.10'
+version          '0.1.11'
 
 depends 'apt', '~> 2.6.0'
 depends 'poise-python'

cookbooks/cdo-cloudwatch-extra-metrics/metadata.rb

@@ -4,6 +4,6 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-cloudwatch-extra-metrics'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.6'
+version          '0.1.7'
 
 depends 'ark'

cookbooks/cdo-cloudwatch-logger/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-cloudwatch-logger'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.9'
+version          '0.1.10'
 
 depends 'poise-service'
 depends 'cdo-awscli'

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.8'
+version          '0.1.9'

cookbooks/cdo-mysql/metadata.rb

@@ -4,6 +4,6 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-mysql'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.13'
+version          '0.1.18'
 
 depends 'apt', '~> 2.6.0'

cookbooks/cdo-secrets/metadata.rb

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

cookbooks/cdo-users/metadata.rb

@@ -4,6 +4,6 @@
 license          'All rights reserved'
 description      'Creates users for the accounts defined in Chef'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.25'
+version          '0.1.26'
 
 depends 'apt', '~> 2.6.0'

cookbooks/cdo-users/templates/default/ssh_config.erb

@@ -1,4 +1,4 @@
-Host *.ec2.internal *.cdn-code.org
+Host staging test levelbuilder-* production-daemon production-console adhoc-* *.ec2.internal *.cdn-code.org
   User ubuntu
   StrictHostKeyChecking no
   PreferredAuthentications publickey

cookbooks/cdo-varnish/metadata.rb

@@ -4,6 +4,6 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-varnish'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.3.225'
+version          '0.3.243'
 
 depends 'apt'

cookbooks/sudo-user/metadata.rb

@@ -1,3 +1,3 @@
 name             'sudo-user'
-version          '0.1.1'
+version          '0.1.3'
 depends 'ohai'

dashboard/app/models/regional_partner.rb

@@ -195,7 +195,7 @@ def self.find_by_zip(zip_code)
             # Geocoder can raise a number of errors including SocketError, with a common base of StandardError
             # See https://github.com/alexreisner/geocoder#error-handling
             Retryable.retryable(on: StandardError) do
-              state = Geocoder.search({zip: zip_code})&.first&.state_code
+              state = Geocoder.search(zip_code)&.first&.state_code
             end
           end
         rescue StandardError => e