Revert rename of persistenceObject to persistenceFile, add dispatches in fileSystemView related files

Author: sumomomomomo

src/commons/application/ApplicationTypes.ts

@@ -550,7 +550,8 @@ export const createDefaultStoriesEnv = (
 
 export const defaultFileSystem: FileSystemState = {
   inBrowserFileSystem: null,
-  githubSaveInfoArray: []
+  githubSaveInfoArray: [],
+  persistenceFileArray: []
 };
 
 export const defaultSideContent: SideContentState = {

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -3,7 +3,7 @@ import { IconNames } from '@blueprintjs/icons';
 import { Popover2, Tooltip2 } from '@blueprintjs/popover2';
 import React from 'react';
 
-import { PersistenceObject, PersistenceState } from '../../features/persistence/PersistenceTypes';
+import { PersistenceFile, PersistenceState } from '../../features/persistence/PersistenceTypes';
 import ControlButton from '../ControlButton';
 import { useResponsive } from '../utils/Hooks';
 
@@ -17,7 +17,7 @@ type Props = {
   isFolderModeEnabled: boolean;
   loggedInAs?: string;
   accessToken?: string;
-  currentObject?: PersistenceObject;
+  currentObject?: PersistenceFile;
   isDirty?: boolean;
   onClickOpen?: () => any;
   onClickSave?: () => any;

src/commons/fileSystem/FileSystemActions.ts

@@ -7,7 +7,11 @@ import {
   DELETE_ALL_GITHUB_SAVE_INFO,
   DELETE_GITHUB_SAVE_INFO,
   SET_IN_BROWSER_FILE_SYSTEM,
-  UPDATE_GITHUB_SAVE_INFO } from './FileSystemTypes';
+  UPDATE_GITHUB_SAVE_INFO,
+  ADD_PERSISTENCE_FILE,
+  DELETE_PERSISTENCE_FILE, 
+  DELETE_ALL_PERSISTENCE_FILES } from './FileSystemTypes';
+import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
 export const setInBrowserFileSystem = createAction(
   SET_IN_BROWSER_FILE_SYSTEM,
@@ -33,4 +37,19 @@ export const updateGithubSaveInfo = createAction(
   (repoName: string,
     filePath: string,
     lastSaved: Date) => ({ payload: {repoName, filePath, lastSaved} })
-)
+);
+
+export const addPersistenceFile = createAction(
+  ADD_PERSISTENCE_FILE,
+  ( persistenceFile: PersistenceFile ) => ({ payload: persistenceFile })
+);
+
+export const deletePersistenceFile = createAction(
+  DELETE_PERSISTENCE_FILE,
+  (persistenceFile: PersistenceFile) => ({ payload: persistenceFile })
+);
+
+export const deleteAllPersistenceFiles = createAction(
+  DELETE_ALL_PERSISTENCE_FILES,
+  () => ({ payload: {} })
+);

src/commons/fileSystem/FileSystemReducer.ts

@@ -7,7 +7,10 @@ import {
   setInBrowserFileSystem,
   addGithubSaveInfo,
   deleteAllGithubSaveInfo,
-  deleteGithubSaveInfo } from './FileSystemActions';
+  deleteGithubSaveInfo,
+  addPersistenceFile,
+  deletePersistenceFile,
+  deleteAllPersistenceFiles } from './FileSystemActions';
 import { FileSystemState } from './FileSystemTypes';
 
 export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = createReducer(
@@ -36,6 +39,24 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
     })
     .addCase(deleteAllGithubSaveInfo, (state, action) => {
       state.githubSaveInfoArray = [];
-    });
+    })
+    .addCase(addPersistenceFile, (state, action) => {
+      const persistenceFilePayload = action.payload.persistenceFile;
+      const persistenceFileArray = state['persistenceFileArray'];
+      const persistenceFileIndex = persistenceFileArray.findIndex(e => e.id === persistenceFilePayload.id);
+      if (persistenceFileIndex === -1) {
+        persistenceFileArray[persistenceFileArray.length] = persistenceFilePayload;
+      } else {
+        persistenceFileArray[persistenceFileIndex] = persistenceFilePayload;
+      }
+      state.persistenceFileArray = persistenceFileArray;
+    })
+    .addCase(deletePersistenceFile, (state, action) => {
+      const newPersistenceFileArray = state['persistenceFileArray'].filter(e => e.id !== action.payload.persistenceFile.id);
+      state.persistenceFileArray = newPersistenceFileArray;
+    })
+    .addCase(deleteAllPersistenceFiles, (state, action) => {
+      state.persistenceFileArray = [];
+    })
   }
 );

