fixed numerous bugs such as opening single file not working, made opening folders behaviour correct(it would previously open the top level folder of the selected folder)

refactored some code as well

Author: linedoestrolling

src/commons/fileSystem/FileSystemActions.ts

@@ -1,6 +1,5 @@
 import { createAction } from '@reduxjs/toolkit';
 import { FSModule } from 'browserfs/dist/node/core/FS';
-import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
 import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
 import { 
@@ -23,7 +22,7 @@ export const setInBrowserFileSystem = createAction(
 
 export const addGithubSaveInfo = createAction(
   ADD_GITHUB_SAVE_INFO,
-  (githubSaveInfo: GitHubSaveInfo) => ({ payload: { githubSaveInfo }})
+  (persistenceFile: PersistenceFile) => ({ payload: { persistenceFile }})
 );
 
 export const deleteGithubSaveInfo = createAction(

src/commons/fileSystem/FileSystemReducer.ts

@@ -26,29 +26,31 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
         state.inBrowserFileSystem = action.payload.inBrowserFileSystem;
       })
       .addCase(addGithubSaveInfo, (state, action) => { // TODO rewrite
-        const githubSaveInfoPayload = action.payload.githubSaveInfo;
+        const persistenceFilePayload = action.payload.persistenceFile;
         const persistenceFileArray = state['persistenceFileArray'];
 
         const saveInfoIndex = persistenceFileArray.findIndex(e => {
-          return e.path === githubSaveInfoPayload.filePath &&
-          e.repoName === githubSaveInfoPayload.repoName;
+          return e.path === persistenceFilePayload.path &&
+          e.repoName === persistenceFilePayload.repoName;
         });
         if (saveInfoIndex === -1) {
           persistenceFileArray[persistenceFileArray.length] = {
             id: '',
             name: '',
-            path: githubSaveInfoPayload.filePath,
-            lastSaved: githubSaveInfoPayload.lastSaved,
-            repoName: githubSaveInfoPayload.repoName
+            path: persistenceFilePayload.path,
+            lastSaved: persistenceFilePayload.lastSaved,
+            repoName: persistenceFilePayload.repoName,
+            parentFolderPath: persistenceFilePayload.parentFolderPath
           };
         } else {
           // file already exists, to replace file
           persistenceFileArray[saveInfoIndex] = {
             id: '',
             name: '',
-            path: githubSaveInfoPayload.filePath,
-            lastSaved: githubSaveInfoPayload.lastSaved,
-            repoName: githubSaveInfoPayload.repoName
+            path: persistenceFilePayload.path,
+            lastSaved: persistenceFilePayload.lastSaved,
+            repoName: persistenceFilePayload.repoName,
+            parentFolderPath: persistenceFilePayload.parentFolderPath
           };
         }
         state.persistenceFileArray = persistenceFileArray;
@@ -57,15 +59,42 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
       const newPersistenceFileArray = state['persistenceFileArray'].filter(e => e.path !== action.payload.path);
       const isGDriveSyncing = action.payload.id ? true: false;
       if (isGDriveSyncing) {
-        const newPersFile = { id: action.payload.id, path: action.payload.path, repoName: '', name: action.payload.name};
+        const newPersFile = { 
+          id: action.payload.id,
+          name: action.payload.name,
+          lastEdit: action.payload.lastEdit,
+          lastSaved: action.payload.lastSaved,
+          parentId: action.payload.parentId,
+          path: action.payload.path
+        };
         const newPersFileArray = newPersistenceFileArray.concat(newPersFile);
         state.persistenceFileArray = newPersFileArray;
       } else {
         state.persistenceFileArray = newPersistenceFileArray;
       }  
     })
     .addCase(deleteAllGithubSaveInfo, (state, action) => {
-      state.persistenceFileArray = [];
+      if (state.persistenceFileArray.length !== 0) {
+        const isGDriveSyncing = state.persistenceFileArray[0].id ? true: false;
+        const newPersistenceFileArray = state.persistenceFileArray;
+        if (isGDriveSyncing) {
+          newPersistenceFileArray.forEach(
+            (persistenceFile, index) => {
+              newPersistenceFileArray[index] = {
+                id: persistenceFile.id,
+                name: persistenceFile.name,
+                lastEdit: persistenceFile.lastEdit,
+                lastSaved: persistenceFile.lastSaved,
+                parentId: persistenceFile.parentId,
+                path: persistenceFile.path
+              }
+            }
+          )
+          state.persistenceFileArray = newPersistenceFileArray;
+        } else {
+          state.persistenceFileArray = [];
+        }
+      }
     })
     .addCase(addPersistenceFile, (state, action) => { // TODO rewrite
       const persistenceFilePayload = action.payload;

src/commons/fileSystem/FileSystemUtils.ts

@@ -285,3 +285,14 @@ export const getGithubSaveInfo = () => {
   };
   return githubSaveInfo;
 }
+
+export const getPersistenceFile = (filePath: string) => {
+  const persistenceFileArray = store.getState().fileSystem.persistenceFileArray;
+  if (filePath === '') {
+    const persistenceFile = persistenceFileArray[0];
+    return persistenceFile;
+  }
+  const persistenceFile = persistenceFileArray.find(e => e.path === filePath);
+  
+  return persistenceFile;
+}

src/commons/fileSystemView/FileSystemViewDirectoryNode.tsx

@@ -4,7 +4,7 @@ import { FSModule } from 'browserfs/dist/node/core/FS';
 import path from 'path';
 import React from 'react';
 import { useDispatch } from 'react-redux';
-import { persistenceCreateFile, persistenceCreateFolder, persistenceDeleteFolder } from 'src/features/persistence/PersistenceActions';
+import { persistenceCreateFolder, persistenceDeleteFolder } from 'src/features/persistence/PersistenceActions';
 import classes from 'src/styles/FileSystemView.module.scss';
 
 import { rmdirRecursively } from '../fileSystem/FileSystemUtils';
@@ -121,7 +121,7 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-        dispatch(persistenceCreateFile(newFilePath));
+        // dispatch(persistenceCreateFile(newFilePath));
         dispatch(githubCreateFile(newFilePath));
         forceRefreshFileSystemViewList();
       });

