Reduxify Settings, SIS, lib, … too much (#599)

* clarify types in buildFormData

* centralize all access to AsyncStorage

across lib/cache and lib/storage

* update homescreen to use the new storage system

* update ga to use the new storage system

* rip out huge chunks of lib/login and make it use storage

* remove frisbee

* split lib/financials into multiple files

and rework error handling and logic flows with the new helpers in
lib/cache

* split lib/courses into multiple files

and rework the logic and error handling _completely_. I didn't change
any of the parsing code, since as far as I know that still works, but
the errors now propagate without throwing and the logic makes more
sense? I think, anyway.

* remove react-native-cookies

* clean up the flux/ folder a bit

* move the initialization of the flux store into flux/init

* load login credentials into redux at start

* extract menus reducer into flux/parts/menus

* extract homescreen reducer into flux/parts/homescreen

fix import for updateViewOrder test

* add an "app-wide state" reducer

* add basic flow to flux/

* abstract out some Balances components

fix accidental flip-flop of validity in sis/balances

add … to Balances' meals rows

* split up Settings into multiple files

add some semicolons

fix capitalization typo in settings

* store settings information in redux, instead of state

* update views/sis to store state in redux

expand parameter name in balances/mapDispatchToProps

fix path indexing in views/courses

* cache the meal responses in the cache

* update lib/ to take isConnected as a parameter

* clean up some files

fix courses reducer

fix double-payload bug in flux/sis

fix some things in flux/settings

tweak types

update logOutViaToken to actually clear the stored token

fix up some types around meals stuff

* collapse redux actions in the console

* rework settings/login view

1. make the user dismiss the view manually
2. float it from the bottom of the screen

* clean up some more things

fix sis-to-settings path sliding from bottom but not dismissing to bottom

* check the sis login token at app start

* load courses from the unofficial transcript instead of the main sis

remove console.log stuff from parse-courses

fix an export to export more things

* load financial balances into the store at startup

* extract button from contactCard

* add button to NoticeView

fix flow error in NoticeView

* update Courses for new data source

remove a typeof statement that snuck in

update views/courses for bugfixes

* check olaf credentials at app boot

* update CourseType

* check for nullability in financial responses

* request SIS data as soon as login is successful

* fix blank SIS courses issue

* move deptnum generation into parse-courses

* remove right border from Balances cell

* remove unused imports from views/courses

* don't log the page contents of the unofficial transcript

Author: hawkrives

analytics.js

@@ -1,16 +1,17 @@
 // @flow
-import {AsyncStorage} from 'react-native'
 import {
   GoogleAnalyticsTracker,
   GoogleAnalyticsSettings,
 } from 'react-native-google-analytics-bridge'
 import {stringifyFilters} from './views/components/filter'
 
+import * as storage from './lib/storage'
+
 const trackerId = __DEV__ ? 'UA-90234209-1' : 'UA-90234209-2'
 export const tracker = new GoogleAnalyticsTracker(trackerId)
 
 async function disableIfOptedOut() {
-  const didOptOut = JSON.parse(await AsyncStorage.getItem('optout'))
+  const didOptOut = await storage.getAnalyticsOptOut()
   if (didOptOut) {
     GoogleAnalyticsSettings.setOptOut(true)
   }

android/app/build.gradle

@@ -142,7 +142,6 @@ android {
 dependencies {
     compile project(':react-native-google-analytics-bridge')
     compile project(':react-native-device-info')
-    compile project(':react-native-cookies')
     compile project(':react-native-vector-icons')
     compile project(':react-native-keychain')
     compile fileTree(dir: "libs", include: ["*.jar"])

android/app/src/main/java/com/allaboutolaf/MainApplication.java

@@ -6,7 +6,6 @@
 import com.facebook.react.ReactApplication;
 import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
 import com.learnium.RNDeviceInfo.RNDeviceInfo;
-import com.psykar.cookiemanager.CookieManagerPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.oblador.keychain.KeychainPackage;
 import com.facebook.react.ReactInstanceManager;
@@ -33,7 +32,6 @@ protected List<ReactPackage> getPackages() {
         new MainReactPackage(),
         new GoogleAnalyticsBridgePackage(),
         new RNDeviceInfo(),
-        new CookieManagerPackage(),
         new VectorIconsPackage(),
         new KeychainPackage(),
         new ReactNativeOneSignalPackage()

android/settings.gradle

@@ -3,8 +3,6 @@ rootProject.name = 'All About Olaf'
 include ':app'
 include ':react-native-device-info'
 project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
-include ':react-native-cookies'
-project(':react-native-cookies').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-cookies/android')
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':react-native-keychain'

flux/README

@@ -1,5 +1,5 @@
 /* eslint-env jest */
-import {updateViewOrder} from '../index'
+import {updateViewOrder} from '../parts/homescreen'
 
 test('it should return the current order if no screens have changed', () => {
   let savedOrder = ['a', 'b', 'c']

flux/__tests__/update-view-order.test.js

@@ -1,93 +1,34 @@
+/**
+ * @flow
+ * Root reducer for state storage
+ */
+
 import {createStore, applyMiddleware} from 'redux'
 import createLogger from 'redux-logger'
 import reduxPromise from 'redux-promise'
 import reduxThunk from 'redux-thunk'
-import {AsyncStorage} from 'react-native'
-import {allViewNames as defaultViewOrder} from '../views/views'
-import difference from 'lodash/difference'
-import {trackMenuFilters, trackHomescreenOrder} from '../analytics'
-
-export const SAVE_HOMESCREEN_ORDER = 'SAVE_HOMESCREEN_ORDER'
-
-export const updateViewOrder = (currentOrder, defaultOrder=defaultViewOrder) => {
-  currentOrder = currentOrder || []
-
-  // lodash/difference: Creates an array of array values _not included_ in the
-  // other given arrays.
-
-  // In case new screens have been added, get a list of the new screens
-  let addedScreens = difference(defaultOrder, currentOrder)
-  // check for removed screens
-  let removedScreens = difference(currentOrder, defaultOrder)
-
-  // add the new screens to the list
-  currentOrder = currentOrder.concat(addedScreens)
-
-  // now we remove the screens that were removed
-  currentOrder = difference(currentOrder, removedScreens)
-
-  return currentOrder
-}
-
-export const loadHomescreenOrder = async () => {
-  // get the saved list from AsyncStorage
-  let savedOrder = JSON.parse(await AsyncStorage.getItem('homescreen:view-order'))
-
-  // update the order, in case new views have been added/removed
-  let order = updateViewOrder(savedOrder, defaultViewOrder)
-
-  // return an action to save it to AsyncStorage
-  return saveHomescreenOrder(order, {noTrack: true})
-}
+import {init} from './init'
 
-export const saveHomescreenOrder = (order, options={}) => {
-  options.noTrack || trackHomescreenOrder(order)
-  AsyncStorage.setItem('homescreen:view-order', JSON.stringify(order))
-  return {type: SAVE_HOMESCREEN_ORDER, payload: order}
-}
+import {app} from './parts/app'
+import {homescreen} from './parts/homescreen'
+import {menus} from './parts/menus'
+import {settings} from './parts/settings'
+import {sis} from './parts/sis'
 
-const initialHomescreenState = {
-  order: [],
-}
-function homescreen(state=initialHomescreenState, action) {
-  let {type, payload} = action
-  switch (type) {
-    case SAVE_HOMESCREEN_ORDER: {
-      return {...state, order: payload}
-    }
-    default:
-      return state
-  }
-}
 
-
-export const UPDATE_MENU_FILTERS = 'menus/UPDATE_MENU_FILTERS'
-
-export const updateMenuFilters = (menuName: string, filters: any[]) => {
-  trackMenuFilters(menuName, filters)
-  return {type: UPDATE_MENU_FILTERS, payload: {menuName, filters}}
-}
-
-const initialMenusState = {}
-function menus(state=initialMenusState, action) {
-  let {type, payload} = action
-  switch (type) {
-    case UPDATE_MENU_FILTERS:
-      return {...state, [payload.menuName]: payload.filters}
-    default:
-      return state
-  }
-}
-
-export function aao(state={}, action) {
+export function aao(state: Object={}, action: Object) {
   return {
+    app: app(state.app, action),
     homescreen: homescreen(state.homescreen, action),
     menus: menus(state.menus, action),
+    settings: settings(state.settings, action),
+    sis: sis(state.sis, action),
   }
 }
 
-const logger = createLogger()
-export const store = createStore(
+
+const logger = createLogger({collapsed: () => true})
+const store = createStore(
   aao,
   applyMiddleware(
     reduxPromise,
@@ -96,4 +37,7 @@ export const store = createStore(
   )
 )
 
-store.dispatch(loadHomescreenOrder())
+init(store)
+
+export {store}
+export {updateMenuFilters} from './parts/menus'

flux/index.js

@@ -0,0 +1,81 @@
+/**
+ * @flow
+ * Functions to initialize bits of the global state, as appropriate
+ */
+
+import {NetInfo} from 'react-native'
+import {loadLoginCredentials} from '../lib/login'
+import {updateOnlineStatus} from './parts/app'
+import {loadHomescreenOrder} from './parts/homescreen'
+import {
+  setLoginCredentials,
+  logInViaToken,
+  validateLoginCredentials,
+} from './parts/settings'
+import {
+  updateFinancialData,
+  updateMealsRemaining,
+  updateCourses,
+} from './parts/sis'
+import {FINANCIALS_URL} from '../lib/financials/urls'
+
+function homescreen(store) {
+  store.dispatch(loadHomescreenOrder())
+}
+
+function sisLoginCredentials(store) {
+  loadLoginCredentials().then(({username, password}={}) => {
+    if (!username || !password) return
+
+    let action = setLoginCredentials(username, password)
+    store.dispatch(action)
+  })
+}
+
+function checkSisLogin(store) {
+  // check if we can log in to the SIS
+  fetch(FINANCIALS_URL).then(r => {
+    if (r.url !== FINANCIALS_URL) {
+      return
+    }
+    const action = logInViaToken(true)
+    store.dispatch(action)
+  })
+}
+
+function validateOlafCredentials(store) {
+  loadLoginCredentials().then(({username, password}={}) => {
+    const action = validateLoginCredentials(username, password)
+    store.dispatch(action)
+  })
+}
+
+function loadBalances(store) {
+  store.dispatch(updateFinancialData(false, false))
+}
+function loadMeals(store) {
+  store.dispatch(updateMealsRemaining(false, false))
+}
+function loadCourses(store) {
+  store.dispatch(updateCourses(false, false))
+}
+
+function netInfoIsConnected(store) {
+  function updateConnectionStatus(isConnected) {
+    store.dispatch(updateOnlineStatus(isConnected))
+  }
+
+  NetInfo.isConnected.addEventListener('change', updateConnectionStatus)
+  NetInfo.isConnected.fetch().then(updateConnectionStatus)
+}
+
+export function init(store: {dispatch: any}) {
+  homescreen(store)
+  sisLoginCredentials(store)
+  checkSisLogin(store)
+  validateOlafCredentials(store)
+  loadBalances(store)
+  loadMeals(store)
+  loadCourses(store)
+  netInfoIsConnected(store)
+}

flux/init.js

@@ -0,0 +1,37 @@
+/**
+ * @flow
+ * Reducer for app-wide miscallaneous state
+ */
+
+export const PUSH_VIEW = 'app/PUSH_VIEW'
+export const POP_VIEW = 'app/POP_VIEW'
+export const ONLINE_STATUS = 'app/ONLINE_STATUS'
+
+
+export function updateOnlineStatus(status: boolean) {
+  return {type: ONLINE_STATUS, payload: status}
+}
+
+
+const initialAppState = {
+  currentView: null,
+  viewStack: [],
+  isConnected: false,
+}
+
+export function app(state: Object=initialAppState, action: Object) {
+  const {type, payload} = action
+
+  switch (type) {
+    case PUSH_VIEW:
+      return {...state, viewStack: [...state.viewStack, payload]}
+    case POP_VIEW:
+      return {...state, viewStack: state.viewStack.slice(0, -1)}
+
+    case ONLINE_STATUS:
+      return {...state, isConnected: payload}
+
+    default:
+      return state
+  }
+}

flux/parts/app.js

@@ -0,0 +1,66 @@
+/**
+ * @flow
+ * Reducer for state for the homescreen
+ */
+
+import {allViewNames as defaultViewOrder} from '../../views/views'
+import difference from 'lodash/difference'
+import {trackHomescreenOrder} from '../../analytics'
+import * as storage from '../../lib/storage'
+
+
+export const SAVE_HOMESCREEN_ORDER = 'SAVE_HOMESCREEN_ORDER'
+
+
+export const updateViewOrder = (currentOrder: string[], defaultOrder: string[]=defaultViewOrder) => {
+  currentOrder = currentOrder || []
+
+  // lodash/difference: Creates an array of array values _not included_ in the
+  // other given arrays.
+
+  // In case new screens have been added, get a list of the new screens
+  let addedScreens = difference(defaultOrder, currentOrder)
+  // check for removed screens
+  let removedScreens = difference(currentOrder, defaultOrder)
+
+  // add the new screens to the list
+  currentOrder = currentOrder.concat(addedScreens)
+
+  // now we remove the screens that were removed
+  currentOrder = difference(currentOrder, removedScreens)
+
+  return currentOrder
+}
+
+export const loadHomescreenOrder = async () => {
+  // get the saved list from persistent storage
+  let savedOrder = await storage.getHomescreenOrder()
+
+  // update the order, in case new views have been added/removed
+  let order = updateViewOrder(savedOrder, defaultViewOrder)
+
+  // return an action to save it to persistent storage
+  return saveHomescreenOrder(order, {noTrack: true})
+}
+
+export const saveHomescreenOrder = (order: string[], options: {noTrack?: boolean}={}) => {
+  options.noTrack || trackHomescreenOrder(order)
+  storage.setHomescreenOrder(order)
+  return {type: SAVE_HOMESCREEN_ORDER, payload: order}
+}
+
+
+const initialHomescreenState = {
+  order: [],
+}
+export function homescreen(state: Object=initialHomescreenState, action: Object) {
+  const {type, payload} = action
+
+  switch (type) {
+    case SAVE_HOMESCREEN_ORDER: {
+      return {...state, order: payload}
+    }
+    default:
+      return state
+  }
+}