Merge pull request #33966 from code-dot-org/dtp_candidate_543b9752

DTP (Test > Production: 543b975)

apps/i18n/common/en_us.json

@@ -135,6 +135,7 @@
   "builtOnCodeStudio": "Built on Code Studio",
   "by": "By",
   "cancel": "Cancel",
+  "cannotDeleteLibrary": "You cannot delete preset libraries",
   "cannotDeleteUsedImage": "You cannot delete images that are currently used in your project",
   "catActions": "Actions",
   "catColour": "Color",
@@ -1519,7 +1520,7 @@
   "stringEquals": "string=?",
   "student": "Student",
   "studentAnnouncementSpecial2020Heading": "Learn computer science when schools are closed",
-  "studentAnnouncementSpecial2020Description": "You can continue to learn at home while schools are closed. Try out fun computer science tutorials, watch videos about computer science concepts, and even build your own projects!",
+  "studentAnnouncementSpecial2020Body": "Students can continue to learn at home while schools are closed. Take a Code Break with us, or see resources for students, parents, and teachers - including videos, fun tutorials, and projects!",
   "studentAnnouncementSpecial2020Button": "Get started",
   "students": "Students",
   "studentFreeResponseAnswers": "Student free response answers",
@@ -1563,7 +1564,7 @@
   "teacher": "Teacher",
   "teacherWithColon": "Teacher:",
   "teachers": "Teachers",
-  "teacherAnnouncementSpecial2020Description": "We want to support teachers and parents during the current widespread school closures. Here are some resources to help students continue learning at home. We will continue to update these over time.",
+  "teacherAnnouncementSpecial2020Body": "Students can continue to learn at home while schools are closed. Take a Code Break with us, or see resources for students, parents, and teachers - including videos, fun tutorials, and projects!",
   "teacherAnnouncementSpecial2020Heading": "Continued learning when schools are closed",
   "teacherComments": "Teacher comments",
   "teacherCommunity": "Teacher Community",

apps/src/blockTooltips/DropletBlockTooltipManager.js

@@ -87,6 +87,13 @@ DropletBlockTooltipManager.prototype.installTooltipsForCurrentCategoryBlocks_ =
       const hoverDivRect = blockHoverDiv.getBoundingClientRect();
       const toolboxRight = $('.droplet-palette-scroller').width();
       const offsetX = Math.min(hoverDivRect.width, toolboxRight);
+      if (offsetX === 0) {
+        // This happens when we start in design mode and the toolbox hasn't yet
+        // rendered. In this case, skip installing the tooltips. We can try
+        // again when the student switches to code mode and this method is
+        // called again.
+        return;
+      }
 
       // Vertically center the tooltip on the block it belongs to.
       //

apps/src/code-studio/components/libraries/LibraryListItem.jsx

@@ -76,6 +76,12 @@ const styles = {
     ':hover': {
       color: color.white,
       backgroundColor: color.dark_red
+    },
+    ':disabled': {
+      color: color.light_gray,
+      borderColor: color.light_gray,
+      backgroundColor: color.lightest_gray,
+      cursor: 'default'
     }
   }
 };
@@ -141,12 +147,20 @@ export class LibraryListItem extends React.Component {
             </button>
           )}
           {this.props.onRemove && (
-            <Tooltip text={i18n.removeFromProject()} place="bottom">
+            <Tooltip
+              text={
+                library.fromLevelbuilder
+                  ? i18n.cannotDeleteLibrary()
+                  : i18n.removeFromProject()
+              }
+              place="bottom"
+            >
               <button
                 type="button"
                 key={'remove-' + library.id}
                 onClick={() => this.props.onRemove(library.name)}
                 style={[styles.actionBtn, styles.removeBtn]}
+                disabled={!!library.fromLevelbuilder}
               >
                 <FontAwesome icon="trash-o" style={styles.iconPadding} />
               </button>

apps/src/lib/kits/maker/MicroBitBoard.js

@@ -77,8 +77,9 @@ export default class MicroBitBoard extends EventEmitter {
     this.boardClient_.setPinMode(pin, modeConstant);
   }
 
-  // TODO
-  digitalWrite(pin, value) {}
+  digitalWrite(pin, value) {
+    this.boardClient_.digitalWrite(pin, value);
+  }
 
   // TODO
   digitalRead(pin, callback) {

apps/src/storage/dataBrowser/LibraryTable.jsx

@@ -108,9 +108,16 @@ class LibraryTable extends React.Component {
                   })}
                 </span>
               )}
-              <p>{datasetInfo.description}</p>
+              <span style={{display: 'block'}}>{datasetInfo.description} </span>
+
+              {datasetInfo.docUrl && (
+                <span style={{display: 'block'}}>
+                  <a href={datasetInfo.docUrl}>{msg.moreInfo()}</a>
+                </span>
+              )}
+
               {datasetInfo.sourceUrl && (
-                <span style={{display: 'inline-block'}}>
+                <span style={{display: 'block'}}>
                   {msg.dataSource() + ': '}
                   <a href={datasetInfo.sourceUrl}>
                     {datasetInfo.sourceText || datasetInfo.sourceUrl}

apps/src/storage/dataBrowser/PreviewModal.jsx

@@ -33,7 +33,12 @@ class PreviewModal extends React.Component {
     return (
       <BaseDialog isOpen handleClose={this.props.onClose} fullWidth fullHeight>
         <h1>{this.props.tableName}</h1>
-        <p>{datasetInfo.description}</p>
+        <p>
+          {datasetInfo.description}{' '}
+          {datasetInfo.docUrl && (
+            <a href={datasetInfo.docUrl}>{msg.moreInfo()}</a>
+          )}
+        </p>
         <div style={{overflow: 'scroll', maxHeight: '70%'}}>
           <DataTable readOnly rowsPerPage={100} />
         </div>

apps/src/templates/studioHomepages/SpecialAnnouncement.jsx

@@ -18,8 +18,8 @@ export default class SpecialAnnouncement extends Component {
       ? i18n.teacherAnnouncementSpecial2020Heading()
       : i18n.studentAnnouncementSpecial2020Heading();
     const descriptionText = isTeacher
-      ? i18n.teacherAnnouncementSpecial2020Description()
-      : i18n.studentAnnouncementSpecial2020Description();
+      ? i18n.teacherAnnouncementSpecial2020Body()
+      : i18n.studentAnnouncementSpecial2020Body();
     const buttonId = isTeacher
       ? 'teacher_homepage_announcement_special2020'
       : 'student_homepage_announcement_special2020';