Merge branch 'master' into approved-comments-queue

client/coral-embed-stream/src/containers/Embed.js

@@ -3,6 +3,8 @@ import {compose, gql, graphql} from 'react-apollo';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import isEqual from 'lodash/isEqual';
+import branch from 'recompose/branch';
+import renderComponent from 'recompose/renderComponent';
 
 import {Spinner} from 'coral-ui';
 import {authActions, assetActions, pym} from 'coral-framework';
@@ -19,7 +21,6 @@ class EmbedContainer extends React.Component {
 
   componentDidMount() {
     pym.sendMessage('childReady');
-    this.props.checkLogin();
   }
 
   componentWillReceiveProps(nextProps) {
@@ -108,6 +109,10 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
+  branch(
+    props => !props.auth.checkedInitialLogin,
+    renderComponent(Spinner),
+  ),
   withQuery,
 )(EmbedContainer);
 

client/coral-embed-stream/src/containers/Stream.js

@@ -118,7 +118,9 @@ class StreamContainer extends React.Component {
   };
 
   componentDidMount() {
-    this.props.data.refetch();
+    if (this.props.previousTab) {
+      this.props.data.refetch();
+    }
     this.countPoll = setInterval(() => {
       const {asset} = this.props.root;
       this.getCounts({
@@ -236,6 +238,7 @@ const mapStateToProps = state => ({
   assetId: state.stream.assetId,
   assetUrl: state.stream.assetUrl,
   activeTab: state.embed.activeTab,
+  previousTab: state.embed.previousTab,
 });
 
 const mapDispatchToProps = dispatch =>

client/coral-embed-stream/src/index.js

@@ -3,6 +3,7 @@ import {render} from 'react-dom';
 import {ApolloProvider} from 'react-apollo';
 
 import {client} from 'coral-framework/services/client';
+import {checkLogin} from 'coral-framework/actions/auth';
 
 import reducers from './reducers';
 import localStore, {injectReducers} from 'coral-framework/services/store';
@@ -12,6 +13,11 @@ injectReducers(reducers);
 
 const store = (window.opener && window.opener.coralStore) ? window.opener.coralStore : localStore;
 
+// Don't run this in the popup.
+if (store === localStore) {
+  store.dispatch(checkLogin());
+}
+
 render(
   <ApolloProvider client={client} store={store}>
     <AppRouter />

client/coral-embed-stream/src/reducers/embed.js

@@ -2,6 +2,7 @@ import * as actions from '../constants/embed';
 
 const initialState = {
   activeTab: 'stream',
+  previousTab: '',
 };
 
 export default function stream(state = initialState, action) {
@@ -10,6 +11,7 @@ export default function stream(state = initialState, action) {
     return {
       ...state,
       activeTab: action.tab,
+      previousTab: state.activeTab,
     };
   default:
     return state;

client/coral-framework/reducers/auth.js

@@ -8,6 +8,7 @@ const initialState = Map({
   user: null,
   showSignInDialog: false,
   showCreateUsernameDialog: false,
+  checkedInitialLogin: false,
   view: 'SIGNIN',
   error: '',
   passwordRequestSuccess: null,
@@ -71,10 +72,12 @@ export default function auth (state = initialState, action) {
       .set('isLoading', true);
   case actions.CHECK_LOGIN_FAILURE:
     return state
+      .set('checkedInitialLogin', true)
       .set('loggedIn', false)
       .set('user', null);
   case actions.CHECK_LOGIN_SUCCESS:
     return state
+      .set('checkedInitialLogin', true)
       .set('loggedIn', true)
       .set('isAdmin', action.isAdmin)
       .set('user', purge(action.user));
@@ -114,7 +117,11 @@ export default function auth (state = initialState, action) {
       .set('isLoading', false)
       .set('successSignUp', true);
   case actions.LOGOUT_SUCCESS:
-    return initialState;
+    return state
+      .set('user', null)
+      .set('isLoading', false)
+      .set('loggedIn', false)
+      .set('isAdmin', false);
   case actions.INVALID_FORM:
     return state
       .set('error', action.error);