merge

Author: linedoestrolling

src/commons/application/ApplicationTypes.ts

@@ -393,7 +393,8 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
         : undefined,
       value: ['playground', 'sourcecast'].includes(workspaceLocation) ? defaultEditorValue : '',
       highlightedLines: [],
-      breakpoints: []
+      breakpoints: [],
+      githubSaveInfo: { repoName:'', filePath:''}
     }
   ],
   programPrependValue: '',
@@ -461,7 +462,8 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
         filePath: getDefaultFilePath('playground'),
         value: defaultEditorValue,
         highlightedLines: [],
-        breakpoints: []
+        breakpoints: [],
+        githubSaveInfo: {repoName:'', filePath:''}
       }
     ]
   },
@@ -515,7 +517,8 @@ export const defaultWorkspaceManager: WorkspaceManagerState = {
         filePath: getDefaultFilePath('sicp'),
         value: defaultEditorValue,
         highlightedLines: [],
-        breakpoints: []
+        breakpoints: [],
+        githubSaveInfo: {repoName:'', filePath:''}
       }
     ]
   },

src/commons/editingWorkspace/EditingWorkspace.tsx

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

src/commons/fileSystemView/FileSystemViewFileNode.tsx

@@ -15,6 +15,8 @@ import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 import FileSystemViewContextMenu from './FileSystemViewContextMenu';
 import FileSystemViewFileName from './FileSystemViewFileName';
 import FileSystemViewIndentationPadding from './FileSystemViewIndentationPadding';
+import { OverallState } from '../application/ApplicationTypes';
+import { actions } from '../utils/ActionsHelper';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -60,10 +62,12 @@ const FileSystemViewFileNode: React.FC<Props> = ({
 
   const [isEditing, setIsEditing] = React.useState(false);
   const dispatch = useDispatch();
+  const store = useStore<OverallState>();
 
   const fullPath = path.join(basePath, fileName);
 
   const handleOpenFile = () => {
+    fileSystem.readFile(fullPath, 'utf-8', async (err, fileContents) => {
     fileSystem.readFile(fullPath, 'utf-8', async (err, fileContents) => {
       if (err) {
         console.error(err);
@@ -72,6 +76,19 @@ 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);
+      store.dispatch(actions.updateEditorGithubSaveInfo(
+        'playground',
+        idx,
+        repoName,
+        editorFilePath,
+        new Date()
+      ));
+      console.log(store.getState().workspaces['playground'].editorTabs);
     });
   };
 

src/commons/workspace/WorkspaceActions.ts

@@ -74,7 +74,8 @@ import {
   UPDATE_WORKSPACE,
   WorkspaceLocation,
   WorkspaceLocationsWithTools,
-  WorkspaceState
+  WorkspaceState,
+  UPDATE_EDITOR_GITHUB_SAVE_INFO
 } from './WorkspaceTypes';
 
 export const setTokenCount = createAction(

src/commons/workspace/WorkspaceReducer.ts

@@ -89,7 +89,8 @@ import {
   UPDATE_LAST_DEBUGGER_RESULT,
   UPDATE_LAST_NON_DET_RESULT,
   WorkspaceLocation,
-  WorkspaceManagerState
+  WorkspaceManagerState,
+  UPDATE_EDITOR_GITHUB_SAVE_INFO
 } from './WorkspaceTypes';
 
 const getWorkspaceLocation = (action: any): WorkspaceLocation => {
@@ -637,7 +638,8 @@ const newWorkspaceReducer = createReducer(defaultWorkspaceManager, builder => {
         filePath,
         value: editorValue,
         highlightedLines: [],
-        breakpoints: []
+        breakpoints: [],
+        githubSaveInfo: {repoName: '', filePath: ''}
       };
       editorTabs.push(newEditorTab);
       // Set the newly added editor tab as the active tab.

src/commons/workspace/WorkspaceTypes.ts

@@ -7,6 +7,8 @@ import { ExternalLibraryName } from '../application/types/ExternalTypes';
 import { AutogradingResult, Testcase } from '../assessment/AssessmentTypes';
 import { HighlightedLines, Position } from '../editor/EditorTypes';
 
+import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
+
 export const ADD_HTML_CONSOLE_ERROR = 'ADD_HTML_CONSOLE_ERROR';
 export const BEGIN_CLEAR_CONTEXT = 'BEGIN_CLEAR_CONTEXT';
 export const BROWSE_REPL_HISTORY_DOWN = 'BROWSE_REPL_HISTORY_DOWN';
@@ -119,6 +121,7 @@ export type EditorTabState = {
   readonly highlightedLines: HighlightedLines[];
   readonly breakpoints: string[];
   readonly newCursorPosition?: Position;
+  githubSaveInfo: GitHubSaveInfo;
 };
 
 export type WorkspaceState = {
@@ -174,4 +177,4 @@ export type SubmissionsTableFilters = {
 export type TeamFormationsTableFilters = {
   columnFilters: { id: string; value: unknown }[];
   globalFilter: string | null;
-};
+};

src/features/playground/PlaygroundActions.ts

@@ -13,7 +13,8 @@ import {
   PLAYGROUND_UPDATE_PERSISTENCE_FOLDER,
   PLAYGROUND_UPDATE_REPO_NAME,
   SHORTEN_URL,
-  UPDATE_SHORT_URL
+  UPDATE_SHORT_URL,
+  PLAYGROUND_UPDATE_REPO_NAME
 } from './PlaygroundTypes';
 
 export const generateLzString = createAction(GENERATE_LZ_STRING, () => ({ payload: {} }));

src/features/playground/PlaygroundReducer.ts

@@ -11,6 +11,7 @@ import {
   PLAYGROUND_UPDATE_PERSISTENCE_FILE,
   PLAYGROUND_UPDATE_PERSISTENCE_FOLDER,
   PLAYGROUND_UPDATE_REPO_NAME,
+  PLAYGROUND_UPDATE_REPO_NAME,
   PlaygroundState,
   UPDATE_SHORT_URL
 } from './PlaygroundTypes';

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

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