added instantaneous syncing for github

linedoestrolling · linedoestrolling · commit 8754f602a6ac · 2024-04-08T01:50:12.000+08:00
diff --git a/src/commons/fileSystem/FileSystemReducer.ts b/src/commons/fileSystem/FileSystemReducer.ts
@@ -54,11 +54,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
         state.persistenceFileArray = persistenceFileArray;
     })
     .addCase(deleteGithubSaveInfo, (state, action) => { // TODO rewrite - refer to deletePersistenceFile below
-      const newPersistenceFileArray = state['persistenceFileArray'].filter(e => {
-        return e.path != action.payload.path &&
-        e.lastSaved != action.payload.lastSaved &&
-        e.repoName != action.payload.repoName
-      });
+      const newPersistenceFileArray = state['persistenceFileArray'].filter(e => e.path !== action.payload.path);
       const isGDriveSyncing = action.payload.id ? true: false;
       if (isGDriveSyncing) {
         const newPersFile = { id: action.payload.id, path: action.payload.path, repoName: '', name: action.payload.name};
@@ -108,10 +104,12 @@ 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);
-      if (persistenceFileFindIndex === -1) {
-        return;
-      }
+      //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)!;
 
diff --git a/src/commons/fileSystemView/FileSystemViewFileName.tsx b/src/commons/fileSystemView/FileSystemViewFileName.tsx
@@ -11,6 +11,7 @@ import {
   renameEditorTabsForDirectory
 } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
+import { githubRenameFile, githubRenameFolder } from 'src/features/github/GitHubActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
@@ -71,9 +72,11 @@ const FileSystemViewFileName: React.FC<Props> = ({
 
           if (isDirectory) {
             dispatch(persistenceRenameFolder({oldFolderPath: oldPath, newFolderPath: newPath}));
+            dispatch(githubRenameFolder(oldPath, newPath));
             dispatch(renameEditorTabsForDirectory(workspaceLocation, oldPath, newPath));
           } else {
             dispatch(persistenceRenameFile({oldFilePath: oldPath, newFilePath: newPath}));
+            dispatch(githubRenameFile(oldPath, newPath));
             dispatch(renameEditorTabForFile(workspaceLocation, oldPath, newPath));
           }
           refreshDirectory();
diff --git a/src/commons/sagas/GitHubPersistenceSaga.ts b/src/commons/sagas/GitHubPersistenceSaga.ts
@@ -13,7 +13,9 @@ import {
   GITHUB_SAVE_FILE_AS,
   GITHUB_CREATE_FILE,
   GITHUB_DELETE_FILE,
-  GITHUB_DELETE_FOLDER
+  GITHUB_DELETE_FOLDER,
+  GITHUB_RENAME_FILE,
+  GITHUB_RENAME_FOLDER,
 } from '../../features/github/GitHubTypes';
 import * as GitHubUtils from '../../features/github/GitHubUtils';
 import { getGitHubOctokitInstance } from '../../features/github/GitHubUtils';
@@ -32,14 +34,15 @@ import { EditorTabState } from '../workspace/WorkspaceTypes';
 export function* GitHubPersistenceSaga(): SagaIterator {
   yield takeLatest(LOGIN_GITHUB, githubLoginSaga);
   yield takeLatest(LOGOUT_GITHUB, githubLogoutSaga);
-
   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);
   yield takeLatest(GITHUB_CREATE_FILE, githubCreateFile);
   yield takeLatest(GITHUB_DELETE_FILE, githubDeleteFile);
   yield takeLatest(GITHUB_DELETE_FOLDER, githubDeleteFolder);
+  yield takeLatest(GITHUB_RENAME_FILE, githubRenameFile);
+  yield takeLatest(GITHUB_RENAME_FOLDER, githubRenameFolder);
 }
 
 function* githubLoginSaga() {
@@ -308,13 +311,12 @@ function* githubDeleteFile({ payload }: ReturnType<typeof actions.githubDeleteFi
   const authUser: GetAuthenticatedResponse = yield call(octokit.users.getAuthenticated);
 
   const githubLoginId = authUser.data.login;
-  const githubSaveInfo = getGithubSaveInfo();
-  const repoName = githubSaveInfo.repoName;
-  const lastSaved = githubSaveInfo.lastSaved;
+  const repoName = getGithubSaveInfo().repoName;
   const githubEmail = authUser.data.email;
   const githubName = authUser.data.name;
   const commitMessage = 'Changes made from Source Academy';
 
+
   if (repoName === '') {
     yield call(console.log, "not synced to github");
     return;
@@ -329,14 +331,6 @@ function* githubDeleteFile({ payload }: ReturnType<typeof actions.githubDeleteFi
     githubName,
     commitMessage,
   );
-
-  const persistenceFileArray = store.getState().fileSystem.persistenceFileArray;
-  const persistenceFile = persistenceFileArray.find(e => 
-    e.repoName === repoName && 
-    e.path === filePath && 
-    e.lastSaved === lastSaved) || {id: '', name: ''};
-  store.dispatch(actions.deleteGithubSaveInfo(persistenceFile));
-
   
   yield call(store.dispatch, actions.enableFileSystemContextMenus());
   yield call(store.dispatch, actions.updateRefreshFileViewKey());
@@ -375,7 +369,89 @@ function* githubDeleteFolder({ payload }: ReturnType<typeof actions.githubDelete
     githubName,
     commitMessage
   );
-  
+
+  yield call(store.dispatch, actions.enableFileSystemContextMenus());
+  yield call(store.dispatch, actions.updateRefreshFileViewKey());
+}
+
+function* githubRenameFile({ payload }: ReturnType<typeof actions.githubRenameFile>): any {
+  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+
+  const newFilePath = payload.newFilePath;
+  const oldFilePath = payload.oldFilePath;
+
+  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';
+
+  if (repoName === '' || repoName === undefined) {
+    yield call(console.log, "not synced to github");
+    return;
+  }
+
+  GitHubUtils.performFileRenaming(
+    octokit,
+    githubLoginId,
+    repoName,
+    oldFilePath.slice(12),
+    githubName,
+    githubEmail,
+    commitMessage,
+    newFilePath.slice(12)
+  )
+
+  yield call(store.dispatch, actions.enableFileSystemContextMenus());
+  yield call(store.dispatch, actions.updateRefreshFileViewKey());
+}
+
+function* githubRenameFolder({ payload }: ReturnType<typeof actions.githubRenameFile>): any {
+  yield call(store.dispatch, actions.disableFileSystemContextMenus());
+
+  const newFilePath = payload.newFilePath;
+  const oldFilePath = payload.oldFilePath;
+
+  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';
+
+  if (repoName === '' || repoName === undefined) {
+    yield call(console.log, "not synced to github");
+    return;
+  }
+
+  GitHubUtils.performFolderRenaming(
+    octokit,
+    githubLoginId,
+    repoName,
+    oldFilePath.slice(12),
+    githubName,
+    githubEmail,
+    commitMessage,
+    newFilePath.slice(12)
+  )
+
   yield call(store.dispatch, actions.enableFileSystemContextMenus());
   yield call(store.dispatch, actions.updateRefreshFileViewKey());
 }
diff --git a/src/features/github/GitHubActions.ts b/src/features/github/GitHubActions.ts
@@ -7,7 +7,9 @@ import {
     GITHUB_SAVE_FILE, 
     GITHUB_SAVE_FILE_AS,
     GITHUB_DELETE_FILE,
-    GITHUB_DELETE_FOLDER} from './GitHubTypes';
+    GITHUB_DELETE_FOLDER,
+    GITHUB_RENAME_FOLDER,
+    GITHUB_RENAME_FILE} from './GitHubTypes';
 
 export const githubOpenFile = createAction(GITHUB_OPEN_FILE, () => ({ payload: {} }));
 
@@ -22,3 +24,7 @@ export const githubCreateFile = createAction(GITHUB_CREATE_FILE, (filePath: stri
 export const githubDeleteFile = createAction(GITHUB_DELETE_FILE, (filePath: string) => ({ payload: filePath }));
 
 export const githubDeleteFolder = createAction(GITHUB_DELETE_FOLDER, (filePath: string) => ({ payload: filePath}));
+
+export const githubRenameFile = createAction(GITHUB_RENAME_FILE, (oldFilePath: string, newFilePath: string) => ({ payload: {oldFilePath, newFilePath} }));
+
+export const githubRenameFolder = createAction(GITHUB_RENAME_FOLDER, (oldFilePath: string, newFilePath: string) => ({ payload: {oldFilePath, newFilePath} }));
diff --git a/src/features/github/GitHubTypes.ts b/src/features/github/GitHubTypes.ts
@@ -5,6 +5,8 @@ export const GITHUB_SAVE_ALL = 'GITHUB_SAVE_ALL';
 export const GITHUB_CREATE_FILE = 'GITHUB_CREATE_FILE';
 export const GITHUB_DELETE_FILE = 'GITHUB_DELETE_FILE';
 export const GITHUB_DELETE_FOLDER = 'GITHUB_DELETE_FOLDER';
+export const GITHUB_RENAME_FOLDER = 'GITHUB_RENAME_FOLDER';
+export const GITHUB_RENAME_FILE = 'GITHUB_RENAME_FILE';
 
 export type GitHubSaveInfo = {
   repoName?: string;
diff --git a/src/features/github/GitHubUtils.tsx b/src/features/github/GitHubUtils.tsx
