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

kcq888 · web-flow · commit ff2c1f3e86fe · 2025-12-28T22:19:02.000-05:00
Changed the logic for checking file upload from Google Drive to XRP
diff --git a/src/components/navbar.tsx b/src/components/navbar.tsx
@@ -117,6 +117,8 @@ function NavBar({ layoutref }: NavBarProps) {
             // subscribe to the connection event
             AppMgr.getInstance().on(EventType.EVENT_CONNECTION_STATUS, async (state: string) => {
                 if (state === ConnectionState.Connected.toString()) {
+                    // clear the existing last file save time for Google Drive files
+                    EditorMgr.getInstance().clearLastFileSaveTime();
                     setConnected(true);
                     setRunning(false);
                 } else if (state === ConnectionState.Disconnected.toString()) {
@@ -832,7 +834,7 @@ function NavBar({ layoutref }: NavBarProps) {
                     const beginExecution = async () => {
                         try {
                             // Save all unsaved editors before running
-                            await EditorMgr.getInstance().saveAllUnsavedEditors();
+                            await EditorMgr.getInstance().saveAllUnsavedEditors(activeTab);
 
                             // Update the main.js
                             const session: EditorSession | undefined =
@@ -850,6 +852,9 @@ function NavBar({ layoutref }: NavBarProps) {
                                                 .updateMainFile(session.path)
                                                 .then(async (lines) => {
                                                     await CommandToXRPMgr.getInstance().executeLines(lines);
+                                                    setRunning(false);
+                                                    broadcastRunningState(false);
+
                                                 });
                                         });
                                     });
@@ -858,16 +863,14 @@ function NavBar({ layoutref }: NavBarProps) {
                                         .updateMainFile(session.path)
                                         .then(async (lines) => {
                                             await CommandToXRPMgr.getInstance().executeLines(lines);
+                                            setRunning(false);
+                                            broadcastRunningState(false);
                                         });
                                 }
                             }
                         } catch (err) {
                             console.log(err);
                         }
-                        // When returning from the execute switch back to RUN mode. This happens when the program ends
-                        // naturaly.
-                        setRunning(false);
-                        broadcastRunningState(false);
                     }
 
                     const handlePowerSwitchOK = async () => {
diff --git a/src/managers/editormgr.ts b/src/managers/editormgr.ts
@@ -372,7 +372,7 @@ export default class EditorMgr {
      * Save all unsaved editors to the robot with progress tracking
      * @returns Promise that resolves when all editors are saved
      */
-    public async saveAllUnsavedEditors(): Promise<void> {
+    public async saveAllUnsavedEditors(activeTab: string): Promise<void> {
         const isConnected = AppMgr.getInstance().getConnection()?.isConnected() ?? false;
         if (!isConnected) {
             return; // Can't save if not connected
@@ -431,6 +431,10 @@ export default class EditorMgr {
                 console.warn(`Failed to save ${failedFiles.length} file(s): ${failedFiles.join(', ')}`);
             }
             
+            if (unsavedSessions.length > 0) {
+                this.SelectEditorTab(activeTab);
+            }
+
             // Set progress to 100%
             AppMgr.getInstance().emit(EventType.EVENT_PROGRESS, '100');
             
@@ -444,24 +448,21 @@ export default class EditorMgr {
         }
     }
 
+    /**
+     * clearLastFileSaveTime - clear the last file save time for Google Drive files
+     */
+    public clearLastFileSaveTime() {
+        localStorage.removeItem(StorageKeys.LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME);
+    }
+
     /**
      * saveAllFilesInGoogleDriveToXRP
      * @param sessionId 
      * @returns 
      */
     public async saveAllFilesInGoogleDriveToXRP(sessionId: string): Promise<void> {
-        // check when was the last time we saved to XRP from local storage
-        const lastSaveConfig = parseInt(localStorage.getItem(StorageKeys.LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME_CONFIG) || Constants.LASTSAVETIME_CONFG);
         const lastSaveTime = localStorage.getItem(StorageKeys.LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME);
-        if (lastSaveTime) {
-            const lastSaveDate = new Date(parseInt(lastSaveTime));
-            const now = new Date();
-            const timeDiff = now.getTime() - lastSaveDate.getTime();
-            const hoursDiff = timeDiff / (1000 * 60 * 60);
-            if (hoursDiff < lastSaveConfig ? lastSaveConfig : 1) {
-                return; // Skip saving if last save was within the past configured hours
-            }
-        }
+        const lastSaveDate = lastSaveTime ? new Date(parseInt(lastSaveTime)) : null;
 
         const session = this.editorSessions.get(sessionId);
         if (!session) {
@@ -487,9 +488,6 @@ export default class EditorMgr {
                 return;
             }
 
-            // Update the last save time in local storage
-            localStorage.setItem(StorageKeys.LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME, Date.now().toString());
-
             const fileList = await AppMgr.getInstance().driveService.getFileListByFolderId(parentId);
 
             for (let i = 0; i < fileList.length; i++) {
@@ -503,6 +501,13 @@ export default class EditorMgr {
                         // Skip folders
                         continue;
                     }
+
+                    const fileModifiedDateTime = new Date(file.modifiedTime || '');
+                    if (lastSaveDate && fileModifiedDateTime <= lastSaveDate) {
+                        // Skip files that have not been modified since last save
+                        continue;
+                    }
+
                     // Get file content from Google Drive
                     await AppMgr.getInstance().driveService.getFileContents(file.id).then(async (fileContent) => {;
                         // Determine XRP path
@@ -516,6 +521,9 @@ export default class EditorMgr {
                 }
             }
 
+            // Update the last save time in local storage
+            localStorage.setItem(StorageKeys.LAST_GOOGLE_DRIVE_TO_XRP_SAVE_TIME, Date.now().toString());
+
             // Set progress to 100%
             AppMgr.getInstance().emit(EventType.EVENT_PROGRESS, '100');
             // Close progress dialog
diff --git a/src/services/google-drive.ts b/src/services/google-drive.ts
@@ -22,8 +22,8 @@ export interface GoogleDriveFile {
     thumbnailLink?: string;
     parents?: string[];
     children?: GoogleDriveFile[]
-    // createdTime?: string;
-    // modifiedTime?: string;
+    createdTime?: string;
+    modifiedTime?: string;
 };
 
 /**
@@ -175,7 +175,7 @@ class GoogleDriveService {
      */
     async getFileListByFolderId(folderId: string): Promise<GoogleDriveFile[]> {
         const query = `'${folderId}' in parents and trashed = false`;
-        const fields = 'files(id, name, mimeType, parents)';
+        const fields = 'files(id, name, mimeType, parents, createdTime, modifiedTime, kind)';
         const url = new URL(this._driveApiUrl);
         url.searchParams.append('q', query);
         url.searchParams.append('fields', fields);
@@ -196,6 +196,8 @@ class GoogleDriveService {
                         id: file.id,
                         name: file.name,
                         mimeType: file.mimeType,
+                        createdTime: file.createdTime,
+                        modifiedTime: file.modifiedTime,
                         parents: file.parents || undefined
                     }));
                 }
@@ -222,6 +224,8 @@ class GoogleDriveService {
                 name: file.name,
                 kind: file.kind,
                 mimeType: file.mimeType,
+                createdTime: file.createdTime,
+                modifiedTime: file.modifiedTime,
                 parents: file.parents || undefined
             };
 
@@ -252,6 +256,8 @@ class GoogleDriveService {
             mimeType: foundFolder.mimeType,
             kind: foundFolder.kind,
             parents: foundFolder.parents,
+            createdTime: foundFolder.createdTime,
+            modifiedTime: foundFolder.modifiedTime,
             children: await this.getChildren(foundFolder.id),
         };
         
@@ -376,7 +382,7 @@ class GoogleDriveService {
      */
     async findFolderByName(folderName: string, parentFolderId?: string): Promise<GoogleDriveFile | null> {
         let query = `name = '${folderName}' and mimeType = 'application/vnd.google-apps.folder' and trashed = false`;
-        const fields = 'files(id, name, kind, mimeType)';
+        const fields = 'files(id, name, kind, mimeType, createdTime, modifiedTime, parents)';
         if (parentFolderId) {
             query += ` and '${parentFolderId}' in parents`;
         }
@@ -513,7 +519,7 @@ class GoogleDriveService {
         existingFileId?: string,
         parentFolderId?: string,
     ): Promise<GoogleDriveFile | null> {
-        const fieldsToReturn = 'id,name,mimeType,webViewLink,webContentLink,thumbnailLink';
+        const fieldsToReturn = 'id,name,mimeType,webViewLink,webContentLink,thumbnailLink, createdTime, modifiedTime, parents';
 
         let method: 'POST' | 'PATCH' = 'POST';
         try {
diff --git a/src/utils/blockly-locales.ts b/src/utils/blockly-locales.ts
@@ -13,7 +13,8 @@ import * as EsMsg from 'blockly/msg/es';
 
 // Map of language codes to their Blockly message objects
 // Add new languages here - they will automatically be supported
-const localeMessages: Record<string, typeof EnMsg> = {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const localeMessages: Record<string, any> = {
     en: EnMsg,
     es: EsMsg,
 };
@@ -37,7 +38,7 @@ export function isLanguageSupported(language: string): boolean {
  * Falls back to 'en' if language is not supported
  */
 export function setBlocklyLocale(language: string): void {
-    const supportedLanguages = getSupportedLanguages();
+    // const supportedLanguages = getSupportedLanguages();
     const defaultLanguage = 'en';
     
     // Validate and fallback to default if needed
@@ -53,4 +54,3 @@ export function setBlocklyLocale(language: string): void {
         Blockly.setLocale(localeMessages[defaultLanguage]);
     }
 }
-
diff --git a/src/utils/google-utils.tsx b/src/utils/google-utils.tsx
@@ -20,6 +20,8 @@ const transformGDriveTreeToFolderTree = (username: string, path: string, driveIt
         gparentId: driveItem.parents ? driveItem.parents[0] : undefined,
         isReadOnly: false, 
         path: path,
+        createdTime: driveItem.createdTime,
+        modifiedTime: driveItem.modifiedTime,
         children: itemType === 'folder' ? [] : null,
     }
 
diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -34,6 +34,8 @@ export interface FolderItem {
     path: string;
     fileId?: string;    // Google Drive file ID
     gparentId?: string; // Google Drive parent IDxs
+    createdTime?: string;
+    modifiedTime?: string;
     parent?: FolderItem;
     children: FolderItem[] | null;
 };

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ const transformGDriveTreeToFolderTree = (username: string, path: string, driveIt`
`20`	`20`	`gparentId: driveItem.parents ? driveItem.parents[0] : undefined,`
`21`	`21`	`isReadOnly: false,`
`22`	`22`	`path: path,`
	`23`	`+ createdTime: driveItem.createdTime,`
	`24`	`+ modifiedTime: driveItem.modifiedTime,`
`23`	`25`	`children: itemType === 'folder' ? [] : null,`
`24`	`26`	`}`
`25`	`27`