src/commons/fileSystem/FileSystemTypes.ts

@@ -1,13 +1,18 @@
 import { FSModule } from 'browserfs/dist/node/core/FS';
 import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
+import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
 export const SET_IN_BROWSER_FILE_SYSTEM = 'SET_IN_BROWSER_FILE_SYSTEM';
 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_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 type FileSystemState = {
   inBrowserFileSystem: FSModule | null;
   githubSaveInfoArray: GitHubSaveInfo[];
+  persistenceFileArray: PersistenceFile[];
 };

src/commons/fileSystemView/FileSystemViewDirectoryNode.tsx

@@ -15,6 +15,7 @@ import FileSystemViewFileName from './FileSystemViewFileName';
 import FileSystemViewIndentationPadding from './FileSystemViewIndentationPadding';
 import FileSystemViewList from './FileSystemViewList';
 import FileSystemViewPlaceholderNode from './FileSystemViewPlaceholderNode';
+import { persistenceCreateFile, persistenceCreateFolder, persistenceDeleteFolder } from 'src/features/persistence/PersistenceActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -77,7 +78,7 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
       if (!shouldProceed) {
         return;
       }
-
+      dispatch(persistenceDeleteFolder(fullPath));
       dispatch(removeEditorTabsForDirectory(workspaceLocation, fullPath));
       rmdirRecursively(fileSystem, fullPath).then(refreshParentDirectory);
     });
@@ -110,7 +111,7 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-
+        dispatch(persistenceCreateFile(newFilePath));
         forceRefreshFileSystemViewList();
       });
     });
@@ -139,6 +140,7 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
           console.error(err);
         }
 
+        dispatch(persistenceCreateFolder(newDirectoryPath));
         forceRefreshFileSystemViewList();
       });
     });

src/commons/fileSystemView/FileSystemViewFileName.tsx

@@ -10,6 +10,7 @@ import {
   renameEditorTabsForDirectory
 } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
+import { persistenceRenameFile, persistenceRenameFolder } from 'src/features/persistence/PersistenceActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -69,8 +70,10 @@ const FileSystemViewFileName: React.FC<Props> = ({
           }
 
           if (isDirectory) {
+            dispatch(persistenceRenameFolder({oldFolderPath: oldPath, newFolderPath: newPath}));
             dispatch(renameEditorTabsForDirectory(workspaceLocation, oldPath, newPath));
           } else {
+            dispatch(persistenceRenameFile({oldFilePath: oldPath, newFilePath: newPath}));
             dispatch(renameEditorTabForFile(workspaceLocation, oldPath, newPath));
           }
           refreshDirectory();

src/commons/fileSystemView/FileSystemViewFileNode.tsx

@@ -14,6 +14,7 @@ import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 import FileSystemViewContextMenu from './FileSystemViewContextMenu';
 import FileSystemViewFileName from './FileSystemViewFileName';
 import FileSystemViewIndentationPadding from './FileSystemViewIndentationPadding';
+import { persistenceDeleteFile } from 'src/features/persistence/PersistenceActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -88,7 +89,7 @@ const FileSystemViewFileNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-
+        dispatch(persistenceDeleteFile(fullPath));
         dispatch(removeEditorTabForFile(workspaceLocation, fullPath));
         refreshDirectory();
       });