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

Author: linedoestrolling

src/commons/application/ApplicationTypes.ts

@@ -401,10 +401,11 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
 });
 
 const defaultFileName = 'program.js';
+const defaultTopLevelFolderName = 'proj';
 export const getDefaultFilePath = (workspaceLocation: WorkspaceLocation) =>
-  `${WORKSPACE_BASE_PATHS[workspaceLocation]}/${defaultFileName}`;
+  `${WORKSPACE_BASE_PATHS[workspaceLocation]}/${defaultTopLevelFolderName}/${defaultFileName}`;
 
-export const defaultWorkspaceManager: WorkspaceManagerState = { // TODO default
+export const defaultWorkspaceManager: WorkspaceManagerState = {
   assessment: {
     ...createDefaultWorkspace('assessment'),
     currentAssessment: undefined,

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -74,7 +74,7 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
       icon={IconNames.DOUBLE_CHEVRON_UP}
       onClick={props.onClickSaveAll}
       // disable if persistenceObject is not a folder
-      isDisabled={props.currentObject ? props.currentObject.isFolder ? false : true : true}
+      isDisabled={props.accessToken ? false : true}
     />
   );
 

src/commons/fileSystem/FileSystemReducer.ts

@@ -104,12 +104,6 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
     })
     .addCase(updatePersistenceFolderPathAndNameByPath, (state, action) => {
       const filesState = state['persistenceFileArray'];
-      //const persistenceFileFindIndex = filesState.findIndex(e => e.path === action.payload.oldPath);
-      console.log(action.payload);
-      filesState.forEach(e => console.log(e.path));
-      // if (persistenceFileFindIndex === -1) {
-      //   return;
-      // }
       // get current level of folder
       const regexResult = /^(.*[\\\/])?(\.*.*?)(\.[^.]+?|)$/.exec(action.payload.newPath)!;
 

src/commons/sagas/GitHubPersistenceSaga.ts

@@ -293,7 +293,7 @@ function* githubSaveAll(): any {
 }
 
 function* githubCreateFile({ payload }: ReturnType<typeof actions.githubCreateFile>): any {
-  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+  //yield call(store.dispatch, actions.disableFileSystemContextMenus());
 
   const filePath = payload;
 
@@ -338,7 +338,7 @@ function* githubCreateFile({ payload }: ReturnType<typeof actions.githubCreateFi
 }
 
 function* githubDeleteFile({ payload }: ReturnType<typeof actions.githubDeleteFile>): any {
-  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+  //yield call(store.dispatch, actions.disableFileSystemContextMenus());
 
   const filePath = payload;
 
@@ -377,7 +377,7 @@ function* githubDeleteFile({ payload }: ReturnType<typeof actions.githubDeleteFi
 }
 
 function* githubDeleteFolder({ payload }: ReturnType<typeof actions.githubDeleteFolder>): any {
-  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+  //yield call(store.dispatch, actions.disableFileSystemContextMenus());
 
   const filePath = payload;
 
@@ -415,7 +415,7 @@ function* githubDeleteFolder({ payload }: ReturnType<typeof actions.githubDelete
 }
 
 function* githubRenameFile({ payload }: ReturnType<typeof actions.githubRenameFile>): any {
-  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+  //yield call(store.dispatch, actions.disableFileSystemContextMenus());
 
   const newFilePath = payload.newFilePath;
   const oldFilePath = payload.oldFilePath;
@@ -456,7 +456,7 @@ function* githubRenameFile({ payload }: ReturnType<typeof actions.githubRenameFi
 }
 
 function* githubRenameFolder({ payload }: ReturnType<typeof actions.githubRenameFile>): any {
-  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+  //yield call(store.dispatch, actions.disableFileSystemContextMenus());
 
   const newFilePath = payload.newFilePath;
   const oldFilePath = payload.oldFilePath;