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

Kq bugs

Author: kcq888

src/components/navbar.tsx

@@ -84,6 +84,7 @@ function NavBar({ layoutref }: NavBarProps) {
     const [isConnected, setConnected] = useState(false);
     const [isLogin, setLogin] = useState(false);
     const [isRunning, setRunning] = useState(false);
+    const [isStopping, setIsStopping] = useState(false);
     const [isBlockly, setBlockly] = useState(false);
     const [isOtherTab, setIsOtherTab] = useState(false);
     const dialogRef = useRef<HTMLDialogElement>(null);
@@ -798,6 +799,15 @@ function NavBar({ layoutref }: NavBarProps) {
     async function onRunBtnClicked() {
         console.log('onRunBtnClicked');
 
+        const resetRunButtonStates = () => {
+            AppMgr.getInstance().on(EventType.EVENT_PROGRAM_EXECUTED, () => {
+                setRunning(false);
+                setIsStopping(false);
+                broadcastRunningState(false);
+                AppMgr.getInstance().eventOff(EventType.EVENT_PROGRAM_EXECUTED);
+            });
+        }
+
         if (!isRunning) {
             if (!isConnected) {
                 setDialogContent(
@@ -852,9 +862,7 @@ function NavBar({ layoutref }: NavBarProps) {
                                                 .updateMainFile(session.path)
                                                 .then(async (lines) => {
                                                     await CommandToXRPMgr.getInstance().executeLines(lines);
-                                                    setRunning(false);
-                                                    broadcastRunningState(false);
-
+                                                    resetRunButtonStates();
                                                 });
                                         });
                                     });
@@ -863,8 +871,7 @@ function NavBar({ layoutref }: NavBarProps) {
                                         .updateMainFile(session.path)
                                         .then(async (lines) => {
                                             await CommandToXRPMgr.getInstance().executeLines(lines);
-                                            setRunning(false);
-                                            broadcastRunningState(false);
+                                            resetRunButtonStates();
                                         });
                                 }
                             }
@@ -908,8 +915,7 @@ function NavBar({ layoutref }: NavBarProps) {
                     }
                 });         
         } else {
-            setRunning(false);
-            broadcastRunningState(false);
+            setIsStopping(true);
             CommandToXRPMgr.getInstance().stopProgram();
         }
     }
@@ -1197,6 +1203,7 @@ function NavBar({ layoutref }: NavBarProps) {
                     id="runBtn"
                     className={`text-white h-full w-[120] items-center justify-center rounded-3xl px-4 py-2 ${isRunning ? 'bg-cinnabar-600' : 'bg-chateau-green-500'} ${isConnected ? 'flex' : 'hidden'}`}
                     onClick={onRunBtnClicked}
+                    disabled={isStopping}
                 >
                     {isRunning ? (
                         <>

src/managers/appmgr.ts

@@ -46,7 +46,8 @@ export enum EventType {
     EVENT_GAMEPAD_STATUS = 'gamepad-status', // Gamepad status on/off
     EVENT_ALERT = 'alert', // Alert dialog event
     EVENT_ISRUNNING = 'is-running', // XRP is running user code
-    EVENT_LOGIN_STATUS = 'login-status' // Google login status
+    EVENT_LOGIN_STATUS = 'login-status', // Google login status
+    EVENT_PROGRAM_EXECUTED = 'runstop-complete' // Run/Stop command complete
 }
 
 type Events = {
@@ -80,6 +81,7 @@ type Events = {
     [EventType.EVENT_ALERT]: string;
     [EventType.EVENT_ISRUNNING]: string;
     [EventType.EVENT_LOGIN_STATUS]: string;
+    [EventType.EVENT_PROGRAM_EXECUTED]: string;
 };
 
 /**

src/managers/commandstoxrpmgr.ts

@@ -983,7 +983,10 @@ export class CommandToXRPMgr {
 
         // Make sure to update the filesystem as there is a small chance that the program saved something like a log file.
         setTimeout(() => {
-            this.getOnBoardFSTree();
+            this.getOnBoardFSTree().then(() => {
+                // File system tree updated after execution
+                AppMgr.getInstance().emit(EventType.EVENT_PROGRAM_EXECUTED, '');
+            });
         });
     }
 

src/managers/editormgr.ts

@@ -6,6 +6,7 @@ import { StorageKeys } from "@/utils/localstorage";
 import { Constants } from "@/utils/constants";
 import { Workspace } from "react-blockly";
 import i18n from "@/utils/i18n";
+import { GoogleDriveFile } from "@/services/google-drive";
 
 /**
  * EditorSession - Editor session object
@@ -478,9 +479,6 @@ export default class EditorMgr {
             return; // Can't save if not logged in
         }
 
-        // Show progress dialog
-        AppMgr.getInstance().emit(EventType.EVENT_SHOWPROGRESS, Constants.SHOW_PROGRESS);
-
         try {
             // Get a list of all files in Google Drive parent directory
             const parentId = session.gparentId;
@@ -490,6 +488,9 @@ export default class EditorMgr {
 
             const fileList = await AppMgr.getInstance().driveService.getFileListByFolderId(parentId);
 
+            const googleFilesTobeUploadedToXRP: GoogleDriveFile[] = [];
+            
+            // Iterate through files and upload to XRP if modified since last save
             for (let i = 0; i < fileList.length; i++) {
                 const file = fileList[i];
                 const fileName = file.name;
@@ -508,6 +509,26 @@ export default class EditorMgr {
                         continue;
                     }
 
+                    googleFilesTobeUploadedToXRP.push(file);
+
+                } catch (error) {
+                    console.error(`Error identifying Google Drive modified file ${fileName} to XRP:`, error);
+                }
+            }
+
+            if (googleFilesTobeUploadedToXRP.length === 0) {
+                return; // Nothing to save
+            }
+
+            // Show progress dialog
+            AppMgr.getInstance().emit(EventType.EVENT_SHOWPROGRESS, Constants.SHOW_PROGRESS);
+
+            for (let i = 0; i < googleFilesTobeUploadedToXRP.length; i++) {
+                const file = googleFilesTobeUploadedToXRP[i];
+                const fileName = file.name;
+                AppMgr.getInstance().emit(EventType.EVENT_PROGRESS_ITEM, fileName);
+
+                try {
                     // Get file content from Google Drive
                     await AppMgr.getInstance().driveService.getFileContents(file.id).then(async (fileContent) => {;
                         // Determine XRP path

src/utils/localstorage.ts

@@ -8,7 +8,6 @@ const StorageKeys = {
     LANGUAGE: 'i18nextLng',
     THEME: 'Theme',
     LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME: 'LastGoogleDriveToXrpSaveTime',
-    LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME_CONFIG: 'LastGoogleDriveToXrpSaveTimeConfig',
   } as const;
 
   export type StorageKeysType = (typeof StorageKeys)[keyof typeof StorageKeys];