Revert "streamlining ui behaviouor for github wip"

This reverts commit 292b1ef.

Author: linedoestrolling

src/commons/sagas/GitHubPersistenceSaga.ts

@@ -30,10 +30,11 @@ import FileExplorerDialog, { FileExplorerDialogProps } from '../gitHubOverlay/Fi
 import RepositoryDialog, { RepositoryDialogProps } from '../gitHubOverlay/RepositoryDialog';
 import { actions } from '../utils/ActionsHelper';
 import Constants from '../utils/Constants';
-import { promisifyDialog } from '../utils/DialogHelper';
+import { promisifyDialog, showSimpleErrorDialog } from '../utils/DialogHelper';
 import { dismiss, showMessage, showSuccessMessage, showWarningMessage } from '../utils/notifications/NotificationsHelper';
 import { EditorTabState } from '../workspace/WorkspaceTypes';
 import { Intent } from '@blueprintjs/core';
+import { filePathRegex } from '../utils/PersistenceHelper';
 
 export function* GitHubPersistenceSaga(): SagaIterator {
   yield takeLatest(LOGIN_GITHUB, githubLoginSaga);
@@ -288,6 +289,39 @@ function* githubSaveAll(): any {
     >;
 
     if (store.getState().fileSystem.persistenceFileArray.length === 0) {
+      // check if there is only one top level folder 
+      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!'); // TODO change to throw new Error
+        return;
+      }
+      const currFiles: Record<string, string> = yield call(
+        retrieveFilesInWorkspaceAsRecord,
+        'playground',
+        fileSystem
+      );
+      const testPaths: Set<string> = new Set();
+        Object.keys(currFiles).forEach(e => {
+          const regexResult = filePathRegex.exec(e)!;
+          testPaths.add(regexResult![1].slice('/playground/'.length, -1).split('/')[0]); //TODO hardcoded playground
+        });
+      if (testPaths.size !== 1) {
+        yield call(showSimpleErrorDialog, {
+          title: 'Unable to Save All',
+          contents: (
+            "There must be exactly one top level folder present in order to use Save All."
+          ),
+          label: 'OK'
+        });
+        return;
+      }
+
+      //only one top level folder, proceeding to selection
+
       type ListForAuthenticatedUserData = GetResponseDataTypeFromEndpointMethod<
         typeof octokit.repos.listForAuthenticatedUser
       >;

src/features/github/GitHubUtils.tsx

@@ -8,6 +8,10 @@ import {
   addGithubSaveInfo,
   updateRefreshFileViewKey
 } from 'src/commons/fileSystem/FileSystemActions';
+import {
+  addGithubSaveInfo,
+  updateRefreshFileViewKey
+} from 'src/commons/fileSystem/FileSystemActions';
 import { filePathRegex } from 'src/commons/utils/PersistenceHelper';
 import { WORKSPACE_BASE_PATHS } from 'src/pages/fileSystem/createInBrowserFileSystem';
 
@@ -276,6 +280,7 @@ export async function openFileInEditor(
   }
   const newFilePath = regexResult[2] + regexResult[3];
   console.log(newFilePath);
+  console.log(newFilePath);
 
   const newEditorValue = Buffer.from(content, 'base64').toString();
   const activeEditorTabIndex = store.getState().workspaces.playground.activeEditorTabIndex;