Skip to content

Commit

Permalink
Merge pull request #30957 from code-dot-org/staging
Browse files Browse the repository at this point in the history
DTT (Staging > Test) [robo-dtt]
  • Loading branch information
deploy-code-org committed Sep 25, 2019
2 parents 39c975e + 4fa7a70 commit e09c149
Show file tree
Hide file tree
Showing 153 changed files with 1,043 additions and 1,526 deletions.
2 changes: 1 addition & 1 deletion apps/src/code-studio/components/SoundList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
13 changes: 10 additions & 3 deletions apps/src/storage/dataBrowser/DataTableView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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>
);
Expand All @@ -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) {
Expand Down
17 changes: 0 additions & 17 deletions dashboard/config/blocks/aalab/aalab_addBehaviorForDuration.js

This file was deleted.

11 changes: 0 additions & 11 deletions dashboard/config/blocks/aalab/aalab_addBehaviorSimpleFlexible.js

This file was deleted.

18 changes: 0 additions & 18 deletions dashboard/config/blocks/aalab/aalab_addBehaviorSimpleFlexible.json

This file was deleted.

3 changes: 0 additions & 3 deletions dashboard/config/blocks/aalab/aalab_addToSpriteGroup.js

This file was deleted.

17 changes: 0 additions & 17 deletions dashboard/config/blocks/aalab/aalab_addToSpriteGroup.json

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions dashboard/config/blocks/aalab/aalab_allSpritesWithAnimation.json

This file was deleted.

28 changes: 0 additions & 28 deletions dashboard/config/blocks/aalab/aalab_changePropByFlexible.js

This file was deleted.

42 changes: 0 additions & 42 deletions dashboard/config/blocks/aalab/aalab_changePropByFlexible.json

This file was deleted.

3 changes: 0 additions & 3 deletions dashboard/config/blocks/aalab/aalab_checkTouching.js

This file was deleted.

38 changes: 0 additions & 38 deletions dashboard/config/blocks/aalab/aalab_checkTouching.json

This file was deleted.

33 changes: 0 additions & 33 deletions dashboard/config/blocks/aalab/aalab_clickedOn.json

This file was deleted.

11 changes: 0 additions & 11 deletions dashboard/config/blocks/aalab/aalab_createNewSprite.js

This file was deleted.

28 changes: 0 additions & 28 deletions dashboard/config/blocks/aalab/aalab_createNewSprite.json

This file was deleted.

16 changes: 0 additions & 16 deletions dashboard/config/blocks/aalab/aalab_createNewSpriteAdvanced.js

This file was deleted.

0 comments on commit e09c149

Please sign in to comment.