GDrive instantaneous folder delete - delete all persistenceFileArray entries of deleted folder as well

Author: sumomomomomo

src/commons/fileSystem/FileSystemActions.ts

@@ -9,6 +9,7 @@ import {
   DELETE_ALL_PERSISTENCE_FILES,
   DELETE_GITHUB_SAVE_INFO,
   DELETE_PERSISTENCE_FILE,
+  DELETE_PERSISTENCE_FOLDER_AND_CHILDREN,
   SET_IN_BROWSER_FILE_SYSTEM,
   SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH,
   UPDATE_LAST_EDITED_FILE_PATH,
@@ -46,6 +47,11 @@ export const deletePersistenceFile = createAction(
   (persistenceFile: PersistenceFile) => ({ payload: persistenceFile })
 );
 
+export const deletePersistenceFolderAndChildren = createAction(
+  DELETE_PERSISTENCE_FOLDER_AND_CHILDREN,
+  (persistenceFile: PersistenceFile) => ({ payload: persistenceFile })
+);
+
 export const updatePersistenceFilePathAndNameByPath = createAction(
   UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH,
   (oldPath: string, newPath: string, newFileName: string) => ({

src/commons/fileSystem/FileSystemReducer.ts

@@ -11,6 +11,7 @@ import {
   deleteAllPersistenceFiles,
   deleteGithubSaveInfo,
   deletePersistenceFile,
+  deletePersistenceFolderAndChildren,
   setInBrowserFileSystem,
   setPersistenceFileLastEditByPath,
   updateLastEditedFilePath,
@@ -133,6 +134,33 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
           state.persistenceFileArray = newPersistenceFileArray;
         }
       })
+      .addCase(deletePersistenceFolderAndChildren, (state, action) => { // check if github is syncing?
+        const newPersistenceFileArray = state['persistenceFileArray'].filter(
+          e => e.id !== action.payload.id
+        );
+        // get children
+        // get current level of folder
+        const regexResult = filePathRegex.exec(action.payload.path!)!;
+
+        const currFolderSplit: string[] = regexResult[0].slice(1).split('/');
+        const folderName = regexResult[2];
+        const currFolderLevel = currFolderSplit.length - 1;
+
+        state.persistenceFileArray = newPersistenceFileArray
+          .filter(e => e.path)
+          .filter(e => {
+            const r = filePathRegex.exec(e.path!)!;
+            const currParentFolders = r[0].slice(1).split('/');
+            console.log('currParentFolders', currParentFolders, 'folderLevel', currFolderLevel);
+            if (currParentFolders.length <= currFolderLevel) {
+              return true; // not a child of folder
+            }
+            if (currParentFolders[currFolderLevel] !== folderName) {
+              return true; // not a child of folder
+            }
+            return false;
+          });
+      })
       .addCase(deleteAllPersistenceFiles, (state, action) => {
         state.persistenceFileArray = [];
       })
@@ -158,7 +186,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
         const regexResult = filePathRegex.exec(action.payload.newPath)!;
 
         const currFolderSplit: string[] = regexResult[0].slice(1).split('/');
-        const currFolderIndex = currFolderSplit.length - 1;
+        const currFolderLevel = currFolderSplit.length - 1;
 
         // /fold1/ becomes ["fold1"]
         // /fold1/fold2/ becomes ["fold1", "fold2"]
@@ -172,15 +200,15 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
           .map(e => {
             const r = filePathRegex.exec(e.path!)!;
             const currParentFolders = r[0].slice(1).split('/');
-            console.log('currParentFolders', currParentFolders, 'folderLevel', currFolderIndex);
-            if (currParentFolders.length <= currFolderIndex) {
+            console.log('currParentFolders', currParentFolders, 'folderLevel', currFolderLevel);
+            if (currParentFolders.length <= currFolderLevel) {
               return e; // not a child of folder
             }
-            if (currParentFolders[currFolderIndex] !== action.payload.oldFolderName) {
+            if (currParentFolders[currFolderLevel] !== action.payload.oldFolderName) {
               return e; // not a child of folder
             }
             // only children remain
-            currParentFolders[currFolderIndex] = action.payload.newFolderName;
+            currParentFolders[currFolderLevel] = action.payload.newFolderName;
             currParentFolders[0] = '/' + currParentFolders[0];
             const newPath = currParentFolders.join('/');
             console.log('from', e.path, 'to', newPath);

src/commons/fileSystem/FileSystemTypes.ts

@@ -6,6 +6,7 @@ export const ADD_GITHUB_SAVE_INFO = 'ADD_GITHUB_SAVE_INFO';
 export const ADD_PERSISTENCE_FILE = 'ADD_PERSISTENCE_FILE';
 export const DELETE_GITHUB_SAVE_INFO = 'DELETE_GITHUB_SAVE_INFO';
 export const DELETE_PERSISTENCE_FILE = 'DELETE_PERSISTENCE_FILE';
+export const DELETE_PERSISTENCE_FOLDER_AND_CHILDREN = 'DELETE_PERSISTENCE_FOLDER_AND_CHILDREN';
 export const DELETE_ALL_GITHUB_SAVE_INFO = 'DELETE_ALL_GITHUB_SAVE_INFO';
 export const DELETE_ALL_PERSISTENCE_FILES = 'DELETE_ALL_PERSISTENCE_FILES';
 export const UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH =

src/commons/sagas/PersistenceSaga.tsx

@@ -1199,13 +1199,20 @@ export function* persistenceSaga(): SagaIterator {
         }
         yield call(ensureInitialisedAndAuthorised);
         yield call(deleteFileOrFolder, persistenceFile.id);
-        yield put(actions.deletePersistenceFile(persistenceFile));
+        yield put(actions.deletePersistenceFolderAndChildren(persistenceFile));
         yield call(store.dispatch, actions.updateRefreshFileViewKey());
         yield call(
           showSuccessMessage,
           `Folder ${persistenceFile.name} successfully deleted from Google Drive.`,
           1000
         );
+        // Check if user deleted the whole folder
+        const updatedPersistenceFileArray: PersistenceFile[] = yield select(
+          (state: OverallState) => state.fileSystem.persistenceFileArray
+        );
+        if (updatedPersistenceFileArray.length === 0) {
+          yield put(actions.playgroundUpdatePersistenceFile(undefined));
+        }
       } catch (ex) {
         console.error(ex);
         yield call(showWarningMessage, `Error while deleting folder.`, 1000);