src/commons/gitHubOverlay/FileExplorerDialog.tsx

@@ -14,6 +14,7 @@ import classNames from 'classnames';
 import React, { useEffect, useState } from 'react';
 
 import {
+  checkFolderLocationIsValid,
   checkIfFileCanBeOpened,
   checkIfFileCanBeSavedAndGetSaveType,
   checkIfUserAgreesToOverwriteEditorData,
@@ -22,10 +23,12 @@ import {
   openFileInEditor,
   openFolderInFolderMode,
   performCreatingSave,
-  performOverwritingSave
+  performMultipleCreatingSave,
+  performOverwritingSaveForSaveAs
 } from '../../features/github/GitHubUtils';
 import { GitHubFileNodeData } from './GitHubFileNodeData';
 import { GitHubTreeNodeCreator } from './GitHubTreeNodeCreator';
+import { getPersistenceFile } from '../fileSystem/FileSystemUtils';
 
 export type FileExplorerDialogProps = {
   repoName: string;
@@ -47,7 +50,7 @@ const FileExplorerDialog: React.FC<FileExplorerDialogProps> = props => {
   return (
     <Dialog className="githubDialog" isOpen={true} onClose={handleClose}>
       <div className={classNames('githubDialogHeader', Classes.DIALOG_HEADER)}>
-        <h3>Select a File</h3>
+        <h3>Select a File/Folder</h3>
       </div>
       <div className={Classes.DIALOG_BODY}>
         <Tree
@@ -117,8 +120,13 @@ const FileExplorerDialog: React.FC<FileExplorerDialogProps> = props => {
       }
     }
 
-    if (props.pickerType == 'Saveall') {
-
+    if (props.pickerType === 'Save All') {
+      if (await checkIsFile(props.octokit, githubLoginID, props.repoName, filePath)) {
+      } else {
+        if (await checkFolderLocationIsValid(props.octokit, githubLoginID, props.repoName, filePath)) {
+          performMultipleCreatingSave(props.octokit, githubLoginID, props.repoName, filePath, githubName, githubEmail, '');
+        }
+      }
     }
 
     if (props.pickerType === 'Save') {
@@ -131,7 +139,7 @@ const FileExplorerDialog: React.FC<FileExplorerDialogProps> = props => {
 
       if (canBeSaved) {
         if (saveType === 'Overwrite' && (await checkIfUserAgreesToPerformOverwritingSave())) {
-          performOverwritingSave(
+          performOverwritingSaveForSaveAs(
             props.octokit,
             githubLoginID,
             props.repoName,
@@ -144,15 +152,24 @@ const FileExplorerDialog: React.FC<FileExplorerDialogProps> = props => {
         }
 
         if (saveType === 'Create') {
+          const persistenceFile = getPersistenceFile(filePath);
+          if (persistenceFile === undefined) {
+            throw new Error("persistence file not found for this filepath: " + filePath);
+          }
+          const parentFolderPath = persistenceFile.parentFolderPath;
+          if (parentFolderPath === undefined) {
+            throw new Error("repository name or parentfolderpath not found for this persistencefile: " + persistenceFile);
+          }
           performCreatingSave(
             props.octokit,
             githubLoginID,
             props.repoName,
-            filePath,
+            filePath.slice(parentFolderPath.length),
             githubName,
             githubEmail,
             commitMessage,
-            props.editorContent
+            props.editorContent,
+            parentFolderPath
           );
         }
       }