Move steps into opmode and only show when not already in opmode

Author: alan412

src/blocks/mrc_steps.ts

@@ -153,6 +153,11 @@ export const setup = function () {
     Blockly.Blocks[BLOCK_NAME] = STEPS;
 };
 
+export function isStepsInWorkspace(workspace: Blockly.Workspace): boolean {
+    const blocks = workspace.getBlocksByType(BLOCK_NAME);
+    return blocks.length > 0;
+};
+ 
 export const pythonFromBlock = function (
     block: StepsBlock,
     generator: ExtendedPythonGenerator,

src/editor/editor.ts

@@ -29,6 +29,7 @@ import * as storageNames from '../storage/names';
 import * as storageProject from '../storage/project';
 import * as eventHandler from '../blocks/mrc_event_handler';
 import * as classMethodDef from '../blocks/mrc_class_method_def';
+import * as blockSteps from '../blocks/mrc_steps';
 import * as mechanismComponentHolder from '../blocks/mrc_mechanism_component_holder';
 //import { testAllBlocksInToolbox } from '../toolbox/toolbox_tests';
 import { applyExpandedCategories, getToolboxJSON } from '../toolbox/toolbox';
@@ -378,6 +379,13 @@ export class Editor {
         this.blocklyWorkspace, methodNamesAlreadyOverridden);
     return methodNamesAlreadyOverridden;
   }
+  public isStepsInWorkspace(): boolean {
+    if (!this.blocklyWorkspace.rendered) {
+      // This editor has been abandoned.
+      throw new Error('this.blocklyWorkspace has been disposed.');
+    }
+    return blockSteps.isStepsInWorkspace(this.blocklyWorkspace);
+  }
 
   public getEventsFromWorkspace(): storageModuleContent.Event[] {
     if (!this.blocklyWorkspace.rendered) {

src/toolbox/methods_category.ts

@@ -99,6 +99,13 @@ class MethodsCategory {
             methodNamesAlreadyOverridden, contents);
         break;
       case storageModule.ModuleType.OPMODE:
+        const hasSteps = editor.isStepsInWorkspace();
+        if (!hasSteps) {
+          contents.push({
+            kind: 'block',
+            type: 'mrc_steps',
+          });
+        }
         // Add the methods for an OpMode.
         this.addClassBlocksForCurrentModule(
             Blockly.Msg['MORE_OPMODE_METHODS_LABEL'], this.opmodeClassBlocks, [],

src/toolbox/test_category.ts

@@ -20,11 +20,6 @@ export function getCategory(): toolboxItems.Category {
 
   addBuiltInFunctionBlocks([printFunction], contents);
 
-  contents.push({
-    kind: 'block',
-    type: 'mrc_steps',
-  });
-
   return {
     kind: 'category',
     name: Blockly.Msg['MRC_CATEGORY_TEST'],