Merge pull request #106 from Open-STEM/kq-bugs

Addressed issue #102

Author: kcq888

src/components/blockly.tsx

@@ -264,7 +264,6 @@ function BlocklyEditor({ name }: BlocklyEditorProps) {
                         const ws = session?.workspace;
                         const code = pythonGenerator.workspaceToCode(ws);
                         if (ws && code) {
-                            session.content = code;
                             AppMgr.getInstance().emit(EventType.EVENT_GENPYTHON_DONE, code);
                         }
                     }
@@ -299,10 +298,12 @@ function BlocklyEditor({ name }: BlocklyEditorProps) {
                     const json = JSON.stringify(Blockly.serialization.workspaces.save(ws));
                     EditorMgr.updateLiveContent(name, json);
                 } catch (e) {
+                    console.warn('Failed to serialize Blockly workspace:', e);
                     EditorMgr.updateLiveContent(name, '');
                 }
 
                 // Listen for workspace changes
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const changeListener = (event: any) => {
                     if (event.isUiEvent) return; // Skip UI events
                     try {

src/components/dialogs/view-pythondlg.tsx

@@ -4,17 +4,27 @@ import { useTranslation } from 'react-i18next';
 type ViewPythonDlgProps = {
     code: string;
     toggleDlg: () => void;
+    clearDlg: () => void;
 };
 
-export default function ViewPythonDlg({ code, toggleDlg }: ViewPythonDlgProps) {
+export default function ViewPythonDlg({ code, toggleDlg, clearDlg }: ViewPythonDlgProps) {
     const { t } = useTranslation();
+
+    /**
+     * handleDlgClose - handle dialog close action
+     */
+    const handleDlgClose = () => {
+        clearDlg();
+        toggleDlg();
+    };
+
     return (
         <div className="flex h-auto w-auto flex-col gap-2 overflow-hidden rounded-md border border-mountain-mist-700 p-8 shadow-md transition-all dark:border-shark-500 dark:bg-shark-950">
             <div className="flex flex-col items-center">
                 <button
                     type="button"
                     className="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 dark:hover:bg-gray-600 dark:hover:text-white ms-auto inline-flex h-8 w-8 items-center justify-center rounded-lg text-sm"
-                    onClick={toggleDlg}
+                    onClick={handleDlgClose}
                 >
                     <svg
                         className="h-3 w-3"

src/components/navbar.tsx

@@ -474,8 +474,9 @@ function NavBar({ layoutref }: NavBarProps) {
      * ViewPythonFile - view the Python file
      */
     function ViewPythonFile() {
+        console.log('View Python File', activeTab);
         const viewPythonHandler = (code: string) => {
-            setDialogContent(<ViewPythonDlg code={code} toggleDlg={toggleDialog} />);
+            setDialogContent(<ViewPythonDlg code={code} toggleDlg={toggleDialog} clearDlg={clearDialogContent}/>);
             toggleDialog();
             appMgr.eventOff(EventType.EVENT_GENPYTHON_DONE);
         };
@@ -771,6 +772,13 @@ function NavBar({ layoutref }: NavBarProps) {
         setMoreMenuOpen(!isMoreMenuOpen);
     }
 
+    /**
+     * clearDialogContent - toggle the dialog open/close state
+     */
+    function clearDialogContent(){
+        setDialogContent(<div />);
+    };
+
     /**
      * toggleDialog - toggle the dialog open and closed
      */