Cleanup

Author: alan412

src/reactComponents/FileManageModal.tsx

@@ -45,15 +45,37 @@ type FileManageModalProps = {
 export default function FileManageModal(props: FileManageModalProps) {
     const { t } = I18Next.useTranslation();
     const [modules, setModules] = React.useState<Module[]>([]);
-    const [loading, setLoading] = React.useState(false);
     const [newItemName, setNewItemName] = React.useState('');
     const [currentRecord, setCurrentRecord] = React.useState<Module | null>(null);
     const [renameModalOpen, setRenameModalOpen] = React.useState(false);
     const [name, setName] = React.useState('');
     const [copyModalOpen, setCopyModalOpen] = React.useState(false);
 
     React.useEffect(() => {
-        if (props.project && props.moduleType !== null) {
+        const loadModules = async (storage : commonStorage.Storage) => {
+            let moduleList: Module[] = [];
+            let projects = await storage.listModules()
+            projects.forEach((project) => {
+                if (project.className && project.modulePath) {
+                    moduleList.push({
+                        path: project.modulePath,
+                        title: project.className,
+                        type: TabType.PROJECT
+                    });
+                }
+            });
+            // Sort modules alphabetically by title
+            moduleList.sort((a, b) => a.title.localeCompare(b.title));            
+            setModules(moduleList);
+        }
+
+        if( props.moduleType === TabType.PROJECT ) {
+            let moduleList: Module[] = [];
+            if(props.storage){
+                loadModules(props.storage);
+            }
+        }
+        else if (props.project && props.moduleType !== null) {
             let moduleList: Module[] = [];
 
             if (props.moduleType === TabType.MECHANISM) {
@@ -79,22 +101,6 @@ export default function FileManageModal(props: FileManageModalProps) {
         }
     }, [props.project, props.moduleType]);
 
-    const handleDelete = async (module: Module) => {
-        if (props.storage && props.project) {
-            setLoading(true);
-            try {
-                await commonStorage.removeModuleFromProject(props.storage, props.project, module.path);
-                // Remove from local state
-                setModules(modules.filter(m => m.path !== module.path));
-            } catch (error) {
-                console.error('Error deleting module:', error);
-                Antd.message.error('Failed to delete module');
-            } finally {
-                setLoading(false);
-            }
-        }
-    };
-
     const handleRename = async (origModule: Module, newName: string) => {
         if (props.storage && props.project) {
             try {
@@ -347,7 +353,6 @@ export default function FileManageModal(props: FileManageModalProps) {
                     columns={columns}
                     dataSource={modules}
                     rowKey="path"
-                    loading={loading}
                     size="small"
                     pagination={modules.length > 5 ? {
                         pageSize: 5,

src/reactComponents/Menu.tsx

@@ -151,29 +151,35 @@ export function Component(props: MenuProps) {
         });
     };
 
-    const handleSelect: Antd.MenuProps['onSelect'] = ({ key }) => {
+    const openModal = React.useCallback((type: TabType) => {
+        console.log('openModal called with type:', type);
+        setFileModalOpen(false); // Always close first
+        setModuleType(type);
+
+        // Use setTimeout to ensure the close happens first
+        setTimeout(() => {
+            console.log('Setting fileModalOpen to true');
+            setFileModalOpen(true);
+        }, 0);
+    }, []);
+
+    const handleClick: Antd.MenuProps['onClick'] = ({ key }) => {
         let newModule = props.project ? commonStorage.findModuleInProject(props.project, key) : null;
         if (newModule) {
             props.gotoTab(newModule.modulePath);
         }
         else {
-            if(key === 'manageMechanisms'){
-                if (!fileModalOpen || moduleType !== TabType.MECHANISM) {
-                    setFileModalOpen(true);
-                    setModuleType(TabType.MECHANISM);
-                }
-            }else if(key === 'manageOpmodes'){
-                if (!fileModalOpen || moduleType !== TabType.OPMODE) {
-                    setFileModalOpen(true);
-                    setModuleType(TabType.OPMODE);
-                }
-            }else if(key === 'manageProjects'){ 
-                if (!fileModalOpen || moduleType !== TabType.PROJECT) {
-                    setFileModalOpen(true);
-                    setModuleType(TabType.PROJECT);
-                }
+            if (key === 'manageMechanisms') {
+                setModuleType(TabType.MECHANISM);
+                setFileModalOpen(true);
+            } else if (key === 'manageOpmodes') {
+                setModuleType(TabType.OPMODE);
+                setFileModalOpen(true);
+            } else if (key === 'manageProjects') {
+                setModuleType(TabType.PROJECT);
+                setFileModalOpen(true);
             }
-            else{
+            else {
                 // TODO: It wasn't a module, so do the other thing...
                 console.log(`Selected key that wasn't module: ${key}`);
             }
@@ -184,7 +190,10 @@ export function Component(props: MenuProps) {
         <>
             <FileManageModal
                 isOpen={fileModalOpen}
-                onCancel={() => setFileModalOpen(false)}
+                onCancel={() => {
+                    console.log('Modal onCancel called');
+                    setFileModalOpen(false);
+                }}
                 project={props.project}
                 storage={props.storage}
                 moduleType={moduleType}
@@ -196,7 +205,7 @@ export function Component(props: MenuProps) {
                 defaultSelectedKeys={['1']}
                 mode="inline"
                 items={menuItems}
-                onSelect={handleSelect}
+                onClick={handleClick}
             />
         </>
     );