prevented both google drive and github from syncing at the same time

Author: linedoestrolling

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -20,6 +20,7 @@ type Props = {
   accessToken?: string;
   currPersistenceFile?: PersistenceFile;
   isDirty?: boolean;
+  isGithubSynced?: boolean;
   onClickOpen?: () => any;
   onClickSave?: () => any;
   onClickSaveAll?: () => any;
@@ -36,13 +37,14 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
       ? 'DIRTY'
       : 'SAVED'
     : 'INACTIVE';
-  const isNotPlayground = props.workspaceLocation !== "playground";
+  const isNotPlayground = props.workspaceLocation !== "playground" ;
+  const GithubSynced = props.isGithubSynced;
   const mainButton = (
     <ControlButton
       label={(props.currPersistenceFile && props.currPersistenceFile.name) || 'Google Drive'}
       icon={IconNames.CLOUD}
       options={{ intent: stateToIntent[state] }}
-      isDisabled={isNotPlayground}
+      isDisabled={isNotPlayground || GithubSynced}
     />
   );
   const openButton = (
@@ -109,7 +111,7 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
         }
         onOpening={props.onPopoverOpening}
         popoverClassName={Classes.POPOVER_DISMISS}
-        disabled={isNotPlayground}
+        disabled={isNotPlayground || GithubSynced}
       >
         {mainButton}
       </Popover2>

src/commons/controlBar/github/ControlBarGitHubButtons.tsx

@@ -16,6 +16,7 @@ type Props = {
   loggedInAs?: Octokit;
   githubSaveInfo: GitHubSaveInfo;
   isDirty: boolean;
+  isGDriveSynced: boolean;
   onClickOpen?: () => void;
   onClickSave?: () => void;
   onClickSaveAs?: () => void;
@@ -41,6 +42,7 @@ export const ControlBarGitHubButtons: React.FC<Props> = props => {
   const shouldDisableButtons = !isLoggedIn;
   const hasFilePath = filePath !== '';
   const hasOpenFile = isLoggedIn && hasFilePath;
+  const GDriveSynced = props.isGDriveSynced;
 
   const mainButtonDisplayText =
     (props.currPersistenceFile && hasOpenFile && props.currPersistenceFile.name) || 'GitHub';
@@ -54,7 +56,7 @@ export const ControlBarGitHubButtons: React.FC<Props> = props => {
       label={mainButtonDisplayText}
       icon={IconNames.GIT_BRANCH}
       options={{ intent: mainButtonIntent }}
-      isDisabled={isNotPlayground}
+      isDisabled={isNotPlayground || GDriveSynced}
     />
   );
 
@@ -120,7 +122,7 @@ export const ControlBarGitHubButtons: React.FC<Props> = props => {
           </div>
         }
         popoverClassName={Classes.POPOVER_DISMISS}
-        disabled={isNotPlayground}
+        disabled={isNotPlayground || GDriveSynced}
       >
         {mainButton}
       </Popover2>

src/pages/playground/Playground.tsx

@@ -118,6 +118,8 @@ import {
 import { Position } from '../../commons/editor/EditorTypes';
 import {
   getGithubSaveInfo,
+  isGDriveSyncing,
+  isGithubSyncing,
   overwriteFilesInWorkspace
 } from '../../commons/fileSystem/FileSystemUtils';
 import FileSystemView from '../../commons/fileSystemView/FileSystemView';
@@ -603,6 +605,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
   // Compute this here to avoid re-rendering the button every keystroke
   const persistenceIsDirty =
     persistenceFile && (!persistenceFile.lastSaved || persistenceFile.lastSaved < lastEdit);
+  const githubSynced = isGithubSyncing();
   const persistenceButtons = useMemo(() => {
     return (
       <ControlBarGoogleDriveButtons
@@ -612,6 +615,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
         loggedInAs={persistenceUser}
         isDirty={persistenceIsDirty}
         accessToken={googleAccessToken}
+        isGithubSynced={githubSynced}
         key="googledrive"
         onClickSaveAs={() => dispatch(persistenceSaveFileAs())}
         onClickSaveAll={() => dispatch(persistenceSaveAll())}
@@ -631,13 +635,13 @@ const Playground: React.FC<PlaygroundProps> = props => {
     persistenceIsDirty,
     dispatch,
     googleAccessToken,
-    workspaceLocation
+    workspaceLocation,
+    githubSynced
   ]);
 
   const githubPersistenceIsDirty =
     githubSaveInfo && (!githubSaveInfo.lastSaved || githubSaveInfo.lastSaved < lastEdit);
-  console.log(githubSaveInfo.lastSaved);
-  console.log(lastEdit);
+  const gdriveSynced = isGDriveSyncing();
   const githubButtons = useMemo(() => {
     return (
       <ControlBarGitHubButtons
@@ -648,6 +652,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
         loggedInAs={githubOctokitObject.octokit}
         githubSaveInfo={githubSaveInfo}
         isDirty={githubPersistenceIsDirty}
+        isGDriveSynced={gdriveSynced}
         onClickOpen={() => dispatch(githubOpenFile())}
         onClickSaveAs={() => dispatch(githubSaveFileAs())}
         onClickSave={() => dispatch(githubSaveFile())}
@@ -663,7 +668,8 @@ const Playground: React.FC<PlaygroundProps> = props => {
     githubSaveInfo,
     isFolderModeEnabled,
     persistenceFile,
-    workspaceLocation
+    workspaceLocation,
+    gdriveSynced
   ]);
 
   const executionTime = useMemo(