Changes to fix rename problem

Author: alan412

src/reactComponents/FileManageModal.tsx

@@ -65,7 +65,7 @@ export default function FileManageModal(props: FileManageModalProps) {
   const [copyModalOpen, setCopyModalOpen] = React.useState(false);
 
   React.useEffect(() => {
-    if (!props.project || props.tabType === null) {
+    if (!props.project || props.tabType === null || !props.isOpen) {
       setModules([]);
       return;
     }
@@ -89,7 +89,7 @@ export default function FileManageModal(props: FileManageModalProps) {
     // Sort modules alphabetically by name
     moduleList.sort((a, b) => a.name.localeCompare(b.name));
     setModules(moduleList);
-  }, [props.project, props.tabType]);
+  }, [props.project, props.tabType, props.isOpen]);
 
   /** Handles renaming a module. */
   const handleRename = async (origModule: Module, newClassName: string): Promise<void> => {
@@ -106,19 +106,10 @@ export default function FileManageModal(props: FileManageModalProps) {
       );
       await props.onProjectChanged();
 
-      const newModules = modules.map((module) => {
-        if (module.path === origModule.path) {
-          return {...module, title: newClassName, path: newModulePath};
-        }
-        return module;
-      });
-
-      setModules(newModules);
-
       // Close the rename modal first
       setRenameModalOpen(false);
 
-      // Automatically select and open the newly created module
+      // Automatically select and open the renamed module
       props.gotoTab(newModulePath);
       props.onClose();
 

src/reactComponents/Tabs.tsx

@@ -381,8 +381,32 @@ export function Component(props: TabsProps): React.JSX.Element {
   // Effect to handle active tab changes
   React.useEffect(() => {
     if (activeKey !== props.activeTab) {
-      if (!isTabOpen(props.activeTab)) {
-        addTab(props.activeTab);
+      if (!isTabOpen(props.activeTab) && props.project) {
+        // Check if this is a renamed module by looking for a tab that points to a non-existent path
+        const targetModule = storageProject.findModuleByModulePath(props.project, props.activeTab);
+        if (targetModule) {
+          // Find a tab whose module path no longer exists (indicating it was renamed)
+          const staleTab = props.tabList.find((tab) => {
+            if (tab.type === TabType.ROBOT) return false;
+            const tabModule = storageProject.findModuleByModulePath(props.project!, tab.key);
+            // If the tab's path doesn't exist, check if it matches the type of the target module
+            return !tabModule && 
+              ((tab.type === TabType.MECHANISM && targetModule.moduleType === storageModule.ModuleType.MECHANISM) ||
+               (tab.type === TabType.OPMODE && targetModule.moduleType === storageModule.ModuleType.OPMODE));
+          });
+          
+          if (staleTab) {
+            // Update the stale tab with the new path and title
+            const newTabs = props.tabList.map((tab) => 
+              tab.key === staleTab.key ? { ...tab, key: props.activeTab, title: targetModule.className } : tab
+            );
+            props.setTabList(newTabs);
+          } else {
+            addTab(props.activeTab);
+          }
+        } else {
+          addTab(props.activeTab);
+        }
       }
       handleTabChange(props.activeTab);
     }