Merge pull request #372 from mapbox/develop

v0.60.0 release

Author: willemarcel

CHANGELOG.md

@@ -2,11 +2,36 @@
 
 Log of changes since the 2.0 version
 
-### Next release
 
-- Add Mapping Team filters
-- Show some details we have on the database about deleted users
+### 0.60.0
 
+- disable logout when requests fails
+- adjust status modal position
+
+### 0.58.2
+
+- Add solution to filter out changesets newer than 5 minutes on the API request
+
+### 0.58.0
+
+- Exclude changesets newer than 5 minutes from query results
+- Change position of status notification
+- Show unverified teams and add string to distinct the verified ones on the filters page
+
+### 0.56.2
+
+- Add system status modal
+
+### 0.56.1
+
+- Update changeset-map to 1.3.4
+
+### 0.56.0
+
+- Show some stats of a deleted user on the changeset user panel
+- Add Mapping Team filter fields
+- Add forms to allow the creation and management of Mapping Teams
+- Code linting and text improvements
 
 ### 0.54.1
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osmcha-frontend",
-  "version": "0.58.2",
+  "version": "0.60.0",
   "license": "ISC",
   "engines": {
     "node": ">=7.0"

src/components/changeset/header.js

@@ -22,11 +22,20 @@ class Header extends React.PureComponent {
     const create = this.props.properties.get('create');
     const modify = this.props.properties.get('modify');
     const destroy = this.props.properties.get('delete');
-    const is_whitelisted = this.props.whitelisted.indexOf(user) !== -1;
-    const is_blacklisted =
-      this.props.blacklisted
-        .map(user => user.get('uid'))
-        .indexOf(this.props.properties.get('uid')) !== -1;
+    let is_whitelisted, is_blacklisted;
+    try {
+      is_whitelisted = this.props.whitelisted.indexOf(user) !== -1;
+    } catch (e) {
+      is_whitelisted = false;
+    }
+    try {
+      is_blacklisted =
+        this.props.blacklisted
+          .map(user => user.get('uid'))
+          .indexOf(this.props.properties.get('uid')) !== -1;
+    } catch (e) {
+      is_blacklisted = false;
+    }
 
     return (
       <div className="px12 py6">
@@ -62,10 +71,10 @@ class Header extends React.PureComponent {
               )}
               {this.props.userEditCount > 0 && (
                 <span className="txt-s txt-em">
-                  &nbsp;({this.props.userEditCount} edits)&nbsp;
+                  &nbsp;({this.props.userEditCount} edits)
                 </span>
               )}
-              created&nbsp;{moment(date).fromNow()}
+              &nbsp;created&nbsp;{moment(date).fromNow()}
             </span>
           </div>
         </div>

src/network/aoi.js

@@ -20,6 +20,9 @@ export function handleErrors(response: Object) {
           'Authentication error. Sign in again and repeat the operation.'
         );
       }
+      if (response.status === 404) {
+        throw new Error('Resource not found.');
+      }
       if (r && r.detail) throw new Error(r.detail);
       if (response.statusText) throw new Error(response.statusText);
       return Promise.reject('network request failed');

src/store/auth_actions.js

@@ -1,6 +1,7 @@
 // @flow
 import { put, call, take, select, all, takeLatest } from 'redux-saga/effects';
 import { delay as delayPromise } from 'redux-saga';
+import { push } from 'react-router-redux';
 import { fromJS } from 'immutable';
 
 import {
@@ -49,6 +50,9 @@ export const logUserOut = () => action(AUTH.logout);
 
 export const tokenSelector = (state: RootStateType) => state.auth.get('token');
 
+export const locationSelector = (state: RootStateType) =>
+  state.routing.location;
+
 export const changesetIdSelector = (state: RootStateType) =>
   state.changeset.get('changesetId');
 
@@ -114,43 +118,57 @@ export function* watchAuth(): any {
             description: status.get('message'),
             kind: status.get('status'),
             autoDismiss: 20,
-            position: 'br'
+            position: 'bc'
           })
         );
       }
 
       yield take(AUTH.logout);
       delayBy = DELAY;
+      token = undefined;
+      yield call(logoutFlow);
+      yield call(delay, delayBy);
     } catch (error) {
       console.log(error);
       yield put(action(AUTH.loginError, error));
       yield call(delay, delayBy / 2);
-      error.name = 'Login Failed';
+      error.name = 'Error';
       yield put(
         modal({
           error,
           kind: 'warning'
         })
       );
+      yield take(AUTH.logout);
       delayBy = 4 * delayBy;
-    } finally {
       token = undefined;
-      yield call(removeItem, 'token');
-      yield call(removeItem, 'oauth_token');
-      yield call(removeItem, 'oauth_token_secret');
-      yield put(action(AUTH.clearSession));
-      yield put(action(WHITELIST.clear));
-      // get CHANGESET_PAGE without user metadata
-      let pageIndex = yield select(pageIndexSelector);
-      if (pageIndex) {
-        yield put(action(CHANGESETS_PAGE.fetch, { pageIndex }));
-      }
-      yield put(action(AUTH.clearUserDetails));
+      yield call(logoutFlow);
       yield call(delay, delayBy);
     }
   }
 }
 
+export function* logoutFlow(): any {
+  yield call(removeItem, 'token');
+  yield call(removeItem, 'oauth_token');
+  yield call(removeItem, 'oauth_token_secret');
+  yield put(action(AUTH.clearSession));
+  yield put(action(WHITELIST.clear));
+  // get CHANGESET_PAGE without user metadata
+  let pageIndex = yield select(pageIndexSelector);
+  if (pageIndex) {
+    yield put(action(CHANGESETS_PAGE.fetch, { pageIndex }));
+  }
+  yield put(action(AUTH.clearUserDetails));
+  let location = yield select(locationSelector);
+  yield put(
+    push({
+      ...location,
+      pathname: '/'
+    })
+  );
+}
+
 export function* authTokenFlow(): any {
   const { oauth_token, oauth_token_secret } = yield call(postTokensOSMCha);
   yield put(