fixed single file opening, added loading toasters, made instantaneous syncing work when either gdrive or github is syncing

Author: linedoestrolling

src/commons/fileSystem/FileSystemUtils.ts

@@ -297,3 +297,31 @@ export const getPersistenceFile = (filePath: string) => {
 
   return persistenceFile;
 };
+
+export const isGDriveSyncing = () => {
+  const persistenceFileArray = store.getState().fileSystem.persistenceFileArray;
+
+  if (persistenceFileArray.length === 0) {
+    return false;
+  }
+
+  if (!persistenceFileArray[0].id) {
+    return false;
+  }
+
+  return true;
+}
+
+export const isGithubSyncing = () => {
+  const persistenceFileArray = store.getState().fileSystem.persistenceFileArray;
+
+  if (persistenceFileArray.length === 0) {
+    return false;
+  }
+
+  if (!persistenceFileArray[0].repoName) {
+    return false;
+  }
+
+  return true;
+}

src/commons/fileSystemView/FileSystemViewDirectoryNode.tsx

@@ -13,7 +13,7 @@ import {
 import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 import classes from 'src/styles/FileSystemView.module.scss';
 
-import { rmdirRecursively } from '../fileSystem/FileSystemUtils';
+import { isGDriveSyncing, isGithubSyncing, rmdirRecursively } from '../fileSystem/FileSystemUtils';
 import { showSimpleConfirmDialog, showSimpleErrorDialog } from '../utils/DialogHelper';
 import { removeEditorTabsForDirectory } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
@@ -90,8 +90,12 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
       if (!shouldProceed) {
         return;
       }
-      dispatch(persistenceDeleteFolder(fullPath));
-      dispatch(githubDeleteFolder(fullPath));
+      if (isGDriveSyncing()) {
+        dispatch(persistenceDeleteFolder(fullPath));
+      }
+      if (isGithubSyncing()) {
+        dispatch(githubDeleteFolder(fullPath));
+      }
       dispatch(removeEditorTabsForDirectory(workspaceLocation, fullPath));
       rmdirRecursively(fileSystem, fullPath).then(refreshParentDirectory);
     });
@@ -124,8 +128,12 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-        dispatch(persistenceCreateFile(newFilePath));
-        dispatch(githubCreateFile(newFilePath));
+        if (isGDriveSyncing()) {
+          dispatch(persistenceCreateFile(newFilePath));
+        }
+        if (isGithubSyncing()) {
+          dispatch(githubCreateFile(newFilePath));
+        }
         forceRefreshFileSystemViewList();
       });
     });

src/commons/fileSystemView/FileSystemViewFileName.tsx

@@ -15,6 +15,7 @@ import {
   renameEditorTabsForDirectory
 } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
+import { isGDriveSyncing, isGithubSyncing } from '../fileSystem/FileSystemUtils';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -74,12 +75,20 @@ const FileSystemViewFileName: React.FC<Props> = ({
           }
 
           if (isDirectory) {
-            dispatch(persistenceRenameFolder({ oldFolderPath: oldPath, newFolderPath: newPath }));
-            dispatch(githubRenameFolder(oldPath, newPath));
+            if (isGDriveSyncing()) {
+              dispatch(persistenceRenameFolder({ oldFolderPath: oldPath, newFolderPath: newPath }));
+            }
+            if (isGithubSyncing()) {
+              dispatch(githubRenameFolder(oldPath, newPath));    
+            }
             dispatch(renameEditorTabsForDirectory(workspaceLocation, oldPath, newPath));
           } else {
-            dispatch(persistenceRenameFile({ oldFilePath: oldPath, newFilePath: newPath }));
-            dispatch(githubRenameFile(oldPath, newPath));
+            if (isGDriveSyncing()) {
+              dispatch(persistenceRenameFile({ oldFilePath: oldPath, newFilePath: newPath }));
+            }
+            if (isGithubSyncing()) {
+              dispatch(githubRenameFile(oldPath, newPath));
+            }
             dispatch(renameEditorTabForFile(workspaceLocation, oldPath, newPath));
           }
           refreshDirectory();

src/commons/fileSystemView/FileSystemViewFileNode.tsx

@@ -15,6 +15,7 @@ import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 import FileSystemViewContextMenu from './FileSystemViewContextMenu';
 import FileSystemViewFileName from './FileSystemViewFileName';
 import FileSystemViewIndentationPadding from './FileSystemViewIndentationPadding';
+import { isGDriveSyncing, isGithubSyncing } from '../fileSystem/FileSystemUtils';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -107,8 +108,12 @@ const FileSystemViewFileNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-        dispatch(persistenceDeleteFile(fullPath));
-        dispatch(githubDeleteFile(fullPath));
+        if (isGDriveSyncing()) {
+          dispatch(persistenceDeleteFile(fullPath));
+        }
+        if (isGithubSyncing()) {
+          dispatch(githubDeleteFile(fullPath));
+        }
         dispatch(removeEditorTabForFile(workspaceLocation, fullPath));
         refreshDirectory();
       });