Merge pull request #32501 from code-dot-org/dtl_candidate_5e21bf4b

code-dot-org · Dec 19, 2019 · 9298d5f · 9298d5f
2 parents 935a7ce + 5e21bf4
commit 9298d5f
Show file tree

Hide file tree

Showing 27 changed files with 236 additions and 129 deletions.
diff --git a/apps/i18n/common/en_us.json b/apps/i18n/common/en_us.json
@@ -1378,10 +1378,8 @@
   "soundLibrary": "Sound Library",
   "soundName": "Sound Name",
   "soundSearchPlaceholder": "Search for a sound...",
-  "specialAnnouncementHeadingHoc2019CsForGood": "The Hour of Code is coming",
-  "specialAnnouncementDescriptionHoc2019CsForGood": "Try one of the 100 NEW activities for the Hour of Code (Dec 9-15)! This year, encourage your students to think about ways of using CS for good. Sign up your class today.",
-  "specialAnnouncementHeadingHoc2019DanceParty": "Try the NEW Dance Party",
-  "specialAnnouncementDescriptionHoc2019DanceParty": "Have you tried the NEW Dance Party for Hour of Code 2019? It's got new backgrounds, new coding blocks, new music, and even a brand-new Dance Party character!",
+  "specialAnnouncementHeadingPostHoc2019": "Go beyond an Hour of Code",
+  "specialAnnouncementDescriptionPostHoc2019": "An hour is just the beginning. We offer comprehensive curriculum for grades K-12, professional learning programs including local workshops, and resources to help you and your school get started.",
   "sprite": "sprite",
   "stage": "Stage",
   "stageExtras": "Lesson Extras",

diff --git a/apps/src/applab/applab.js b/apps/src/applab/applab.js
@@ -19,11 +19,7 @@ import * as utils from '../utils';
 import * as dropletConfig from './dropletConfig';
 import {getDatasetInfo} from '../storage/dataBrowser/dataUtils';
 import {initFirebaseStorage} from '../storage/firebaseStorage';
-import {
-  getColumnsRef,
-  onColumnsChange,
-  addMissingColumns
-} from '../storage/firebaseMetadata';
+import {getColumnsRef, onColumnsChange} from '../storage/firebaseMetadata';
 import {getProjectDatabase, getSharedDatabase} from '../storage/firebaseUtils';
 import * as apiTimeoutList from '../lib/util/timeoutList';
 import designMode from './designMode';
@@ -1393,9 +1389,6 @@ function onDataViewChange(view, oldTableName, newTableName) {
       } else {
         storageRef = projectStorageRef.child(`tables/${newTableName}/records`);
       }
-      if (newTableType === tableType.PROJECT) {
-        addMissingColumns(newTableName);
-      }
       onColumnsChange(
         newTableType === tableType.PROJECT
           ? getProjectDatabase()

diff --git a/apps/src/code-studio/pd/workshop_dashboard/workshop.jsx b/apps/src/code-studio/pd/workshop_dashboard/workshop.jsx
@@ -125,7 +125,8 @@ export class Workshop extends React.Component {
             'regional_partner_name',
             'regional_partner_id',
             'scholarship_workshop?',
-            'potential_organizers'
+            'potential_organizers',
+            'created_at'
           ])
         });
       })
@@ -903,6 +904,7 @@ export class Workshop extends React.Component {
         {this.renderEndWorkshopPanel()}
         {this.renderEnrollmentsPanel()}
         {this.renderDetailsPanel()}
+        <MetadataFooter createdAt={this.state.workshop.created_at} />
       </Grid>
     );
   }
