Fix formatting through yarn format

Author: sayomaki

src/commons/application/actions/SessionActions.ts

@@ -50,8 +50,8 @@ import {
   FETCH_USER_AND_COURSE,
   LOGIN,
   LOGIN_GITHUB,
-  LOGOUT_GITHUB,
   LOGIN_GOOGLE,
+  LOGOUT_GITHUB,
   LOGOUT_GOOGLE,
   NotificationConfiguration,
   NotificationPreference,

src/commons/application/reducers/SessionsReducer.ts

@@ -18,8 +18,8 @@ import {
   SET_COURSE_REGISTRATION,
   SET_GITHUB_ACCESS_TOKEN,
   SET_GITHUB_OCTOKIT_OBJECT,
-  SET_GOOGLE_USER,
   SET_GOOGLE_ACCESS_TOKEN,
+  SET_GOOGLE_USER,
   SET_NOTIFICATION_CONFIGS,
   SET_TOKENS,
   SET_USER,
@@ -60,7 +60,7 @@ export const SessionsReducer: Reducer<SessionState, SourceActionType> = (
       return {
         ...state,
         googleAccessToken: action.payload
-      }
+      };
     case SET_TOKENS:
       return {
         ...state,

src/commons/application/types/SessionTypes.ts

@@ -53,8 +53,7 @@ export const REAUTOGRADE_SUBMISSION = 'REAUTOGRADE_SUBMISSION';
 export const REAUTOGRADE_ANSWER = 'REAUTOGRADE_ANSWER';
 export const REMOVE_GITHUB_OCTOKIT_OBJECT_AND_ACCESS_TOKEN =
   'REMOVE_GITHUB_OCTOKIT_OBJECT_AND_ACCESS_TOKEN';
-export const REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN =
-  'REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN';
+export const REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN = 'REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN';
 export const UNSUBMIT_SUBMISSION = 'UNSUBMIT_SUBMISSION';
 export const UPDATE_ASSESSMENT_OVERVIEWS = 'UPDATE_ASSESSMENT_OVERVIEWS';
 export const UPDATE_TOTAL_XP = 'UPDATE_TOTAL_XP';

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -42,10 +42,10 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
     />
   );
   const openButton = (
-    <ControlButton 
-      label="Open" 
-      icon={IconNames.DOCUMENT_OPEN} 
-      onClick={props.onClickOpen} 
+    <ControlButton
+      label="Open"
+      icon={IconNames.DOCUMENT_OPEN}
+      onClick={props.onClickOpen}
       isDisabled={props.loggedInAs ? false : true}
     />
   );
@@ -59,8 +59,8 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
     />
   );
   const saveAsButton = (
-    <ControlButton 
-      label="Save as" 
+    <ControlButton
+      label="Save as"
       icon={IconNames.SEND_TO}
       onClick={props.onClickSaveAs}
       isDisabled={props.loggedInAs ? false : true}

src/commons/sagas/PersistenceSaga.tsx

@@ -28,7 +28,8 @@ import { AsyncReturnType } from '../utils/TypeHelper';
 import { safeTakeEvery as takeEvery, safeTakeLatest as takeLatest } from './SafeEffects';
 
 const DISCOVERY_DOCS = ['https://www.googleapis.com/discovery/v1/apis/drive/v3/rest'];
-const SCOPES = 'profile https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/userinfo.email';
+const SCOPES =
+  'profile https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/userinfo.email';
 const UPLOAD_PATH = 'https://www.googleapis.com/upload/drive/v3/files';
 
 // Special ID value for the Google Drive API.
@@ -58,7 +59,7 @@ export function* persistenceSaga(): SagaIterator {
     // check for stored token
     const accessToken = yield select((state: OverallState) => state.session.googleAccessToken);
     if (accessToken) {
-      yield call(gapi.client.setToken, {access_token: accessToken});
+      yield call(gapi.client.setToken, { access_token: accessToken });
       yield call(handleUserChanged, accessToken);
     }
   });
@@ -324,43 +325,45 @@ const initialisationPromise: Promise<void> = new Promise(res => {
   startInitialisation = res;
 }).then(initialise);
 
-async function initialise() { // only called once
+// only called once
+async function initialise() {
   // load GIS script
   // adapted from https://github.com/MomenSherif/react-oauth
-  await new Promise<void> ((resolve, reject) => {
+  await new Promise<void>((resolve, reject) => {
     const scriptTag = document.createElement('script');
     scriptTag.src = 'https://accounts.google.com/gsi/client';
     scriptTag.async = true;
     scriptTag.defer = true;
     scriptTag.onload = () => resolve();
-    scriptTag.onerror = (ev) => {
+    scriptTag.onerror = ev => {
       reject(ev);
     };
     document.body.appendChild(scriptTag);
   });
 
   // load and initialize gapi.client
-  await new Promise<void> ((resolve, reject) =>
-    gapi.load('client', { 
-      callback: resolve, 
-      onerror: reject 
+  await new Promise<void>((resolve, reject) =>
+    gapi.load('client', {
+      callback: resolve,
+      onerror: reject
     })
   );
   await gapi.client.init({
     discoveryDocs: DISCOVERY_DOCS
   });
 
   // initialize GIS client
-  await new Promise<google.accounts.oauth2.TokenClient> ((resolve, reject) => {
-    resolve(window.google.accounts.oauth2.initTokenClient({
-      client_id: Constants.googleClientId!,
-      scope: SCOPES,
-      callback: () => void 0 // will be updated in getToken()
-    }));
-  }).then((c) => {
-    tokenClient = c; 
-  }); 
-
+  await new Promise<google.accounts.oauth2.TokenClient>((resolve, reject) => {
+    resolve(
+      window.google.accounts.oauth2.initTokenClient({
+        client_id: Constants.googleClientId!,
+        scope: SCOPES,
+        callback: () => void 0 // will be updated in getToken()
+      })
+    );
+  }).then(c => {
+    tokenClient = c;
+  });
 }
 
 function* handleUserChanged(accessToken: string | null) {
@@ -386,7 +389,7 @@ function* getToken() {
         if (resp.error !== undefined) {
           reject(resp);
         }
-        // GIS has already automatically updated gapi.client 
+        // GIS has already automatically updated gapi.client
         // with the newly issued access token by this point
         resolve(resp);
       };
@@ -403,7 +406,8 @@ function* ensureInitialised() {
   yield initialisationPromise;
 }
 
-function* ensureInitialisedAndAuthorised() { // called multiple times
+// called multiple times
+function* ensureInitialisedAndAuthorised() {
   yield call(ensureInitialised);
   const currToken: GoogleApiOAuth2TokenObject = yield call(gapi.client.getToken);
 
@@ -597,4 +601,4 @@ function generateBoundary(): string {
 
 // End adapted part
 
-export default persistenceSaga;
+export default persistenceSaga;

src/commons/sagas/__tests__/PersistenceSaga.ts

@@ -2,8 +2,8 @@ import { Chapter, Variant } from 'js-slang/dist/types';
 import { expectSaga } from 'redux-saga-test-plan';
 
 import { PLAYGROUND_UPDATE_PERSISTENCE_FILE } from '../../../features/playground/PlaygroundTypes';
-import { REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN } from '../../application/types/SessionTypes';
 import { ExternalLibraryName } from '../../application/types/ExternalTypes';
+import { REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN } from '../../application/types/SessionTypes';
 import { actions } from '../../utils/ActionsHelper';
 import {
   CHANGE_EXTERNAL_LIBRARY,
@@ -47,25 +47,25 @@ beforeAll(() => {
 
 test('LOGOUT_GOOGLE results in REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN being dispatched', async () => {
   await expectSaga(PersistenceSaga)
-  .put({
-    type: PLAYGROUND_UPDATE_PERSISTENCE_FILE,
-    payload: undefined,
-    meta: undefined,
-    error: undefined
-  })
-  .put({
-    type: REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN,
-    payload: undefined,
-    meta: undefined,
-    error: undefined
-  })
-  .provide({
-    call(effect, next) {
-      return;
-    }
-  })
-  .dispatch(actions.logoutGoogle())
-  .silentRun();
+    .put({
+      type: PLAYGROUND_UPDATE_PERSISTENCE_FILE,
+      payload: undefined,
+      meta: undefined,
+      error: undefined
+    })
+    .put({
+      type: REMOVE_GOOGLE_USER_AND_ACCESS_TOKEN,
+      payload: undefined,
+      meta: undefined,
+      error: undefined
+    })
+    .provide({
+      call(effect, next) {
+        return;
+      }
+    })
+    .dispatch(actions.logoutGoogle())
+    .silentRun();
 });
 
 describe('PERSISTENCE_OPEN_PICKER', () => {

src/features/persistence/PersistenceUtils.tsx

@@ -6,11 +6,11 @@
  * @returns string if email field exists in JSON response, undefined if not
  */
 export async function getUserProfileDataEmail(accessToken: string): Promise<string | undefined> {
-    const headers = new Headers();
-    headers.append('Authorization', `Bearer ${accessToken}`);
-    const response = await fetch('https://www.googleapis.com/oauth2/v3/userinfo', {
-      headers
-    });
-    const data = await response.json();
-    return data.email;
-  }
+  const headers = new Headers();
+  headers.append('Authorization', `Bearer ${accessToken}`);
+  const response = await fetch('https://www.googleapis.com/oauth2/v3/userinfo', {
+    headers
+  });
+  const data = await response.json();
+  return data.email;
+}

src/pages/__tests__/createStore.test.ts

@@ -109,7 +109,7 @@ describe('createStore() function', () => {
 
     expect(received).toEqual(mockChangedState);
     expect(octokit).toBeDefined();
-    expect(googleUser).toEqual("placeholder");
+    expect(googleUser).toEqual('placeholder');
     localStorage.removeItem('storedState');
   });
 });

src/pages/createStore.ts

@@ -54,7 +54,7 @@ function loadStore(loadedStore: SavedState | undefined) {
           ? generateOctokitInstance(loadedStore.session.githubAccessToken)
           : undefined
       },
-      googleUser: loadedStore.session.googleAccessToken 
+      googleUser: loadedStore.session.googleAccessToken
         ? 'placeholder' // updates in PersistenceSaga
         : undefined
     },

src/pages/playground/Playground.tsx

@@ -19,8 +19,8 @@ import {
 } from 'src/commons/application/actions/InterpreterActions';
 import {
   loginGitHub,
-  logoutGitHub,
   loginGoogle,
+  logoutGitHub,
   logoutGoogle
 } from 'src/commons/application/actions/SessionActions';
 import {
@@ -272,7 +272,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
     googleUser: persistenceUser,
     githubOctokitObject
   } = useTypedSelector(state => state.session);
-  
+
   const dispatch = useDispatch();
   const {
     handleChangeExecTime,