in the process of unifying github behaviour with gdrive behaviour

Author: linedoestrolling

src/commons/controlBar/github/ControlBarGitHubButtons.tsx

@@ -5,16 +5,14 @@ import React from 'react';
 import { useResponsive } from 'src/commons/utils/Hooks';
 import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
-import { GitHubSaveInfo } from '../../../features/github/GitHubTypes';
 import ControlButton from '../../ControlButton';
 
 type Props = {
   isFolderModeEnabled: boolean;
   workspaceLocation: string;
   currPersistenceFile?: PersistenceFile;
   loggedInAs?: Octokit;
-  githubSaveInfo: GitHubSaveInfo;
-  isDirty: boolean;
+  isDirty?: boolean;
   isGDriveSynced: boolean;
   onClickOpen?: () => void;
   onClickSave?: () => void;
@@ -33,7 +31,7 @@ type Props = {
 export const ControlBarGitHubButtons: React.FC<Props> = props => {
   const { isMobileBreakpoint } = useResponsive();
 
-  const filePath = props.githubSaveInfo.filePath || '';
+  const filePath = props.currPersistenceFile ? props.currPersistenceFile.path : '';
 
   const isNotPlayground = props.workspaceLocation !== "playground";
 

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

src/commons/fileSystemView/FileSystemViewFileName.tsx

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

src/commons/fileSystemView/FileSystemViewFileNode.tsx

@@ -15,7 +15,6 @@ 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;
@@ -108,12 +107,8 @@ const FileSystemViewFileNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-        if (isGDriveSyncing()) {
-          dispatch(persistenceDeleteFile(fullPath));
-        }
-        if (isGithubSyncing()) {
-          dispatch(githubDeleteFile(fullPath));
-        }
+        dispatch(persistenceDeleteFile(fullPath));
+        dispatch(githubDeleteFile(fullPath));
         dispatch(removeEditorTabForFile(workspaceLocation, fullPath));
         refreshDirectory();
       });

src/commons/sagas/GitHubPersistenceSaga.ts

@@ -24,6 +24,7 @@ import { OverallState } from '../application/ApplicationTypes';
 import { LOGIN_GITHUB, LOGOUT_GITHUB } from '../application/types/SessionTypes';
 import {
   getPersistenceFile,
+  isGithubSyncing,
   retrieveFilesInWorkspaceAsRecord
 } from '../fileSystem/FileSystemUtils';
 import FileExplorerDialog, { FileExplorerDialogProps } from '../gitHubOverlay/FileExplorerDialog';
@@ -400,6 +401,9 @@ function* githubSaveAll(): any {
 
 function* githubCreateFile({ payload }: ReturnType<typeof actions.githubCreateFile>): any {
   let toastKey: string | undefined;
+  if (!isGithubSyncing()) {
+    return;
+  }
   try {
     store.dispatch(actions.disableFileSystemContextMenus());
     toastKey = yield call(showMessage, {
@@ -478,6 +482,9 @@ function* githubCreateFile({ payload }: ReturnType<typeof actions.githubCreateFi
 
 function* githubDeleteFile({ payload }: ReturnType<typeof actions.githubDeleteFile>): any {
   let toastKey: string | undefined;
+  if (!isGithubSyncing()) {
+    return;
+  }
   try {
     store.dispatch(actions.disableFileSystemContextMenus());
     toastKey = yield call(showMessage, {
@@ -541,6 +548,9 @@ function* githubDeleteFile({ payload }: ReturnType<typeof actions.githubDeleteFi
 
 function* githubDeleteFolder({ payload }: ReturnType<typeof actions.githubDeleteFolder>): any {
   let toastKey: string | undefined;
+  if (!isGithubSyncing()) {
+    return;
+  }
   try {
     store.dispatch(actions.disableFileSystemContextMenus());
     toastKey = yield call(showMessage, {
@@ -604,6 +614,9 @@ function* githubDeleteFolder({ payload }: ReturnType<typeof actions.githubDelete
 
 function* githubRenameFile({ payload }: ReturnType<typeof actions.githubRenameFile>): any {
   let toastKey: string | undefined;
+  if (!isGithubSyncing()) {
+    return;
+  }
   try {
     store.dispatch(actions.disableFileSystemContextMenus());
     toastKey = yield call(showMessage, {
@@ -669,6 +682,9 @@ function* githubRenameFile({ payload }: ReturnType<typeof actions.githubRenameFi
 
 function* githubRenameFolder({ payload }: ReturnType<typeof actions.githubRenameFile>): any {
   let toastKey: string | undefined;
+  if (!isGithubSyncing()) {
+    return;
+  }
   try {
     store.dispatch(actions.disableFileSystemContextMenus());
     toastKey = yield call(showMessage, {