Merge remote-tracking branch 'upstream/master' into log_id

.eslintrc.js

@@ -10,8 +10,8 @@ module.exports = {
   },
   rules: {
     'camelcase': 0,
-    'class-methods-use-this': 'warn',
-    'default-case': 'warn',
+    'class-methods-use-this': 0,
+    'default-case': 'error',
     'import/prefer-default-export': 0,
     'import/no-named-as-default': 0,
     'react/destructuring-assignment': 0,
@@ -28,15 +28,15 @@ module.exports = {
     'react/require-default-props': 0,
     'react/sort-comp': 0,
     'max-len': 0,
-    'no-await-in-loop': 'warn',
-    'no-case-declarations': 'warn',
+    'no-await-in-loop': 'error',
+    'no-case-declarations': 'error',
     'no-console': 0,
     'no-else-return': 0,
-    'no-empty': 'warn',
+    'no-empty': 'error',
     'no-multi-spaces': ['error', {
       ignoreEOLComments: true,
     }],
-    'no-nested-ternary': 'warn',
+    'no-nested-ternary': 0,
     'no-plusplus': [
       'error',
       {
@@ -49,7 +49,7 @@ module.exports = {
     'no-unused-vars': ['error', {
       args: 'none',
     }],
-    'no-use-before-define': 'warn',
+    'no-use-before-define': 'error',
     'object-curly-newline': [
       'error',
       {

.gitignore

@@ -23,6 +23,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+settings.json
 
 npm-debug.log*
 yarn-debug.log*

src/actions/cached.js

@@ -80,6 +80,26 @@ async function getCacheDB() {
   });
 }
 
+async function expireCacheItems(store) {
+  const db = await getCacheDB();
+  if (!db) {
+    return;
+  }
+
+  const transaction = db.transaction([store], 'readwrite');
+  const objStore = transaction.objectStore(store);
+
+  const idx = IDBKeyRange.upperBound(Math.floor(Date.now() / 1000));
+  const req = objStore.index('expiry').openCursor(idx);
+  req.onsuccess = (ev) => {
+    const cursor = ev.target.result;
+    if (cursor) {
+      objStore.delete(cursor.primaryKey);
+      cursor.continue();
+    }
+  };
+}
+
 async function getCacheItem(store, key, version = undefined) {
   if (!hasExpired) {
     setTimeout(() => expireCacheItems(store), 5000); // TODO: better expire time
@@ -125,26 +145,6 @@ async function setCacheItem(store, key, expiry, data, version = undefined) {
   });
 }
 
-async function expireCacheItems(store) {
-  const db = await getCacheDB();
-  if (!db) {
-    return;
-  }
-
-  const transaction = db.transaction([store], 'readwrite');
-  const objStore = transaction.objectStore(store);
-
-  const idx = IDBKeyRange.upperBound(Math.floor(Date.now() / 1000));
-  const req = objStore.index('expiry').openCursor(idx);
-  req.onsuccess = (ev) => {
-    const cursor = ev.target.result;
-    if (cursor) {
-      objStore.delete(cursor.primaryKey);
-      cursor.continue();
-    }
-  };
-}
-
 function parseEvents(route, driveEvents) {
   // sort events
   driveEvents.sort((a, b) => {
@@ -342,13 +342,6 @@ export function fetchEvents(route) {
   };
 }
 
-export function fetchLocations(route) {
-  return (dispatch, getState) => {
-    dispatch(fetchCoord(route, [route.start_lng, route.start_lat], 'startLocation'));
-    dispatch(fetchCoord(route, [route.end_lng, route.end_lat], 'endLocation'));
-  };
-}
-
 export function fetchCoord(route, coord, locationKey) {
   return async (dispatch, getState) => {
     const state = getState();
@@ -415,6 +408,13 @@ export function fetchCoord(route, coord, locationKey) {
   };
 }
 
+export function fetchLocations(route) {
+  return (dispatch, getState) => {
+    dispatch(fetchCoord(route, [route.start_lng, route.start_lat], 'startLocation'));
+    dispatch(fetchCoord(route, [route.end_lng, route.end_lat], 'endLocation'));
+  };
+}
+
 export function fetchDriveCoords(route) {
   return async (dispatch, getState) => {
     const state = getState();

src/actions/files.js

@@ -268,6 +268,7 @@ export function doUpload(dongleId, fileNames, paths, urls) {
           params: [paths[i], urls[i], { 'x-ms-blob-type': 'BlockBlob' }],
           expiry: Math.floor(Date.now() / 1000) + (86400 * 7),
         };
+        // eslint-disable-next-line no-await-in-loop
         const resp = await athenaCall(dongleId, payload, 'files_actions_athena_upload');
         if (!resp || resp.error) {
           const uploading = {};