Merge branch 'folders-public-wip' of github.com:source-academy/frontend into folders-public-wip

Author: linedoestrolling

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -65,7 +65,7 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
       label="Save As"
       icon={IconNames.SEND_TO}
       onClick={props.onClickSaveAs}
-      isDisabled={props.accessToken ? false : true}
+      isDisabled={props.accessToken ? props.isFolderModeEnabled : true}
     />
   );
   const saveAllButton = (

src/commons/sagas/PersistenceSaga.tsx

@@ -555,13 +555,13 @@ export function* persistenceSaga(): SagaIterator {
   yield takeEvery(
     PERSISTENCE_SAVE_FILE,
     function* ({ payload: { id, name } }: ReturnType<typeof actions.persistenceSaveFile>) {
+      yield call(store.dispatch, actions.disableFileSystemContextMenus());
       let toastKey: string | undefined;
 
       const [currFolderObject] = yield select( // TODO resolve type here?
       (state: OverallState) => [
         state.playground.persistenceFile
-      ]
-      );
+      ]);
 
       yield call(ensureInitialisedAndAuthorised);
 
@@ -576,11 +576,6 @@ export function* persistenceSaga(): SagaIterator {
       );
 
       try {
-        toastKey = yield call(showMessage, {
-          message: `Saving as ${name}...`,
-          timeout: 0,
-          intent: Intent.PRIMARY
-        });
 
         if (activeEditorTabIndex === null) {
           throw new Error('No active editor tab found.');
@@ -599,13 +594,25 @@ export function* persistenceSaga(): SagaIterator {
           if (!currPersistenceFile) {
             throw new Error('Persistence file not found');
           }
+          toastKey = yield call(showMessage, {
+            message: `Saving as ${currPersistenceFile.name}...`,
+            timeout: 0,
+            intent: Intent.PRIMARY
+          });
           yield call(updateFile, currPersistenceFile.id, currPersistenceFile.name, MIME_SOURCE, code, config);
           currPersistenceFile.lastSaved = new Date();
           yield put(actions.addPersistenceFile(currPersistenceFile));
-          yield call(showSuccessMessage, `${name} successfully saved to Google Drive.`, 1000);
+          yield call(store.dispatch, actions.updateRefreshFileViewKey());
+          yield call(showSuccessMessage, `${currPersistenceFile.name} successfully saved to Google Drive.`, 1000);
           return;
         } 
 
+        toastKey = yield call(showMessage, {
+          message: `Saving as ${name}...`,
+          timeout: 0,
+          intent: Intent.PRIMARY
+        });
+
         yield call(updateFile, id, name, MIME_SOURCE, code, config);
         yield put(actions.playgroundUpdatePersistenceFile({ id, name, lastSaved: new Date() }));
         yield call(showSuccessMessage, `${name} successfully saved to Google Drive.`, 1000);
@@ -616,6 +623,7 @@ export function* persistenceSaga(): SagaIterator {
         if (toastKey) {
           dismiss(toastKey);
         }
+        yield call(store.dispatch, actions.enableFileSystemContextMenus());
       }
     }
   );