Initial commit for google drive - instantaneous deletion/file renaming

Author: sumomomomomo

src/commons/fileSystem/FileSystemActions.ts

@@ -10,10 +10,10 @@ import {
   DELETE_ALL_PERSISTENCE_FILES,  DELETE_GITHUB_SAVE_INFO,
   DELETE_PERSISTENCE_FILE, 
   SET_IN_BROWSER_FILE_SYSTEM,
-  UPDATE_GITHUB_SAVE_INFO,
   SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH, 
+  UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH,
   UPDATE_LAST_EDITED_FILE_PATH,
-  UPDATE_REFRESH_FILE_VIEW_KEY} from './FileSystemTypes';
+  UPDATE_REFRESH_FILE_VIEW_KEY } from './FileSystemTypes';
 
 export const setInBrowserFileSystem = createAction(
   SET_IN_BROWSER_FILE_SYSTEM,
@@ -34,12 +34,6 @@ export const deleteAllGithubSaveInfo = createAction(
   DELETE_ALL_GITHUB_SAVE_INFO,
   () => ({ payload: {} })
 );
-export const updateGithubSaveInfo = createAction(
-  UPDATE_GITHUB_SAVE_INFO,
-  (repoName: string,
-    filePath: string,
-    lastSaved: Date) => ({ payload: {repoName, filePath, lastSaved} })
-);
 
 export const addPersistenceFile = createAction(
   ADD_PERSISTENCE_FILE,
@@ -48,7 +42,12 @@ export const addPersistenceFile = createAction(
 
 export const deletePersistenceFile = createAction(
   DELETE_PERSISTENCE_FILE,
-  (persistenceFile: PersistenceFile) => ({ payload: persistenceFile })
+  ( persistenceFile: PersistenceFile ) => ({ payload: persistenceFile })
+);
+
+export const updatePersistenceFilePathAndNameByPath = createAction(
+  UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH,
+  (oldPath: string, newPath: string, newFileName: string) => ({ payload: {oldPath, newPath, newFileName}})
 );
 
 export const deleteAllPersistenceFiles = createAction(

src/commons/fileSystem/FileSystemReducer.ts

@@ -13,6 +13,7 @@ import {
   setPersistenceFileLastEditByPath,
   updateLastEditedFilePath,
   updateRefreshFileViewKey,
+  updatePersistenceFilePathAndNameByPath,
   } from './FileSystemActions';
 import { FileSystemState } from './FileSystemTypes';
 
@@ -23,7 +24,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
       .addCase(setInBrowserFileSystem, (state, action) => {
         state.inBrowserFileSystem = action.payload.inBrowserFileSystem;
       })
-      .addCase(addGithubSaveInfo, (state, action) => {
+      .addCase(addGithubSaveInfo, (state, action) => { // TODO rewrite
         const githubSaveInfoPayload = action.payload.githubSaveInfo;
         const persistenceFileArray = state['persistenceFileArray'];
 
@@ -51,7 +52,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
         }
         state.persistenceFileArray = persistenceFileArray;
     })
-    .addCase(deleteGithubSaveInfo, (state, action) => {
+    .addCase(deleteGithubSaveInfo, (state, action) => { // TODO rewrite - refer to deletePersistenceFile below
       const newPersistenceFileArray = state['persistenceFileArray'].filter(e => {
         return e.path != action.payload.githubSaveInfo.filePath &&
         e.lastSaved != action.payload.githubSaveInfo.lastSaved &&
@@ -62,7 +63,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
     .addCase(deleteAllGithubSaveInfo, (state, action) => {
       state.persistenceFileArray = [];
     })
-    .addCase(addPersistenceFile, (state, action) => {
+    .addCase(addPersistenceFile, (state, action) => { // TODO rewrite
       const persistenceFilePayload = action.payload;
       const persistenceFileArray = state['persistenceFileArray'];
       const persistenceFileIndex = persistenceFileArray.findIndex(e => e.id === persistenceFilePayload.id);
@@ -75,11 +76,28 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
     })
     .addCase(deletePersistenceFile, (state, action) => {
       const newPersistenceFileArray = state['persistenceFileArray'].filter(e => e.id !== action.payload.id);
-      state.persistenceFileArray = newPersistenceFileArray;
+      const isGitHubSyncing = action.payload.repoName ? true : false;
+      if (isGitHubSyncing) {
+        const newPersFile = {id: '', name: '', repoName: action.payload.repoName, path: action.payload.path};
+        const newPersFileArray = newPersistenceFileArray.concat(newPersFile);
+        state.persistenceFileArray = newPersFileArray;
+      } else {
+        state.persistenceFileArray = newPersistenceFileArray;
+      }
     })
     .addCase(deleteAllPersistenceFiles, (state, action) => {
       state.persistenceFileArray = [];
     })
+    .addCase(updatePersistenceFilePathAndNameByPath, (state, action) => {
+      const filesState = state['persistenceFileArray'];
+      const persistenceFileFindIndex = filesState.findIndex(e => e.path === action.payload.oldPath);
+      if (persistenceFileFindIndex === -1) {
+        return;
+      }
+      const newPersistenceFile = {...filesState[persistenceFileFindIndex], path: action.payload.newPath, name: action.payload.newFileName};
+      filesState[persistenceFileFindIndex] = newPersistenceFile;
+      state.persistenceFileArray = filesState;
+    })
     .addCase(setPersistenceFileLastEditByPath, (state, action) => {
       const filesState = state['persistenceFileArray'];
       const persistenceFileFindIndex = filesState.findIndex(e => e.path === action.payload.path);

src/commons/fileSystem/FileSystemTypes.ts

@@ -7,8 +7,8 @@ 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_ALL_GITHUB_SAVE_INFO = 'DELETE_ALL_GITHUB_SAVE_INFO';
-export const UPDATE_GITHUB_SAVE_INFO = 'UPDATE_GITHUB_SAVE_INFO';
 export const DELETE_ALL_PERSISTENCE_FILES = 'DELETE_ALL_PERSISTENCE_FILES';
+export const UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH = 'UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH';
 export const SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH = 'SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH';
 export const UPDATE_LAST_EDITED_FILE_PATH = 'UPDATE_LAST_EDITED_FILE_PATH';
 export const UPDATE_REFRESH_FILE_VIEW_KEY = 'UPDATE_REFRESH_FILE_VIEW_KEY';

src/commons/sagas/PersistenceSaga.tsx

@@ -24,7 +24,6 @@ import { OverallState } from '../application/ApplicationTypes';
 import { ExternalLibraryName } from '../application/types/ExternalTypes';
 import { LOGIN_GOOGLE, LOGOUT_GOOGLE } from '../application/types/SessionTypes';
 import { retrieveFilesInWorkspaceAsRecord, rmFilesInDirRecursively, writeFileRecursively } from '../fileSystem/FileSystemUtils';
-import { refreshFileView } from '../fileSystemView/FileSystemViewList'; // TODO broken when folder is open when reading folders
 import { actions } from '../utils/ActionsHelper';
 import Constants from '../utils/Constants';
 import { showSimpleConfirmDialog, showSimplePromptDialog } from '../utils/DialogHelper';
@@ -196,7 +195,7 @@ export function* persistenceSaga(): SagaIterator {
         // TODO find a file to open instead of deleting all active tabs?
         // TODO without modifying WorkspaceReducer in one function this would cause errors - called by onChange of Playground.tsx?
         // TODO change behaviour of WorkspaceReducer to not create program.js every time folder mode changes with 0 tabs existing?
-        yield call(refreshFileView); // refreshes folder view TODO super jank?
+        yield call(store.dispatch, actions.updateRefreshFileViewKey()); // refreshes folder view TODO super jank?
 
         yield call(showSuccessMessage, `Loaded folder ${name}.`, 1000);
 
@@ -533,6 +532,9 @@ export function* persistenceSaga(): SagaIterator {
       // Turn on folder mode TODO enable folder mode
       //yield call (store.dispatch, actions.setFolderMode("playground", true));
       yield call(store.dispatch, actions.enableFileSystemContextMenus());
+      yield call(store.dispatch, actions.updateRefreshFileViewKey());
+
+      yield call(showSuccessMessage, `${currFolderObject.name} successfully saved to Google Drive.`, 1000);
 
 
       // Case 1: Open picker to select location for saving, similar to save all
@@ -609,7 +611,8 @@ export function* persistenceSaga(): SagaIterator {
         yield call(console.log, "parent not found ", newFilePath);
         return;
       }
-      const newFileName = regexResult![2];
+      const newFileName = regexResult![2] + regexResult![3];
+      yield call(console.log, regexResult, "regexresult!!!!!!!!!!!!!!!!!");
       const persistenceFileArray: PersistenceFile[] = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
       const parentFolderPersistenceFile = persistenceFileArray.find(e => e.path === parentFolderPath);
       if (!parentFolderPersistenceFile) {
@@ -648,6 +651,37 @@ export function* persistenceSaga(): SagaIterator {
     function* ({ payload }: ReturnType<typeof actions.persistenceCreateFolder>) {
       const newFolderPath = payload;
       yield call(console.log, "create folder ", newFolderPath);
+
+      
+      // const persistenceFileArray: PersistenceFile[] = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
+      
+      // look for parent folder persistenceFile
+      const regexResult = /^(.*[\\\/])?(\.*.*?)(\.[^.]+?|)$/.exec(newFolderPath);
+      const parentFolderPath = regexResult ? regexResult[1].slice(0, -1) : undefined;
+      if (!parentFolderPath) {
+        yield call(console.log, "parent not found ", newFolderPath);
+        return;
+      }
+      const newFolderName = regexResult![2];
+      const persistenceFileArray: PersistenceFile[] = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
+      const parentFolderPersistenceFile = persistenceFileArray.find(e => e.path === parentFolderPath);
+      if (!parentFolderPersistenceFile) {
+        yield call(console.log, "parent pers file not found ", newFolderPath, " parent path ", parentFolderPath, " persArr ", persistenceFileArray, " reg res ", regexResult);
+        return;
+      }
+
+      yield call(console.log, "parent found ", parentFolderPersistenceFile, " for file ", newFolderPath);
+
+      // create folder
+      const parentFolderId = parentFolderPersistenceFile.id;
+
+      const newFolderId: string = yield call(createFolderAndReturnId, parentFolderId, newFolderName);
+      yield put(actions.addPersistenceFile({ lastSaved: new Date(), path: newFolderPath, id: newFolderId, name: newFolderName, parentId: parentFolderId }));
+      yield call(
+        showSuccessMessage,
+        `Folder ${newFolderName} successfully saved to Google Drive.`,
+        1000
+      );
     }
   );
 
@@ -656,6 +690,21 @@ export function* persistenceSaga(): SagaIterator {
     function* ({ payload }: ReturnType<typeof actions.persistenceDeleteFile>) {
       const filePath = payload;
       yield call(console.log, "delete file ", filePath);
+
+      // look for file
+      const persistenceFileArray: PersistenceFile[] = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
+      const persistenceFile = persistenceFileArray.find(e => e.path === filePath);
+      if (!persistenceFile) {
+        yield call(console.log, "cannot find pers file for ", filePath);
+        return;
+      }
+      yield call(deleteFileOrFolder, persistenceFile.id); // assume this succeeds all the time
+      yield put(actions.deletePersistenceFile(persistenceFile));
+      yield call(
+        showSuccessMessage,
+        `${persistenceFile.name} successfully deleted from Google Drive.`,
+        1000
+      );
     }
   );
 
@@ -664,13 +713,55 @@ export function* persistenceSaga(): SagaIterator {
     function* ({ payload }: ReturnType<typeof actions.persistenceDeleteFolder>) {
       const folderPath = payload;
       yield call(console.log, "delete folder ", folderPath);
+
+      // identical to delete file
+      const persistenceFileArray: PersistenceFile[] = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
+      const persistenceFile = persistenceFileArray.find(e => e.path === folderPath);
+      if (!persistenceFile) {
+        yield call(console.log, "cannot find pers file for ", folderPath);
+        return;
+      }
+      yield call(deleteFileOrFolder, persistenceFile.id); // assume this succeeds all the time
+      yield put(actions.deletePersistenceFile(persistenceFile));
+      yield call(
+        showSuccessMessage,
+        `Folder ${persistenceFile.name} successfully deleted from Google Drive.`,
+        1000
+      );
     }
   )
 
   yield takeEvery(
     PERSISTENCE_RENAME_FILE,
     function* ({ payload : {oldFilePath, newFilePath} }: ReturnType<typeof actions.persistenceRenameFile>) {
       yield call(console.log, "rename file ", oldFilePath, " to ", newFilePath);
+
+      // look for file
+      const persistenceFileArray: PersistenceFile[] = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
+      const persistenceFile = persistenceFileArray.find(e => e.path === oldFilePath);
+      if (!persistenceFile) {
+        yield call(console.log, "cannot find pers file for ", oldFilePath);
+        return;
+      }
+
+      // new name
+      const regexResult = /^(.*[\\\/])?(\.*.*?)(\.[^.]+?|)$/.exec(newFilePath);
+      if (!regexResult) {
+        yield call(console.log, "regex fail ", newFilePath);
+        return;
+      }
+      const newFileName = regexResult[2] + regexResult[3];
+
+      // call gapi 
+      yield call(renameFileOrFolder, persistenceFile.id, newFileName);
+
+      // handle pers file
+      yield put(actions.updatePersistenceFilePathAndNameByPath(oldFilePath, newFilePath, newFileName));
+      yield call(
+        showSuccessMessage,
+        `${newFileName} successfully renamed in Google Drive.`,
+        1000
+      );
     }
   );
 
@@ -912,6 +1003,24 @@ async function getFileFromFolder( // returns string id or empty string if failed
 }
 */
 
+function deleteFileOrFolder(
+  id: string
+): Promise<any> {
+  return gapi.client.drive.files.delete({
+    fileId: id
+  });
+}
+
+function renameFileOrFolder(
+  id: string,
+  newName: string,
+): Promise<any> {
+  return gapi.client.drive.files.update({
+    fileId: id,
+    resource: { name: newName }
+  });
+}
+
 async function getContainingFolderIdRecursively( // TODO memoize?
   parentFolders: string[],
   topFolderId: string,