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

Author: linedoestrolling

src/commons/application/ApplicationTypes.ts

@@ -362,7 +362,7 @@ export const defaultEditorValue = '// Type your program in here!';
  *
  * @param workspaceLocation the location of the workspace, used for context
  */
-export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): WorkspaceState => ({ // TODO remove default js
+export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): WorkspaceState => ({
   autogradingResults: [],
   context: createContext<WorkspaceLocation>(
     Constants.defaultSourceChapter,

src/commons/application/actions/SessionActions.ts

@@ -208,8 +208,10 @@ export const setAdminPanelCourseRegistrations = createAction(
 
 export const setGoogleUser = createAction(SET_GOOGLE_USER, (user?: string) => ({ payload: user }));
 
-export const setGoogleAccessToken = 
-  createAction(SET_GOOGLE_ACCESS_TOKEN, (accessToken?: string) => ({ payload: accessToken}));
+export const setGoogleAccessToken = createAction(
+  SET_GOOGLE_ACCESS_TOKEN,
+  (accessToken?: string) => ({ payload: accessToken })
+);
 
 export const setGitHubOctokitObject = createAction(
   SET_GITHUB_OCTOKIT_OBJECT,
@@ -226,7 +228,8 @@ export const removeGitHubOctokitObjectAndAccessToken = createAction(
 );
 
 export const removeGoogleUserAndAccessToken = createAction(
-  REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN, () => ({ payload: {} })
+  REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN,
+  () => ({ payload: {} })
 );
 
 export const submitAnswer = createAction(

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -423,7 +423,14 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     const resetWorkspaceOptions = assertType<WorkspaceState>()({
       autogradingResults: options.autogradingResults ?? [],
       // TODO: Hardcoded to make use of the first editor tab. Rewrite after editor tabs are added.
-      editorTabs: [{ value: options.editorValue ?? '', highlightedLines: [], breakpoints: [], githubSaveInfo: {repoName: '', filePath: ''} }],
+      editorTabs: [
+        {
+          value: options.editorValue ?? '',
+          highlightedLines: [],
+          breakpoints: [],
+          githubSaveInfo: { repoName: '', filePath: '' }
+        }
+      ],
       programPrependValue: options.programPrependValue ?? '',
       programPostpendValue: options.programPostpendValue ?? '',
       editorTestcases: options.editorTestcases ?? []

src/commons/controlBar/ControlBarToggleFolderModeButton.tsx

@@ -32,7 +32,7 @@ export const ControlBarToggleFolderModeButton: React.FC<Props> = ({
           iconColor: isFolderModeEnabled ? Colors.BLUE4 : undefined
         }}
         onClick={toggleFolderMode}
-        isDisabled ={false}
+        isDisabled={false}
         //isDisabled={isSessionActive || isPersistenceActive}
       />
     </Tooltip2>

src/commons/controlBar/github/ControlBarGitHubButtons.tsx

@@ -4,10 +4,10 @@ import { Popover2, Tooltip2 } from '@blueprintjs/popover2';
 import { Octokit } from '@octokit/rest';
 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';
-import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
 type Props = {
   isFolderModeEnabled: boolean;
@@ -39,7 +39,8 @@ export const ControlBarGitHubButtons: React.FC<Props> = props => {
   const hasFilePath = filePath !== '';
   const hasOpenFile = isLoggedIn && hasFilePath;
 
-  const mainButtonDisplayText = (props.currPersistenceFile && props.currPersistenceFile.name) || 'GitHub';
+  const mainButtonDisplayText =
+    (props.currPersistenceFile && hasOpenFile && props.currPersistenceFile.name) || 'GitHub';
   let mainButtonIntent: Intent = Intent.NONE;
   if (hasOpenFile) {
     mainButtonIntent = props.isDirty ? Intent.WARNING : Intent.PRIMARY;

src/commons/fileSystem/FileSystemActions.ts

@@ -2,18 +2,20 @@ import { createAction } from '@reduxjs/toolkit';
 import { FSModule } from 'browserfs/dist/node/core/FS';
 import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
-import { 
+import {
   ADD_GITHUB_SAVE_INFO,
   ADD_PERSISTENCE_FILE,
   DELETE_ALL_GITHUB_SAVE_INFO,
-  DELETE_ALL_PERSISTENCE_FILES,  DELETE_GITHUB_SAVE_INFO,
-  DELETE_PERSISTENCE_FILE, 
+  DELETE_ALL_PERSISTENCE_FILES,
+  DELETE_GITHUB_SAVE_INFO,
+  DELETE_PERSISTENCE_FILE,
   SET_IN_BROWSER_FILE_SYSTEM,
-  SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH, 
-  UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH,
+  SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH,
   UPDATE_LAST_EDITED_FILE_PATH,
-  UPDATE_REFRESH_FILE_VIEW_KEY, 
-  UPDATE_PERSISTENCE_FOLDER_PATH_AND_NAME_BY_PATH} from './FileSystemTypes';
+  UPDATE_PERSISTENCE_FILE_PATH_AND_NAME_BY_PATH,
+  UPDATE_PERSISTENCE_FOLDER_PATH_AND_NAME_BY_PATH,
+  UPDATE_REFRESH_FILE_VIEW_KEY
+} from './FileSystemTypes';
 
 export const setInBrowserFileSystem = createAction(
   SET_IN_BROWSER_FILE_SYSTEM,
@@ -22,55 +24,56 @@ export const setInBrowserFileSystem = createAction(
 
 export const addGithubSaveInfo = createAction(
   ADD_GITHUB_SAVE_INFO,
-  (persistenceFile: PersistenceFile) => ({ payload: { persistenceFile }})
+  (persistenceFile: PersistenceFile) => ({ payload: { persistenceFile } })
 );
 
 export const deleteGithubSaveInfo = createAction(
   DELETE_GITHUB_SAVE_INFO,
-  (persistenceFile : PersistenceFile) => ({ payload: persistenceFile })
+  (persistenceFile: PersistenceFile) => ({ payload: persistenceFile })
 );
 
-export const deleteAllGithubSaveInfo = createAction(
-  DELETE_ALL_GITHUB_SAVE_INFO,
-  () => ({ payload: {} })
-);
+export const deleteAllGithubSaveInfo = createAction(DELETE_ALL_GITHUB_SAVE_INFO, () => ({
+  payload: {}
+}));
 
 export const addPersistenceFile = createAction(
   ADD_PERSISTENCE_FILE,
-  ( persistenceFile: PersistenceFile ) => ({ payload: persistenceFile })
+  (persistenceFile: PersistenceFile) => ({ payload: persistenceFile })
 );
 
 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}})
+  (oldPath: string, newPath: string, newFileName: string) => ({
+    payload: { oldPath, newPath, newFileName }
+  })
 );
 
 export const updatePersistenceFolderPathAndNameByPath = createAction(
   UPDATE_PERSISTENCE_FOLDER_PATH_AND_NAME_BY_PATH,
-  (oldPath: string, newPath: string, oldFolderName: string, newFolderName: string) => ({ payload: {oldPath, newPath, oldFolderName, newFolderName}})
+  (oldPath: string, newPath: string, oldFolderName: string, newFolderName: string) => ({
+    payload: { oldPath, newPath, oldFolderName, newFolderName }
+  })
 );
 
-export const deleteAllPersistenceFiles = createAction(
-  DELETE_ALL_PERSISTENCE_FILES,
-  () => ({ payload: {} })
-);
+export const deleteAllPersistenceFiles = createAction(DELETE_ALL_PERSISTENCE_FILES, () => ({
+  payload: {}
+}));
 
 export const setPersistenceFileLastEditByPath = createAction(
   SET_PERSISTENCE_FILE_LAST_EDIT_BY_PATH,
-  (path: string, date: Date) => ({ payload: {path, date} })
+  (path: string, date: Date) => ({ payload: { path, date } })
 );
 
 export const updateLastEditedFilePath = createAction(
   UPDATE_LAST_EDITED_FILE_PATH,
-  ( lastEditedFilePath: string) => ({ payload: {lastEditedFilePath} })
+  (lastEditedFilePath: string) => ({ payload: { lastEditedFilePath } })
 );
 
-export const updateRefreshFileViewKey = createAction(
-  UPDATE_REFRESH_FILE_VIEW_KEY,
-  () => ({ payload: {} })
-);
+export const updateRefreshFileViewKey = createAction(UPDATE_REFRESH_FILE_VIEW_KEY, () => ({
+  payload: {}
+}));