added case where user saves as into the same folder that is open

Author: linedoestrolling

src/commons/gitHubOverlay/FileExplorerDialog.tsx

@@ -138,6 +138,14 @@ const FileExplorerDialog: React.FC<FileExplorerDialogProps> = props => {
       );
 
       if (canBeSaved) {
+        const persistenceFile = getPersistenceFile('');
+        if (persistenceFile === undefined) {
+          throw new Error("persistence file not found for this filepath: " + '');
+        }
+        const parentFolderPath = persistenceFile.parentFolderPath;
+        if (parentFolderPath === undefined) {
+          throw new Error("repository name or parentfolderpath not found for this persistencefile: " + persistenceFile);
+        }
         if (saveType === 'Overwrite' && (await checkIfUserAgreesToPerformOverwritingSave())) {
           performOverwritingSaveForSaveAs(
             props.octokit,
@@ -147,19 +155,12 @@ const FileExplorerDialog: React.FC<FileExplorerDialogProps> = props => {
             githubName,
             githubEmail,
             commitMessage,
-            props.editorContent
+            props.editorContent,
+            parentFolderPath
           );
         }
 
         if (saveType === 'Create') {
-          const persistenceFile = getPersistenceFile(filePath);
-          if (persistenceFile === undefined) {
-            throw new Error("persistence file not found for this filepath: " + filePath);
-          }
-          const parentFolderPath = persistenceFile.parentFolderPath;
-          if (parentFolderPath === undefined) {
-            throw new Error("repository name or parentfolderpath not found for this persistencefile: " + persistenceFile);
-          }
           performCreatingSave(
             props.octokit,
             githubLoginID,

src/commons/sagas/GitHubPersistenceSaga.ts

@@ -22,7 +22,7 @@ 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 { getPersistenceFile, retrieveFilesInWorkspaceAsRecord } from '../fileSystem/FileSystemUtils';
+import { getPersistenceFile, retrieveFilesInWorkspaceAsRecord} from '../fileSystem/FileSystemUtils';
 import FileExplorerDialog, { FileExplorerDialogProps } from '../gitHubOverlay/FileExplorerDialog';
 import RepositoryDialog, { RepositoryDialogProps } from '../gitHubOverlay/RepositoryDialog';
 import { actions } from '../utils/ActionsHelper';
@@ -179,6 +179,7 @@ function* githubSaveFileAs(): any {
   type ListForAuthenticatedUserData = GetResponseDataTypeFromEndpointMethod<
     typeof octokit.repos.listForAuthenticatedUser
   >;
+
   const userRepos: ListForAuthenticatedUserData = yield call(
     async () =>
       await octokit.paginate(octokit.repos.listForAuthenticatedUser, {
@@ -315,7 +316,7 @@ function* githubCreateFile({ payload }: ReturnType<typeof actions.githubCreateFi
   const githubLoginId = authUser.data.login;
   const persistenceFile = getPersistenceFile('');
   if (persistenceFile === undefined) {
-    throw new Error("persistencefile not found for this filepath: " + filePath);
+    throw new Error("persistencefile not found for this filepath: " + '');
   }
   const repoName = persistenceFile.repoName;
   const githubEmail = authUser.data.email;
@@ -418,9 +419,9 @@ function* githubDeleteFolder({ payload }: ReturnType<typeof actions.githubDelete
   const authUser: GetAuthenticatedResponse = yield call(octokit.users.getAuthenticated);
 
   const githubLoginId = authUser.data.login;
-  const persistenceFile = getPersistenceFile(filePath);
+  const persistenceFile = getPersistenceFile('');
   if (persistenceFile === undefined) {
-    throw new Error("persistence file not found for this filepath: " + filePath);
+    throw new Error("persistence file not found for this filepath: " + '');
   }
   const repoName = persistenceFile.repoName;
   const parentFolderPath = persistenceFile.parentFolderPath;
@@ -515,9 +516,9 @@ function* githubRenameFolder({ payload }: ReturnType<typeof actions.githubRename
   const authUser: GetAuthenticatedResponse = yield call(octokit.users.getAuthenticated);
 
   const githubLoginId = authUser.data.login;
-  const persistenceFile = getPersistenceFile(oldFilePath);
+  const persistenceFile = getPersistenceFile('');
   if (persistenceFile === undefined) {
-    throw new Error("persistence file not found for this filepath: " + oldFilePath);
+    throw new Error("persistence file not found for this filepath: " + '');
   }
   const repoName = persistenceFile.repoName;
   const parentFolderPath = persistenceFile.parentFolderPath;

src/features/github/GitHubUtils.tsx

@@ -542,11 +542,11 @@ export async function performMultipleOverwritingSave(
         octokit,
         repoOwner,
         repoName,
-        filePath,
+        filePath.slice(12),
         githubName,
         githubEmail,
         changes.commitMessage,
-        changes.files[filePath].slice(12),
+        changes.files[filePath],
         parentFolderPath
       );
   }
@@ -568,7 +568,8 @@ export async function performOverwritingSaveForSaveAs(
   githubName: string | null,
   githubEmail: string | null,
   commitMessage: string,
-  content: string, // path of the parent of the opened subfolder in github
+  content: string,
+  parentFolderPath: string
 ) {
   if (octokit === undefined) return;
 
@@ -602,6 +603,34 @@ export async function performOverwritingSaveForSaveAs(
     }
 
     const sha = files.sha;
+    console.log("/playground/" + filePath.slice(parentFolderPath.length));
+    const persistenceFile = getPersistenceFile("/playground/" + filePath.slice(parentFolderPath.length));
+    if (persistenceFile !== undefined) {
+
+      //case where user saves as into the same folder
+      const parentFolderPath = persistenceFile.parentFolderPath;
+      const filePath = persistenceFile.path;
+      if (parentFolderPath === undefined || filePath === undefined) {
+        throw new Error("parentfolderpath or filepath not found for this persistencefile: " + persistenceFile);
+      }
+
+      const fileSystem: FSModule | null = store.getState().fileSystem.inBrowserFileSystem;
+      if (fileSystem === null) {
+        console.log("no filesystem!");
+        throw new Error("No filesystem");
+      }
+
+      writeFileRecursively(fileSystem, filePath, content);
+
+      store.dispatch(actions.addGithubSaveInfo({ 
+        id: '',
+        name: '',
+        repoName: repoName, 
+        path: filePath, 
+        lastSaved: new Date(),
+        parentFolderPath: parentFolderPath 
+    }));
+    }
 
     await octokit.repos.createOrUpdateFileContents({
       owner: repoOwner,