Revert "Merge branch 'folders-public-wip' of github.com:source-academy/frontend into folders-public-wip"

This reverts commit f45e429, reversing
changes made to 9ce24c8.

Author: linedoestrolling

src/commons/controlBar/github/ControlBarGitHubButtons.tsx

@@ -5,14 +5,16 @@ 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;
-  isDirty?: boolean;
+  githubSaveInfo: GitHubSaveInfo;
+  isDirty: boolean;
   isGDriveSynced: boolean;
   onClickOpen?: () => void;
   onClickSave?: () => void;
@@ -31,10 +33,9 @@ type Props = {
 export const ControlBarGitHubButtons: React.FC<Props> = props => {
   const { isMobileBreakpoint } = useResponsive();
 
-  const filePath = props.currPersistenceFile ? props.currPersistenceFile.path : '';
-  console.log(filePath);
+  const filePath = props.githubSaveInfo.filePath || '';
 
-  const isNotPlayground = props.workspaceLocation !== 'playground';
+  const isNotPlayground = props.workspaceLocation !== "playground";
 
   const isLoggedIn = props.loggedInAs !== undefined;
   const shouldDisableButtons = !isLoggedIn;

src/commons/fileSystem/FileSystemReducer.ts

@@ -134,8 +134,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
           state.persistenceFileArray = newPersistenceFileArray;
         }
       })
-      .addCase(deletePersistenceFolderAndChildren, (state, action) => {
-        // check if github is syncing?
+      .addCase(deletePersistenceFolderAndChildren, (state, action) => { // check if github is syncing?
         const newPersistenceFileArray = state['persistenceFileArray'].filter(
           e => e.id !== action.payload.id
         );
@@ -152,6 +151,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
           .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
             }
@@ -192,12 +192,15 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
         // /fold1/fold2/ becomes ["fold1", "fold2"]
         // If in top level folder, becomes [""]
 
+        console.log(regexResult, currFolderSplit, 'a1');
+
         // update all files that are its children
         state.persistenceFileArray = filesState
           .filter(e => e.path)
           .map(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 e; // not a child of folder
             }
@@ -208,6 +211,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
             currParentFolders[currFolderLevel] = action.payload.newFolderName;
             currParentFolders[0] = '/' + currParentFolders[0];
             const newPath = currParentFolders.join('/');
+            console.log('from', e.path, 'to', newPath);
             return { ...e, path: newPath };
           });
       })

src/commons/fileSystem/FileSystemUtils.ts

@@ -312,7 +312,7 @@ export const isGDriveSyncing = () => {
   }
 
   return true;
-};
+}
 
 export const isGithubSyncing = () => {
   const persistenceFileArray = store.getState().fileSystem.persistenceFileArray;
@@ -326,4 +326,4 @@ export const isGithubSyncing = () => {
   }
 
   return true;
-};
+}

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 { rmdirRecursively } from '../fileSystem/FileSystemUtils';
+import { isGDriveSyncing, isGithubSyncing, rmdirRecursively } from '../fileSystem/FileSystemUtils';
 import { showSimpleConfirmDialog, showSimpleErrorDialog } from '../utils/DialogHelper';
 import { removeEditorTabsForDirectory } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
@@ -90,8 +90,12 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
       if (!shouldProceed) {
         return;
       }
-      dispatch(persistenceDeleteFolder(fullPath));
-      dispatch(githubDeleteFolder(fullPath));
+      if (isGDriveSyncing()) {
+        dispatch(persistenceDeleteFolder(fullPath));
+      }
+      if (isGithubSyncing()) {
+        dispatch(githubDeleteFolder(fullPath));
+      }
       dispatch(removeEditorTabsForDirectory(workspaceLocation, fullPath));
       rmdirRecursively(fileSystem, fullPath).then(refreshParentDirectory);
     });
@@ -124,8 +128,12 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-        dispatch(persistenceCreateFile(newFilePath));
-        dispatch(githubCreateFile(newFilePath));
+        if (isGDriveSyncing()) {
+          dispatch(persistenceCreateFile(newFilePath));
+        }
+        if (isGithubSyncing()) {
+          dispatch(githubCreateFile(newFilePath));
+        }
         forceRefreshFileSystemViewList();
       });
     });
@@ -155,6 +163,24 @@ const FileSystemViewDirectoryNode: React.FC<Props> = ({
         }
 
         dispatch(persistenceCreateFolder(newDirectoryPath));
+        // function informUserGithubCannotCreateFolder() {
+        //   return showSimpleConfirmDialog({
+        //     contents: (
+        //       <div>
+        //         <p>
+        //           Warning: Github is unable to create empty directories. When you create your first
+        //           file in this folder, Github will automatically sync this folder and the first
+        //           file.
+        //         </p>
+        //         <p>Please click 'Confirm' to continue.</p>
+        //       </div>
+        //     ),
+        //     positiveIntent: 'primary',
+        //     positiveLabel: 'Confirm'
+        //   });
+        // }
+        // informUserGithubCannotCreateFolder();
+        // dispatch(enableFileSystemContextMenus());
         forceRefreshFileSystemViewList();
       });
     });

src/commons/fileSystemView/FileSystemViewFileName.tsx

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

src/commons/fileSystemView/FileSystemViewFileNode.tsx

@@ -15,6 +15,7 @@ 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;
@@ -60,6 +61,7 @@ const FileSystemViewFileNode: React.FC<Props> = ({
 
   const [isEditing, setIsEditing] = React.useState(false);
   const dispatch = useDispatch();
+  // const store = useStore<OverallState>();
 
   const fullPath = path.join(basePath, fileName);
 
@@ -72,6 +74,12 @@ const FileSystemViewFileNode: React.FC<Props> = ({
         throw new Error('File contents are undefined.');
       }
       dispatch(addEditorTab(workspaceLocation, fullPath, fileContents));
+      // const idx = store.getState().workspaces['playground'].activeEditorTabIndex || 0;
+      // const repoName = store.getState().playground.repoName || '';
+      // const editorFilePath = store.getState().workspaces['playground'].editorTabs[idx].filePath || '';
+      // console.log(repoName);
+      // console.log(editorFilePath);
+      // console.log(store.getState().workspaces['playground'].editorTabs);
     });
   };
 
@@ -100,8 +108,12 @@ const FileSystemViewFileNode: React.FC<Props> = ({
         if (err) {
           console.error(err);
         }
-        dispatch(persistenceDeleteFile(fullPath));
-        dispatch(githubDeleteFile(fullPath));
+        if (isGDriveSyncing()) {
+          dispatch(persistenceDeleteFile(fullPath));
+        }
+        if (isGithubSyncing()) {
+          dispatch(githubDeleteFile(fullPath));
+        }
         dispatch(removeEditorTabForFile(workspaceLocation, fullPath));
         refreshDirectory();
       });