added saving all for github

linedoestrolling · linedoestrolling · commit a335af8b598f · 2024-03-29T17:42:22.000+08:00
diff --git a/package.json b/package.json
@@ -60,6 +60,7 @@
     "mdast-util-to-hast": "^13.0.0",
     "moment": "^2.29.4",
     "normalize.css": "^8.0.1",
+    "octokit-commit-multiple-files": "^5.0.2",
     "phaser": "^3.55.2",
     "query-string": "^9.0.0",
     "re-resizable": "^6.9.9",
diff --git a/src/commons/controlBar/github/ControlBarGitHubButtons.tsx b/src/commons/controlBar/github/ControlBarGitHubButtons.tsx
@@ -16,6 +16,7 @@ type Props = {
   onClickOpen?: () => void;
   onClickSave?: () => void;
   onClickSaveAs?: () => void;
+  onClickSaveAll?: () => void;
   onClickLogIn?: () => void;
   onClickLogOut?: () => void;
 };
@@ -83,7 +84,7 @@ export const ControlBarGitHubButtons: React.FC<Props> = props => {
     <ControlButton
       label="Save All"
       icon={IconNames.DOUBLE_CHEVRON_UP}
-      onClick={props.onClickSaveAs}
+      onClick={props.onClickSaveAll}
       isDisabled={shouldDisableButtons}
     />
   );
diff --git a/src/commons/fileSystem/FileSystemActions.ts b/src/commons/fileSystem/FileSystemActions.ts
@@ -1,13 +1,13 @@
 import { createAction } from '@reduxjs/toolkit';
+import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
 import { FSModule } from 'browserfs/dist/node/core/FS';
 
 import { 
-  SET_IN_BROWSER_FILE_SYSTEM,
   ADD_GITHUB_SAVE_INFO,
+  DELETE_ALL_GITHUB_SAVE_INFO,
   DELETE_GITHUB_SAVE_INFO,
-  DELETE_ALL_GITHUB_SAVE_INFO
- } from './FileSystemTypes';
-import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
+  SET_IN_BROWSER_FILE_SYSTEM,
+  UPDATE_GITHUB_SAVE_INFO } from './FileSystemTypes';
 
 export const setInBrowserFileSystem = createAction(
   SET_IN_BROWSER_FILE_SYSTEM,
@@ -28,3 +28,9 @@ export const deleteAllGithubSaveInfo = createAction(
   DELETE_ALL_GITHUB_SAVE_INFO,
   () => ({ payload: {} })
 );
+export const updateGithubSaveInfo = createAction(
+  UPDATE_GITHUB_SAVE_INFO,
+  (repoName: string,
+    filePath: string,
+    lastSaved: Date) => ({ payload: {repoName, filePath, lastSaved} })
+)
diff --git a/src/commons/fileSystem/FileSystemTypes.ts b/src/commons/fileSystem/FileSystemTypes.ts
@@ -5,6 +5,7 @@ export const SET_IN_BROWSER_FILE_SYSTEM = 'SET_IN_BROWSER_FILE_SYSTEM';
 export const ADD_GITHUB_SAVE_INFO = 'ADD_GITHUB_SAVE_INFO';
 export const DELETE_GITHUB_SAVE_INFO = 'DELETE_GITHUB_SAVE_INFO';
 export const DELETE_ALL_GITHUB_SAVE_INFO = 'DELETE_ALL_GITHUB_SAVE_INFO';
+export const UPDATE_GITHUB_SAVE_INFO = 'UPDATE_GITHUB_SAVE_INFO';
 
 export type FileSystemState = {
   inBrowserFileSystem: FSModule | null;
diff --git a/src/commons/fileSystem/FileSystemUtils.ts b/src/commons/fileSystem/FileSystemUtils.ts
@@ -1,6 +1,8 @@
 import { FSModule } from 'browserfs/dist/node/core/FS';
 import Stats from 'browserfs/dist/node/core/node_fs_stats';
 import path from 'path';
+import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
+import { store } from 'src/pages/createStore';
 
 import { WORKSPACE_BASE_PATHS } from '../../pages/fileSystem/createInBrowserFileSystem';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
@@ -263,3 +265,19 @@ export const writeFileRecursively = (
     });
   });
 };
