Fixed errors.

Author: lizlooney

src/blocks/mrc_event_handler.ts

@@ -222,7 +222,7 @@ const EVENT_HANDLER = {
         let foundMechanism = false;
         const mechanismsInRobot = editor.getMechanismsFromRobot();
         for (const mechanismInRobot of mechanismsInRobot) {
-          if (mechanismInRobot.blockId === this.mrcMechanismBlockId) {
+          if (mechanismInRobot.mechanismId === this.mrcMechanismBlockId) {
             foundMechanism = true;
 
             // If the mechanism name has changed, we can handle that.
@@ -235,7 +235,7 @@ const EVENT_HANDLER = {
             const mechanismEvents: storageModuleContent.Event[] = mechanism
                 ? editor.getEventsFromMechanism(mechanism) : [];
             for (const mechanismEvent of mechanismEvents) {
-              if (mechanismEvent.blockId === this.mrcOtherBlockId) {
+              if (mechanismEvent.eventId === this.mrcOtherBlockId) {
                 foundMechanismEvent = true;
                 if (this.getFieldValue(FIELD_EVENT_NAME) !== mechanismEvent.name) {
                   this.setFieldValue(mechanismEvent.name, FIELD_EVENT_NAME);
@@ -279,7 +279,7 @@ const EVENT_HANDLER = {
       this.setWarningText(null, WARNING_ID_EVENT_CHANGED);
     }
   },
-  getEventBlockId: function(this: EventHandlerBlock): string {
+  getEventId: function(this: EventHandlerBlock): string {
     return this.mrcOtherBlockId;
   },
   renameMechanismName: function(this: EventHandlerBlock, mechanismBlockId: string, newName: string): void {
@@ -447,8 +447,8 @@ function createMechanismEventHandlerBlock(
   const extraState: EventHandlerExtraState = {
     senderType: SenderType.MECHANISM,
     params: [],
-    otherBlockId: event.blockId,
-    mechanismBlockId: mechanismInRobot.blockId,
+    otherBlockId: event.eventId,
+    mechanismBlockId: mechanismInRobot.mechanismId,
   };
   event.args.forEach(arg => {
     extraState.params.push({

src/editor/editor.ts

@@ -322,7 +322,7 @@ export class Editor {
       mechanismInRobot: storageModuleContent.MechanismInRobot): eventHandler.EventHandlerBlock[] {
     const eventHandlerBlocks: eventHandler.EventHandlerBlock[] = [];
     eventHandler.getMechanismEventHandlerBlocks(
-        this.blocklyWorkspace, mechanismInRobot.blockId, eventHandlerBlocks);
+        this.blocklyWorkspace, mechanismInRobot.mechanismId, eventHandlerBlocks);
     return eventHandlerBlocks;
   }
 

src/toolbox/event_handlers_category.ts

@@ -98,12 +98,12 @@ class EventHandlersCategory {
       const eventsFromRobot = editor.getEventsFromRobot();
       // Remove events if there is already a corresponding handler in the workspace.
       const eventHandlerBlocks = editor.getRobotEventHandlersAlreadyInWorkspace();
-      const eventBlockIds: string[] = [];
+      const eventIds: string[] = [];
       eventHandlerBlocks.forEach(eventHandlerBlock => {
-        eventBlockIds.push(eventHandlerBlock.getEventBlockId());
+        eventIds.push(eventHandlerBlock.getEventId());
       });
       const eventsToShow = eventsFromRobot.filter(event => {
-        return !eventBlockIds.includes(event.blockId);
+        return !eventIds.includes(event.eventId);
       });
       addRobotEventHandlerBlocks(eventsToShow, contents);
     }
@@ -127,12 +127,12 @@ class EventHandlersCategory {
         // Remove events if there is already a corresponding handler in the workspace.
         const eventHandlerBlocks = editor.getMechanismEventHandlersAlreadyInWorkspace(
             this.mechanismInRobot);
-        const eventBlockIds: string[] = [];
+        const eventIds: string[] = [];
         eventHandlerBlocks.forEach(eventHandlerBlock => {
-          eventBlockIds.push(eventHandlerBlock.getEventBlockId());
+          eventIds.push(eventHandlerBlock.getEventId());
         });
         const eventsToShow = eventsFromMechanism.filter(event => {
-          return !eventBlockIds.includes(event.blockId);
+          return !eventIds.includes(event.eventId);
         });
         addMechanismEventHandlerBlocks(this.mechanismInRobot, eventsToShow, contents);
         if (contents.length === 0) {