Initial fix after rebasing

Author: sumomomomomo

src/commons/application/ApplicationTypes.ts

@@ -366,8 +366,7 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
         : undefined,
       value: ['playground', 'sourcecast'].includes(workspaceLocation) ? defaultEditorValue : '',
       highlightedLines: [],
-      breakpoints: [],
-      githubSaveInfo: { repoName:'', filePath:''}
+      breakpoints: []
     }
   ],
   programPrependValue: '',
@@ -435,8 +434,7 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
         filePath: getDefaultFilePath('playground'),
         value: defaultEditorValue,
         highlightedLines: [],
-        breakpoints: [],
-        githubSaveInfo: {repoName:'', filePath:''}
+        breakpoints: []
       }
     ]
   },
@@ -490,8 +488,7 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
         filePath: getDefaultFilePath('sicp'),
         value: defaultEditorValue,
         highlightedLines: [],
-        breakpoints: [],
-        githubSaveInfo: {repoName:'', filePath:''}
+        breakpoints: []
       }
     ]
   },

src/commons/editingWorkspace/EditingWorkspace.tsx

@@ -321,8 +321,7 @@ const EditingWorkspace: React.FC<EditingWorkspaceProps> = props => {
         {
           value: editorValue,
           highlightedLines: [],
-          breakpoints: [],
-          githubSaveInfo: {repoName: '', filePath: ''}
+          breakpoints: []
         }
       ],
       programPrependValue,

src/commons/fileSystem/FileSystemReducer.ts

@@ -41,7 +41,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
       state.githubSaveInfoArray = [];
     })
     .addCase(addPersistenceFile, (state, action) => {
-      const persistenceFilePayload = action.payload.persistenceFile;
+      const persistenceFilePayload = action.payload;
       const persistenceFileArray = state['persistenceFileArray'];
       const persistenceFileIndex = persistenceFileArray.findIndex(e => e.id === persistenceFilePayload.id);
       if (persistenceFileIndex === -1) {
@@ -52,7 +52,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
       state.persistenceFileArray = persistenceFileArray;
     })
     .addCase(deletePersistenceFile, (state, action) => {
-      const newPersistenceFileArray = state['persistenceFileArray'].filter(e => e.id !== action.payload.persistenceFile.id);
+      const newPersistenceFileArray = state['persistenceFileArray'].filter(e => e.id !== action.payload.id);
       state.persistenceFileArray = newPersistenceFileArray;
     })
     .addCase(deleteAllPersistenceFiles, (state, action) => {

src/commons/fileSystemView/FileSystemViewFileNode.tsx

@@ -7,7 +7,6 @@ import { useDispatch, useStore } from 'react-redux';
 import classes from 'src/styles/FileSystemView.module.scss';
 
 import { OverallState } from '../application/ApplicationTypes';
-import { actions } from '../utils/ActionsHelper';
 import { showSimpleConfirmDialog } from '../utils/DialogHelper';
 import { addEditorTab, removeEditorTabForFile } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
@@ -53,13 +52,6 @@ const FileSystemViewFileNode: React.FC<Props> = ({
       const editorFilePath = store.getState().workspaces['playground'].editorTabs[idx].filePath || '';
       console.log(repoName);
       console.log(editorFilePath);
-      store.dispatch(actions.updateEditorGithubSaveInfo(
-        'playground',
-        idx,
-        repoName,
-        editorFilePath,
-        new Date()
-      ));
       console.log(store.getState().workspaces['playground'].editorTabs);
     });
   };

src/commons/sagas/WorkspaceSaga/helpers/evalEditor.ts

@@ -5,7 +5,7 @@ import { EventType } from '../../../../features/achievement/AchievementTypes';
 import { DeviceSession } from '../../../../features/remoteExecution/RemoteExecutionTypes';
 import { WORKSPACE_BASE_PATHS } from '../../../../pages/fileSystem/createInBrowserFileSystem';
 import { OverallState } from '../../../application/ApplicationTypes';
-import { retrieveFilesInWorkspaceAsRecord } from '../../../fileSystem/utils';
+import { retrieveFilesInWorkspaceAsRecord } from '../../../fileSystem/FileSystemUtils';
 import { actions } from '../../../utils/ActionsHelper';
 import { makeElevatedContext } from '../../../utils/JsSlangHelper';
 import {

src/commons/sagas/WorkspaceSaga/index.ts

@@ -24,7 +24,7 @@ import {
 } from '../../application/types/InterpreterTypes';
 import { Library, Testcase } from '../../assessment/AssessmentTypes';
 import { Documentation } from '../../documentation/Documentation';
-import { writeFileRecursively } from '../../fileSystem/utils';
+import { writeFileRecursively } from '../../fileSystem/FileSystemUtils';
 import { resetSideContent } from '../../sideContent/SideContentActions';
 import { actions } from '../../utils/ActionsHelper';
 import {

src/commons/workspace/WorkspaceActions.ts

@@ -63,7 +63,6 @@ import {
   UPDATE_CURRENT_SUBMISSION_ID,
   UPDATE_CURRENTSTEP,
   UPDATE_EDITOR_BREAKPOINTS,
-  UPDATE_EDITOR_GITHUB_SAVE_INFO,
   UPDATE_EDITOR_VALUE,
   UPDATE_HAS_UNSAVED_CHANGES,
   UPDATE_LAST_DEBUGGER_RESULT,

src/commons/workspace/WorkspaceReducer.ts

@@ -82,7 +82,6 @@ import {
   UPDATE_CURRENT_SUBMISSION_ID,
   UPDATE_CURRENTSTEP,
   UPDATE_EDITOR_BREAKPOINTS,
-  UPDATE_EDITOR_GITHUB_SAVE_INFO,
   UPDATE_EDITOR_VALUE,
   UPDATE_HAS_UNSAVED_CHANGES,
   UPDATE_LAST_DEBUGGER_RESULT,
@@ -837,8 +836,7 @@ const oldWorkspaceReducer: Reducer<WorkspaceManagerState, SourceActionType> = (
         filePath,
         value: editorValue,
         highlightedLines: [],
-        breakpoints: [],
-        githubSaveInfo: {repoName: '', filePath: ''}
+        breakpoints: []
       };
       const newEditorTabs: EditorTabState[] = [
         ...state[workspaceLocation].editorTabs,

src/pages/academy/grading/subcomponents/GradingWorkspace.tsx

@@ -273,8 +273,7 @@ const GradingWorkspace: React.FC<Props> = props => {
         {
           value: editorValue,
           highlightedLines: [],
-          breakpoints: [],
-          githubSaveInfo: {repoName: '', filePath: ''}
+          breakpoints: []
         }
       ],
       programPrependValue,