@@ -911,3 +913,28 @@ export class Workshop extends React.Component {
 export default connect(state => ({
   permission: state.workshopDashboard.permission
 }))(Workshop);
+
+/**
+ * A small, right-aligned section at the end of the workshop dashboard showing
+ * metadata we want to be able to check occasionally, like the workshop created_at date.
+ * @param {string} createdAt - and ISO 8601 date string
+ * @returns {Component}
+ * @constructor
+ */
+const MetadataFooter = ({createdAt}) => (
+  <Row>
+    <Col sm={12}>
+      <div style={METADATA_FOOTER_STYLE}>
+        Workshop created {new Date(createdAt).toLocaleDateString('en-US')}.
+      </div>
+    </Col>
+  </Row>
+);
+MetadataFooter.propTypes = {
+  createdAt: PropTypes.string.isRequired // An ISO 8601 date string
+};
+const METADATA_FOOTER_STYLE = {
+  textAlign: 'right',
+  fontSize: 'smaller',
+  fontStyle: 'italic'
+};
diff --git a/apps/src/p5lab/spritelab/blocks.js b/apps/src/p5lab/spritelab/blocks.js
@@ -1,4 +1,5 @@
 /* global dashboard */
+/* global appOptions */
 
 import {SVG_NS} from '@cdo/apps/constants';
 import {getStore} from '@cdo/apps/redux';
@@ -377,7 +378,15 @@ export default {
           .appendTitle(fieldLabel, 'VAR')
           .appendTitle(Blockly.Msg.VARIABLES_GET_TAIL);
 
-        if (Blockly.useModalFunctionEditor) {
+        let allowBehaviorEditing = Blockly.useModalFunctionEditor;
+
+        // If there is a toolbox with no categories, disallow editing the behavior,
+        // because renaming the behavior can break things.
+        if (appOptions.level.toolbox && !Blockly.hasCategories) {
+          allowBehaviorEditing = false;
+        }
+
+        if (allowBehaviorEditing) {
           var editLabel = new Blockly.FieldIcon(Blockly.Msg.FUNCTION_EDIT);
           Blockly.bindEvent_(
             editLabel.fieldGroup_,

diff --git a/apps/src/storage/dataBrowser/DataTable.jsx b/apps/src/storage/dataBrowser/DataTable.jsx
@@ -57,7 +57,6 @@ const INITIAL_STATE = {
 
 class DataTable extends React.Component {
   static propTypes = {
-    getColumnNames: PropTypes.func.isRequired,
     readOnly: PropTypes.bool,
     rowsPerPage: PropTypes.number,
     // from redux state
@@ -162,12 +161,8 @@ class DataTable extends React.Component {
   };
 
   getNextColumnName() {
-    const names = this.props.getColumnNames(
-      this.props.tableRecords,
-      this.props.tableColumns
-    );
-    let i = names.length;
-    while (names.includes(`column${i}`)) {
+    let i = this.props.tableColumns.length;
+    while (this.props.tableColumns.includes(`column${i}`)) {
       i++;
     }
     return `column${i}`;
@@ -211,10 +206,7 @@ class DataTable extends React.Component {
   }
 
   render() {
-    let columnNames = this.props.getColumnNames(
-      this.props.tableRecords,
-      this.props.tableColumns
-    );
+    let columnNames = [...this.props.tableColumns];
     let editingColumn = this.state.editingColumn;
 
     let rowsPerPage = this.props.rowsPerPage || MAX_ROWS_PER_PAGE;

diff --git a/apps/src/storage/dataBrowser/DataTableView.jsx b/apps/src/storage/dataBrowser/DataTableView.jsx
@@ -13,7 +13,6 @@ import {changeView, showWarning, tableType} from '../redux/data';
 import * as dataStyles from './dataStyles';
 import color from '../../util/color';
 import {connect} from 'react-redux';
-import {getColumnNamesFromRecords} from '../firebaseMetadata';
 import experiments from '../../util/experiments';
 
 const MIN_TABLE_WIDTH = 600;
@@ -91,23 +90,6 @@ class DataTableView extends React.Component {
     }
   }
 
-  /**
-   * @param {Array} records Array of JSON-encoded records.
-   * @param {string} columns Array of column names.
-   */
-  getColumnNames(records, columns) {
-    // Make sure 'id' is the first column.
-    const columnNames = getColumnNamesFromRecords(records);
-
-    columns.forEach(columnName => {
-      if (columnNames.indexOf(columnName) === -1) {
-        columnNames.push(columnName);
-      }
-    });
-
-    return columnNames;
-  }
-
   importCsv = (csvData, onComplete) => {
     FirebaseStorage.importCsv(
       this.props.tableName,
@@ -160,10 +142,6 @@ class DataTableView extends React.Component {
   }
 
   render() {
-    let columnNames = this.getColumnNames(
-      this.props.tableRecords,
-      this.props.tableColumns
-    );
     const visible = DataView.TABLE === this.props.view;
     const containerStyle = [
       styles.container,
@@ -204,17 +182,14 @@ class DataTableView extends React.Component {
           </span>
         </div>
         <TableControls
-          columns={columnNames}
           clearTable={this.clearTable}
           importCsv={this.importCsv}
           exportCsv={this.exportCsv}
           tableName={this.props.tableName}
           readOnly={readOnly}
         />
         <div style={debugDataStyle}>{this.getTableJson()}</div>
-        {!this.state.showDebugView && (
-          <DataTable getColumnNames={this.getColumnNames} readOnly={readOnly} />
-        )}
+        {!this.state.showDebugView && <DataTable readOnly={readOnly} />}
       </div>
     );
   }

diff --git a/apps/src/storage/dataBrowser/PreviewModal.jsx b/apps/src/storage/dataBrowser/PreviewModal.jsx
@@ -5,7 +5,6 @@ import {hidePreview} from '../redux/data';
 import {getDatasetInfo} from './dataUtils';
 import BaseDialog from '@cdo/apps/templates/BaseDialog.jsx';
 import DataTable from './DataTable';
-import {parseColumnsFromRecords} from '../firebaseMetadata';
 import msg from '@cdo/locale';
 
 class PreviewModal extends React.Component {
@@ -32,13 +31,7 @@ class PreviewModal extends React.Component {
         <h1>{this.props.tableName}</h1>
         <p>{datasetInfo.description}</p>
         <div style={{overflow: 'scroll', maxHeight: '70%'}}>
-          <DataTable
-            getColumnNames={(records, columns) =>
-              parseColumnsFromRecords(records)
-            }
-            readOnly
-            rowsPerPage={100}
-          />
+          <DataTable readOnly rowsPerPage={100} />
         </div>
         <button type="button" onClick={() => this.importTable(datasetInfo)}>
           {msg.import()}

diff --git a/apps/src/storage/firebaseMetadata.js b/apps/src/storage/firebaseMetadata.js
@@ -27,27 +27,18 @@ export function getColumnRefByName(tableName, columnName) {
     });
 }
 
-// TODO: De-dupe this function with getColumnNamesFromRecords() below
-export function parseColumnsFromRecords(records) {
-  const columnNames = [];
-  Object.keys(records).forEach(id => {
-    const record = JSON.parse(records[id]);
-    Object.keys(record).forEach(column => {
-      if (columnNames.indexOf(column) === -1) {
-        columnNames.push(column);
-      }
-    });
-  });
-  return columnNames;
-}
-
 export function getColumnNamesFromRecords(records) {
-  const columnNames = ['id'];
+  const columnNames = [];
   Object.keys(records).forEach(id => {
     const record = JSON.parse(records[id]);
     Object.keys(record).forEach(columnName => {
       if (columnNames.indexOf(columnName) === -1) {
-        columnNames.push(columnName);
+        if (columnName === 'id') {
+          // Make sure 'id' is first column
+          columnNames.unshift(columnName);
+        } else {
+          columnNames.push(columnName);
+        }
       }
     });
   });
@@ -118,23 +109,16 @@ export function onColumnsChange(database, tableName, callback) {
 /**
  *
  * @param {string} tableName
- * @param {Array.<string>} existingColumnNames
+ * @param {Array.<string>} columns
  * @returns {*}
  */
-export function addMissingColumns(tableName) {
+export function addMissingColumns(tableName, columns) {
   return getColumnNamesSnapshot(tableName).then(existingColumnNames => {
-    const recordsRef = getProjectDatabase().child(
-      `storage/tables/${tableName}/records`
-    );
-    return recordsRef.once('value').then(snapshot => {
-      const recordsData = snapshot.val() || {};
-      getColumnNamesFromRecords(recordsData).forEach(columnName => {
-        if (!existingColumnNames.includes(columnName)) {
-          getColumnsRef(getProjectDatabase(), tableName)
-            .push()
-            .set({columnName});
-        }
-      });
+    let columnsRef = getColumnsRef(getProjectDatabase(), tableName);
+    columns.forEach(columnName => {
+      if (!existingColumnNames.includes(columnName)) {
+        columnsRef.push().set({columnName});
+      }
     });
   });
 }
diff --git a/apps/src/storage/firebaseStorage.js b/apps/src/storage/firebaseStorage.js
@@ -29,7 +29,8 @@ import {
   deleteColumnName,
   renameColumnName,
   addMissingColumns,
-  getColumnsRef
+  getColumnsRef,
+  getColumnNamesFromRecords
 } from './firebaseMetadata';
 import {tableType} from './redux/data';
 import {WarningType} from './constants';
@@ -220,6 +221,12 @@ FirebaseStorage.createRecord = function(tableName, record, onSuccess, onError) {
       );
       return recordRef.set(JSON.stringify(record));
     })
+    .then(() =>
+      addMissingColumns(
+        tableName,
+        getColumnNamesFromRecords([JSON.stringify(record)])
+      )
+    )
     .then(() => onSuccess(record), onError);
 };
 
@@ -377,6 +384,12 @@ FirebaseStorage.updateRecord = function(
         incrementRateLimitCounters()
           .then(() => updateTableCounters(tableName, 0))
           .then(() => recordRef.set(recordJson))
+          .then(() =>
+            addMissingColumns(
+              tableName,
+              getColumnNamesFromRecords([recordJson])
+            )
+          )
           .then(() => onComplete(record, true), onError);
       }
     });
@@ -546,7 +559,11 @@ FirebaseStorage.copyStaticTable = function(tableName, onSuccess, onError) {
     })
     .then(snapshot => {
       getRecordsRef(tableName).set(snapshot.val());
+      return snapshot;
     })
+    .then(snapshot =>
+      addMissingColumns(tableName, getColumnNamesFromRecords(snapshot.val()))
+    )
     .then(onSuccess, onError);
 };
 
@@ -605,6 +622,7 @@ FirebaseStorage.createTable = function(tableName, onSuccess, onError) {
           return Promise.resolve();
         });
     })
+    .then(() => addColumnName(tableName, 'id'))
     .then(onSuccess, onError);
 };
 
@@ -1007,7 +1025,12 @@ function overwriteTableData(tableName, recordsData) {
         rowCount: count
       });
     })
-    .then(() => addMissingColumns(tableName));
+    .then(() =>
+      addMissingColumns(
+        tableName,
+        getColumnNamesFromRecords(Object.values(recordsData))
+      )
+    );
 }
 
 FirebaseStorage.importCsv = function(