+
+export const getGithubSaveInfo = () => {
+  const githubSaveInfoArray = store.getState().fileSystem.githubSaveInfoArray;
+  const { 
+    editorTabs,
+    activeEditorTabIndex
+  } = store.getState().workspaces['playground'];
+  let currentFilePath = '';
+  if (activeEditorTabIndex !== null) {
+    currentFilePath = editorTabs[activeEditorTabIndex].filePath?.slice(12) || '';
+  }
+  const nullGithubSaveInfo: GitHubSaveInfo = { repoName: 'test', filePath: '', lastSaved: new Date() };
+  const githubSaveInfo = githubSaveInfoArray.find(githubSaveInfo => githubSaveInfo.filePath === currentFilePath) || nullGithubSaveInfo;
+
+  return githubSaveInfo;
+}
diff --git a/src/commons/fileSystemView/FileSystemViewFileNode.tsx b/src/commons/fileSystemView/FileSystemViewFileNode.tsx
@@ -6,14 +6,14 @@ import React from 'react';
 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';
 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;
diff --git a/src/commons/sagas/GitHubPersistenceSaga.ts b/src/commons/sagas/GitHubPersistenceSaga.ts
@@ -7,6 +7,7 @@ import { call, put, select, takeLatest } from 'redux-saga/effects';
 
 import {
   GITHUB_OPEN_FILE,
+  GITHUB_SAVE_ALL,
   GITHUB_SAVE_FILE,
   GITHUB_SAVE_FILE_AS
 } from '../../features/github/GitHubTypes';
@@ -15,13 +16,15 @@ import { getGitHubOctokitInstance } from '../../features/github/GitHubUtils';
 import { store } from '../../pages/createStore';
 import { OverallState } from '../application/ApplicationTypes';
 import { LOGIN_GITHUB, LOGOUT_GITHUB } from '../application/types/SessionTypes';
+import { getGithubSaveInfo, retrieveFilesInWorkspaceAsRecord } from '../fileSystem/FileSystemUtils';
 import FileExplorerDialog, { FileExplorerDialogProps } from '../gitHubOverlay/FileExplorerDialog';
 import RepositoryDialog, { RepositoryDialogProps } from '../gitHubOverlay/RepositoryDialog';
 import { actions } from '../utils/ActionsHelper';
 import Constants from '../utils/Constants';
 import { promisifyDialog } from '../utils/DialogHelper';
 import { showSuccessMessage } from '../utils/notifications/NotificationsHelper';
 import { EditorTabState } from '../workspace/WorkspaceTypes';
