Merge branch 'main' into pr_backend_serve

Author: alan412

src/App.tsx

@@ -31,7 +31,6 @@ import ToolboxSettingsModal from './reactComponents/ToolboxSettings';
 import * as Tabs from './reactComponents/Tabs';
 import { TabType } from './types/TabType';
 
-import * as editor from './editor/editor';
 import { extendedPythonGenerator } from './editor/extended_python_generator';
 
 import * as commonStorage from './storage/common_storage';
@@ -42,7 +41,6 @@ import * as clientSideStorage from './storage/client_side_storage';
 import * as CustomBlocks from './blocks/setup_custom_blocks';
 
 import { initialize as initializePythonBlocks } from './blocks/utils/python';
-import { TOOLBOX_UPDATE_EVENT } from './blocks/mrc_mechanism_component_holder';
 import { antdThemeFromString } from './reactComponents/ThemeModal';
 import { useTranslation } from 'react-i18next';
 import { UserSettingsProvider } from './reactComponents/UserSettingsProvider';
@@ -261,24 +259,6 @@ const AppContent: React.FC<AppContentProps> = ({ project, setProject }): React.J
     handleToolboxSettingsOk(updatedShownCategories);
   };
 
-  /** Handles toolbox update requests from blocks */
-  const handleToolboxUpdateRequest = React.useCallback((e: Event) => {
-    const workspaceId = (e as CustomEvent).detail.workspaceId;
-    const correspondingEditor = editor.Editor.getEditorForBlocklyWorkspaceId(workspaceId);
-    if (correspondingEditor) {
-      correspondingEditor.updateToolbox(shownPythonToolboxCategories);
-    }
-  }, [shownPythonToolboxCategories, i18n.language]);
-
-  // Add event listener for toolbox updates
-  React.useEffect(() => {
-    window.addEventListener(TOOLBOX_UPDATE_EVENT, handleToolboxUpdateRequest);
-
-    return () => {
-      window.removeEventListener(TOOLBOX_UPDATE_EVENT, handleToolboxUpdateRequest);
-    };
-  }, [handleToolboxUpdateRequest]);
-
   // Initialize blocks when app loads
   React.useEffect(() => {
     initializeBlocks();
@@ -519,8 +499,8 @@ const AppContent: React.FC<AppContentProps> = ({ project, setProject }): React.J
                 storage={storage}
                 setAlertErrorMessage={setAlertErrorMessage}
                 gotoTab={setActiveTab}
-                project={project}
-                setProject={setProject}
+                currentProject={project}
+                setCurrentProject={setProject}
                 onProjectChanged={onProjectChanged}
                 openWPIToolboxSettings={() => setToolboxSettingsModalIsOpen(true)}
                 theme={theme}

src/blocks/mrc_call_python_function.ts

@@ -70,7 +70,7 @@ type FunctionArg = {
 
 const WARNING_ID_FUNCTION_CHANGED = 'function changed';
 
-export type CallPythonFunctionBlock = Blockly.Block & CallPythonFunctionMixin & Blockly.BlockSvg;
+export type CallPythonFunctionBlock = Blockly.Block & CallPythonFunctionMixin;
 interface CallPythonFunctionMixin extends CallPythonFunctionMixinType {
   mrcFunctionKind: FunctionKind,
   mrcReturnType: string,
@@ -871,7 +871,9 @@ const CALL_PYTHON_FUNCTION = {
       if (icon) {
         icon.setBubbleVisible(true);
       }
-      this.bringToFront();
+      if (this.rendered) {
+        (this as unknown as Blockly.BlockSvg).bringToFront();
+      }
     } else {
       // Clear the existing warning on the block.
       this.setWarningText(null, WARNING_ID_FUNCTION_CHANGED);

src/blocks/mrc_class_method_def.ts

@@ -35,6 +35,8 @@ import * as toolboxItems from '../toolbox/items';
 import { getClassData } from './utils/python';
 import { FunctionData } from './utils/python_json_types';
 import { findConnectedBlocksOfType } from './utils/find_connected_blocks';
+import { makeLegalName } from './utils/validator';
+import { NONCOPYABLE_BLOCK } from './noncopyable_block';
 import { BLOCK_NAME as MRC_GET_PARAMETER_BLOCK_NAME } from './mrc_get_parameter';
 import * as paramContainer from './mrc_param_container'
 
@@ -57,7 +59,7 @@ export interface Parameter {
   type?: string;
 }
 
-export type ClassMethodDefBlock = Blockly.Block & ClassMethodDefMixin & Blockly.BlockSvg;
+export type ClassMethodDefBlock = Blockly.Block & ClassMethodDefMixin;
 interface ClassMethodDefMixin extends ClassMethodDefMixinType {
   mrcMethodId: string,
   mrcCanChangeSignature: boolean,
@@ -122,6 +124,7 @@ const CLASS_METHOD_DEF = {
     this.setNextStatement(false);
     this.updateBlock_();
   },
+  ...NONCOPYABLE_BLOCK,
   /**
    * Returns the state of this block as a JSON serializable object.
    */
@@ -180,12 +183,18 @@ const CLASS_METHOD_DEF = {
     if (this.mrcCanChangeSignature) {
       const nameField = new Blockly.FieldTextInput(name);
       input.insertFieldAt(0, nameField, FIELD_METHOD_NAME);
-      this.setMutator(paramContainer.getMutatorIcon(this));
+      if (this.rendered) {
+        this.setMutator(paramContainer.getMutatorIcon(this as unknown as Blockly.BlockSvg));
+      }
       nameField.setValidator(this.mrcNameFieldValidator.bind(this, nameField));
     } else {
       input.insertFieldAt(0, createFieldNonEditableText(name), FIELD_METHOD_NAME);
-      // Case because a current bug in blockly where it won't allow passing null to Blockly.Block.setMutator makes it necessary.
-      (this as Blockly.BlockSvg).setMutator(null);
+      // Block.setMutator is defined as setMutator(_mutator: MutatorIcon) and BlockSvg.setMutator
+      // is defined as setMutator(mutator: MutatorIcon | null).
+      // Therefore, to call setMutator(null), this must be casted to BlockSvg.
+      if (this.rendered) {
+        (this as unknown as Blockly.BlockSvg).setMutator(null);
+      }
     }
     this.mrcUpdateParams();
     this.mrcUpdateReturnInput();
@@ -229,7 +238,9 @@ const CLASS_METHOD_DEF = {
    * mrcOnMutatorOpen is called when the mutator on a ClassMethodDefBlock is opened.
    */
   mrcOnMutatorOpen: function(this: ClassMethodDefBlock): void {
-    paramContainer.onMutatorOpen(this);
+    if (this.rendered) {
+      paramContainer.onMutatorOpen(this as unknown as Blockly.BlockSvg);
+    }
   },
   mrcRenameParameter: function (this: ClassMethodDefBlock, oldName: string, newName: string) {
     const nextBlock = this.getInputTargetBlock(INPUT_STACK);
@@ -283,10 +294,23 @@ const CLASS_METHOD_DEF = {
     // When the user changes the method name on the block, clear the mrcPythonMethodName field.
     this.mrcPythonMethodName = '';
 
-    // Strip leading and trailing whitespace.
-    name = name.trim();
+    if (this.isInFlyout) {
+      // Flyouts can have multiple methods with identical names.
+      return name;
+    }
+
+    const otherNames: string[] = [];
+    this.workspace.getBlocksByType(BLOCK_NAME)
+        .filter(block => block.id !== this.id)
+        .forEach((block) => {
+          otherNames.push(block.getFieldValue(FIELD_METHOD_NAME));
+          const classMethodDefBlock = block as ClassMethodDefBlock;
+          if (classMethodDefBlock.mrcPythonMethodName) {
+            otherNames.push(classMethodDefBlock.mrcPythonMethodName);
+          }
+        });
 
-    const legalName = findLegalMethodName(name, this);
+    const legalName = makeLegalName(name, otherNames, /* mustBeValidPythonIdentifier */ true);
     const oldName = nameField.getValue();
     if (oldName && oldName !== name && oldName !== legalName) {
       // Rename any callers.
@@ -364,61 +388,6 @@ const CLASS_METHOD_DEF = {
   },
 };
 
-/**
- * Ensure two identically-named methods don't exist.
- * Take the proposed method name, and return a legal name i.e. one that
- * is not empty and doesn't collide with other methods.
- *
- * @param name Proposed method name.
- * @param block Block to disambiguate.
- * @returns Non-colliding name.
- */
-function findLegalMethodName(name: string, block: ClassMethodDefBlock): string {
-  if (block.isInFlyout) {
-    // Flyouts can have multiple methods called 'my_method'.
-    return name;
-  }
-  name = name || 'unnamed';
-  while (isMethodNameUsed(name, block.workspace, block)) {
-    // Collision with another method.
-    const r = name.match(/^(.*?)(\d+)$/);
-    if (!r) {
-      name += '2';
-    } else {
-      name = r[1] + (parseInt(r[2]) + 1);
-    }
-  }
-  return name;
-}
-
-/**
- * Return if the given name is already a method name.
- *
- * @param name The questionable name.
- * @param workspace The workspace to scan for collisions.
- * @param opt_exclude Optional block to exclude from comparisons (one doesn't
- *     want to collide with oneself).
- * @returns True if the name is used, otherwise return false.
- */
-function isMethodNameUsed(
-  name: string, workspace: Blockly.Workspace, opt_exclude?: Blockly.Block): boolean {
-  const nameLowerCase = name.toLowerCase();
-  for (const block of workspace.getBlocksByType(BLOCK_NAME)) {
-    if (block === opt_exclude) {
-      continue;
-    }
-    if (nameLowerCase === block.getFieldValue(FIELD_METHOD_NAME).toLowerCase()) {
-      return true;
-    }
-    const classMethodDefBlock = block as ClassMethodDefBlock;
-    if (classMethodDefBlock.mrcPythonMethodName &&
-        nameLowerCase === classMethodDefBlock.mrcPythonMethodName.toLowerCase()) {
-      return true;
-    }
-  }
-  return false;
-}
-
 export const setup = function () {
   Blockly.Blocks[BLOCK_NAME] = CLASS_METHOD_DEF;
 };

src/blocks/mrc_component.ts

@@ -1,7 +1,7 @@
 /**
  * @license
  * Copyright 2025 Porpoiseful LLC
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -28,9 +28,11 @@ import { Editor } from '../editor/editor';
 import { ExtendedPythonGenerator } from '../editor/extended_python_generator';
 import { getModuleTypeForWorkspace } from './utils/workspaces';
 import { getAllowedTypesForSetCheck, getClassData, getSubclassNames } from './utils/python';
+import { makeLegalName } from './utils/validator';
 import * as toolboxItems from '../toolbox/items';
 import * as storageModule from '../storage/module';
 import * as storageModuleContent from '../storage/module_content';
+import { NONCOPYABLE_BLOCK } from './noncopyable_block';
 import {
     BLOCK_NAME as MRC_MECHANISM_COMPONENT_HOLDER,
     MechanismComponentHolderBlock,
@@ -100,6 +102,7 @@ const COMPONENT = {
     this.setPreviousStatement(true, OUTPUT_NAME);
     this.setNextStatement(true, OUTPUT_NAME);
   },
+  ...NONCOPYABLE_BLOCK,
 
   /**
     * Returns the state of this block as a JSON serializable object.
@@ -162,14 +165,27 @@ const COMPONENT = {
     }
   },
   mrcNameFieldValidator(this: ComponentBlock, nameField: Blockly.FieldTextInput, name: string): string {
-    // Strip leading and trailing whitespace.
-    name = name.trim();
+    if (this.isInFlyout) {
+      // Flyouts can have multiple methods with identical names.
+      return name;
+    }
+
+    const otherNames: string[] = [];
+    this.workspace.getBlocksByType(BLOCK_NAME)
+        .filter(block => block.id !== this.id)
+        .forEach((block) => {
+          otherNames.push(block.getFieldValue(FIELD_NAME));
+        });
 
-    const legalName = name;
+    const legalName = makeLegalName(name, otherNames, /* mustBeValidPythonIdentifier */ true);
     const oldName = nameField.getValue();
     if (oldName && oldName !== name && oldName !== legalName) {
       // Rename any callers.
       renameMethodCallers(this.workspace, this.mrcComponentId, legalName);
+      const editor = Editor.getEditorForBlocklyWorkspace(this.workspace);
+      if (editor) {
+        editor.updateToolboxAfterDelay();
+      }
     }
     return legalName;
   },
@@ -192,7 +208,7 @@ const COMPONENT = {
     // Collect the ports for this component block.
     for (let i = 0; i < this.mrcArgs.length; i++) {
       const argName = this.getArgName(i);
-      ports[argName] = this.mrcArgs[i].name;  
+      ports[argName] = this.mrcArgs[i].name;
     }
   },
   /**
@@ -210,15 +226,15 @@ const COMPONENT = {
   /**
    * mrcOnMove is called when a ComponentBlock is moved.
    */
-  mrcOnMove: function(this: ComponentBlock, reason: string[]): void {
+  mrcOnMove: function(this: ComponentBlock, editor: Editor, reason: string[]): void {
     this.checkBlockIsInHolder();
     if (reason.includes('connect')) {
       const rootBlock: Blockly.Block | null = this.getRootBlock();
       if (rootBlock && rootBlock.type === MRC_MECHANISM_COMPONENT_HOLDER) {
         (rootBlock as MechanismComponentHolderBlock).setNameOfChildBlock(this);
       }
     }
-    mrcDescendantsMayHaveChanged(this.workspace);
+    mrcDescendantsMayHaveChanged(this.workspace, editor);
   },
   checkBlockIsInHolder: function(this: ComponentBlock): void {
     const rootBlock: Blockly.Block | null = this.getRootBlock();
@@ -247,6 +263,13 @@ const COMPONENT = {
       this.mrcComponentId = oldIdToNewId[this.mrcComponentId];
     }
   },
+  upgrade_005_to_006: function(this: ComponentBlock) {
+    for (let i = 0; i < this.mrcArgs.length; i++) {
+      if (this.mrcArgs[i].type === 'Port') {
+        this.mrcArgs[i].type = this.mrcArgs[i].name;
+      }
+    }
+  },
 };
 
 export const setup = function () {
@@ -318,11 +341,21 @@ function createComponentBlock(
   if (constructorData.expectedPortType) {
     extraState.params!.push({
       name: constructorData.expectedPortType,
-      type: 'Port',
+      type: constructorData.expectedPortType,
     });
-    if ( moduleType == storageModule.ModuleType.ROBOT ) {
+    if (moduleType == storageModule.ModuleType.ROBOT ) {
       inputs['ARG0'] = createPort(constructorData.expectedPortType);
     }
   }
   return new toolboxItems.Block(BLOCK_NAME, extraState, fields, Object.keys(inputs).length ? inputs : null);
 }
+
+/**
+ * Upgrades the ComponentBlocks in the given workspace from version 005 to 006.
+ * This function should only be called when upgrading old projects.
+ */
+export function upgrade_005_to_006(workspace: Blockly.Workspace): void {
+  workspace.getBlocksByType(BLOCK_NAME).forEach(block => {
+    (block as ComponentBlock).upgrade_005_to_006();
+  });
+}