+import { FSModule } from 'browserfs/dist/node/core/FS';
 
 export function* GitHubPersistenceSaga(): SagaIterator {
   yield takeLatest(LOGIN_GITHUB, githubLoginSaga);
@@ -30,6 +33,7 @@ export function* GitHubPersistenceSaga(): SagaIterator {
   yield takeLatest(GITHUB_OPEN_FILE, githubOpenFile);
   yield takeLatest(GITHUB_SAVE_FILE, githubSaveFile);
   yield takeLatest(GITHUB_SAVE_FILE_AS, githubSaveFileAs);
+  yield takeLatest(GITHUB_SAVE_ALL, githubSaveAll);
 }
 
 function* githubLoginSaga() {
@@ -113,8 +117,9 @@ function* githubSaveFile(): any {
   const authUser: GetAuthenticatedResponse = yield call(octokit.users.getAuthenticated);
 
   const githubLoginId = authUser.data.login;
-  const repoName = store.getState().playground.githubSaveInfo.repoName;
-  const filePath = store.getState().playground.githubSaveInfo.filePath;
+  const githubSaveInfo = getGithubSaveInfo();
+  const repoName = githubSaveInfo.repoName;
+  const filePath = githubSaveInfo.filePath;
   const githubEmail = authUser.data.email;
   const githubName = authUser.data.name;
   const commitMessage = 'Changes made from Source Academy';
@@ -190,6 +195,74 @@ function* githubSaveFileAs(): any {
 
     yield call(promisifiedFileExplorer);
   }
+}
+
+function* githubSaveAll(): any {
+  const octokit = getGitHubOctokitInstance();
+  if (octokit === undefined) return;
+
+  type GetAuthenticatedResponse = GetResponseTypeFromEndpointMethod<
+    typeof octokit.users.getAuthenticated
+  >;
+  const authUser: GetAuthenticatedResponse = yield call(octokit.users.getAuthenticated);
+  
+  const githubLoginId = authUser.data.login;
+  const githubSaveInfo = getGithubSaveInfo();
+  const repoName = githubSaveInfo.repoName;
+  const githubEmail = authUser.data.email;
+  const githubName = authUser.data.name;
+  const commitMessage = 'Changes made from Source Academy';
+  const fileSystem: FSModule | null = yield select(
+    (state: OverallState) => state.fileSystem.inBrowserFileSystem
+  );
+  // If the file system is not initialised, do nothing.
+  if (fileSystem === null) {
+    yield call(console.log, "no filesystem!");
+    return;
+  }
+  yield call(console.log, "there is a filesystem");
+  const currFiles: Record<string, string> = yield call(retrieveFilesInWorkspaceAsRecord, "playground", fileSystem);
+  const modifiedcurrFiles : Record<string, string> = {};
+  for (const filePath of Object.keys(currFiles)) {
+    modifiedcurrFiles[filePath.slice(12)] = currFiles[filePath];
+  }
+  console.log(modifiedcurrFiles);
+
+  yield call(GitHubUtils.performMultipleOverwritingSave,
+      octokit,
+      githubLoginId,
+      repoName,
+      githubEmail,
+      githubName,
+      { commitMessage: commitMessage, files: modifiedcurrFiles});
+
+  // for (const filePath of Object.keys(currFiles)) {
+  //   const content = currFiles[filePath];
+  //   yield call(GitHubUtils.performOverwritingSave,
+  //     octokit,
+  //     githubLoginId,
+  //     repoName,
+  //     filePath.slice(12),
+  //     githubEmail,
+  //     githubName,
+  //     commitMessage,
+  //     content);
+  // }
+
+  // const activeEditorTabIndex: number | null = yield select(
+  //   (state: OverallState) => state.workspaces.playground.activeEditorTabIndex
+  // );
+  // if (activeEditorTabIndex === null) {
+  //   throw new Error('No active editor tab found.');
+  // }
+  // const editorTabs: EditorTabState[] = yield select(
+  //   (state: OverallState) => state.workspaces.playground.editorTabs
+  // );
+  // const content = editorTabs[activeEditorTabIndex].value;
+
+  
+
+  
 }
 
 export default GitHubPersistenceSaga;
diff --git a/src/commons/sagas/PersistenceSaga.tsx b/src/commons/sagas/PersistenceSaga.tsx
@@ -1,4 +1,5 @@
 import { Intent } from '@blueprintjs/core';
+import { FSModule } from 'browserfs/dist/node/core/FS';
 import { GoogleOAuthProvider, SuccessTokenResponse } from 'google-oauth-gsi';
 import { Chapter, Variant } from 'js-slang/dist/types';
 import { SagaIterator } from 'redux-saga';
@@ -16,6 +17,8 @@ import { store } from '../../pages/createStore';
 import { OverallState } from '../application/ApplicationTypes';
 import { ExternalLibraryName } from '../application/types/ExternalTypes';
 import { LOGIN_GOOGLE, LOGOUT_GOOGLE } from '../application/types/SessionTypes';
+import { retrieveFilesInWorkspaceAsRecord, rmFilesInDirRecursively, writeFileRecursively } from '../fileSystem/FileSystemUtils';
+import { refreshFileView } from '../fileSystemView/FileSystemViewList'; // TODO broken when folder is open when reading folders
 import { actions } from '../utils/ActionsHelper';
 import Constants from '../utils/Constants';
 import { showSimpleConfirmDialog, showSimplePromptDialog } from '../utils/DialogHelper';
@@ -27,9 +30,6 @@ import {
 } from '../utils/notifications/NotificationsHelper';
 import { AsyncReturnType } from '../utils/TypeHelper';
 import { safeTakeEvery as takeEvery, safeTakeLatest as takeLatest } from './SafeEffects';
-import { FSModule } from 'browserfs/dist/node/core/FS';
-import { retrieveFilesInWorkspaceAsRecord, rmFilesInDirRecursively, writeFileRecursively } from '../fileSystem/FileSystemUtils';
-import { refreshFileView } from '../fileSystemView/FileSystemViewList'; // TODO broken when folder is open when reading folders
 
 const DISCOVERY_DOCS = ['https://www.googleapis.com/discovery/v1/apis/drive/v3/rest'];
 const SCOPES =
diff --git a/src/commons/utils/GitHubPersistenceHelper.ts b/src/commons/utils/GitHubPersistenceHelper.ts
@@ -4,7 +4,9 @@ import { Octokit } from '@octokit/rest';
  * Returns an instance to Octokit created using the authentication token
  */
 export function generateOctokitInstance(authToken: string) {
-  const octokit = new Octokit({
+  const octokitPlugin = Octokit.plugin(require('octokit-commit-multiple-files'));
+  console.log('testttt');
+  const octokit = new octokitPlugin({
     auth: authToken,
     userAgent: 'Source Academy Playground',
     baseUrl: 'https://api.github.com',
diff --git a/src/commons/workspace/WorkspaceActions.ts b/src/commons/workspace/WorkspaceActions.ts
@@ -63,6 +63,7 @@ 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,
@@ -74,9 +75,7 @@ import {
   UPDATE_WORKSPACE,
   WorkspaceLocation,
   WorkspaceLocationsWithTools,
-  WorkspaceState,
-  UPDATE_EDITOR_GITHUB_SAVE_INFO
-} from './WorkspaceTypes';
+  WorkspaceState} from './WorkspaceTypes';
 
 export const setTokenCount = createAction(
   SET_TOKEN_COUNT,
diff --git a/src/commons/workspace/WorkspaceReducer.ts b/src/commons/workspace/WorkspaceReducer.ts
@@ -82,6 +82,7 @@ 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,
@@ -92,9 +93,7 @@ import {
   UPDATE_SUBMISSIONS_TABLE_FILTERS,
   UPDATE_WORKSPACE,
   WorkspaceLocation,
-  WorkspaceManagerState,
-  UPDATE_EDITOR_GITHUB_SAVE_INFO
-} from './WorkspaceTypes';
+  WorkspaceManagerState} from './WorkspaceTypes';
 
 const getWorkspaceLocation = (action: any): WorkspaceLocation => {
   return action.payload ? action.payload.workspaceLocation : 'assessment';
diff --git a/src/commons/workspace/WorkspaceTypes.ts b/src/commons/workspace/WorkspaceTypes.ts
@@ -7,8 +7,6 @@ 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';
@@ -121,7 +119,6 @@ export type EditorTabState = {
   readonly highlightedLines: HighlightedLines[];
   readonly breakpoints: string[];
   readonly newCursorPosition?: Position;
-  githubSaveInfo: GitHubSaveInfo;
 };
 
 export type WorkspaceState = {
diff --git a/src/features/github/GitHubActions.ts b/src/features/github/GitHubActions.ts
@@ -1,9 +1,11 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import { GITHUB_OPEN_FILE, GITHUB_SAVE_FILE, GITHUB_SAVE_FILE_AS } from './GitHubTypes';
+import { GITHUB_OPEN_FILE, GITHUB_SAVE_FILE, GITHUB_SAVE_FILE_AS, GITHUB_SAVE_ALL } from './GitHubTypes';
 
 export const githubOpenFile = createAction(GITHUB_OPEN_FILE, () => ({ payload: {} }));
 
 export const githubSaveFile = createAction(GITHUB_SAVE_FILE, () => ({ payload: {} }));
 
 export const githubSaveFileAs = createAction(GITHUB_SAVE_FILE_AS, () => ({ payload: {} }));
+
+export const githubSaveAll = createAction(GITHUB_SAVE_ALL, () => ({ payload: {} }));
diff --git a/src/features/github/GitHubTypes.ts b/src/features/github/GitHubTypes.ts
@@ -1,6 +1,7 @@
 export const GITHUB_OPEN_FILE = 'GITHUB_OPEN_FILE';
 export const GITHUB_SAVE_FILE = 'GITHUB_SAVE_FILE';
 export const GITHUB_SAVE_FILE_AS = 'GITHUB_SAVE_FILE_AS';
+export const GITHUB_SAVE_ALL = 'GITHUB_SAVE_ALL';
 
 export type GitHubSaveInfo = {
   repoName: string;
diff --git a/src/features/github/GitHubUtils.tsx b/src/features/github/GitHubUtils.tsx
diff --git a/src/features/playground/PlaygroundActions.ts b/src/features/playground/PlaygroundActions.ts
diff --git a/src/pages/playground/Playground.tsx b/src/pages/playground/Playground.tsx
diff --git a/yarn.lock b/yarn.lock
