bugfixes (fix #260 fix #241 fix #188 fix #233 fix #231 fix #119)

package.json

@@ -80,7 +80,7 @@
     "babel-runtime": "6.11.6",
     "bcrypt": "^0.8.7",
     "body-parser": "1.15.2",
-    "cashay": "^0.20.1",
+    "cashay": "^0.20.6",
     "cheerio": "^0.20.0",
     "compression": "1.6.2",
     "cors": "2.7.1",

src/universal/components/Dashboard/DashSidebar.js

@@ -50,6 +50,7 @@ styles = StyleSheet.create({
     backgroundColor: theme.palette.mid,
     color: textColor,
     minWidth: layoutStyle.dashSidebarWidth,
+    maxWidth: layoutStyle.dashSidebarWidth,
     paddingBottom: '1.25rem'
   },
 
@@ -64,6 +65,7 @@ styles = StyleSheet.create({
 
   navLabel: {
     borderTop: '1px solid rgba(255, 255, 255, .5)',
+    cursor: 'default',
     fontSize: theme.typography.s2,
     fontWeight: 700,
     marginLeft: '1rem',

src/universal/components/NotificationBar/NotificationBar.js

@@ -48,10 +48,7 @@ const NotificationBar = (props) => {
 
 
 NotificationBar.propTypes = {
-  activeMeetings: PropTypes.arrayOf({
-    link: PropTypes.string,
-    name: PropTypes.string
-  })
+  activeMeetings: PropTypes.array
 };
 
 styles = StyleSheet.create({

src/universal/containers/Logout/LogoutContainer.js

@@ -5,6 +5,7 @@ import {removeAuthToken} from 'universal/redux/authDuck';
 import {reset as resetAppState} from 'universal/redux/rootDuck';
 import {withRouter} from 'react-router';
 import {segmentEvent} from 'universal/redux/segmentActions';
+import {cashay} from 'cashay';
 
 const logoutSuccess = {
   title: 'Tootles!',
@@ -28,6 +29,7 @@ export default class LogoutContainer extends Component {
     dispatch(resetAppState());
     dispatch(showSuccess(logoutSuccess));
     dispatch(segmentEvent('User Logout'));
+    cashay.clear();
     if (typeof window !== 'undefined' && typeof window.analytics !== 'undefined') {
       // inform segment of the logout, wipe state:
       window.analytics.reset();

src/universal/containers/StandardHub/StandardHubContainer.js

@@ -1,12 +1,14 @@
 import React, {PropTypes} from 'react';
 import {cashay} from 'cashay';
-import {getAuthQueryString, authedOptions} from 'universal/redux/getAuthedUser';
+import {getAuthQueryString, getAuthedOptions} from 'universal/redux/getAuthedUser';
 import {connect} from 'react-redux';
 import StandardHub from 'universal/components/StandardHub/StandardHub';
 
-const mapStateToProps = () => {
+const mapStateToProps = (state) => {
+  const userId = state.auth.obj.sub;
+  const {user} = cashay.query(getAuthQueryString, getAuthedOptions(userId)).data;
   return {
-    user: cashay.query(getAuthQueryString, authedOptions).data.user
+    user
   };
 };
 

src/universal/decorators/loginWithToken/loginWithToken.js

@@ -1,20 +1,21 @@
 import React, {PropTypes} from 'react';
-import {getAuthQueryString, authedOptions} from 'universal/redux/getAuthedUser';
+import {getAuthQueryString, getAuthedOptions} from 'universal/redux/getAuthedUser';
 import {cashay} from 'cashay';
 import {connect} from 'react-redux';
 import {withRouter} from 'react-router';
 
 const mapStateToProps = state => {
+  const auth = state.auth.obj;
   return {
     auth: state.auth.obj,
-    user: cashay.query(getAuthQueryString, authedOptions).data.user
+    user: cashay.query(getAuthQueryString, getAuthedOptions(auth.sub)).data.user
   };
 };
 
 export default ComposedComponent => {
   const TokenizedComp = (props) => {
-    const {auth, user, router} = props;
-    if (auth.sub && user) {
+    const {auth, router} = props;
+    if (auth.sub) {
       // note if you join a team & leave it, tms will be an empty array
       const isNew = !auth.hasOwnProperty('tms');
       if (isNew) {
@@ -28,12 +29,6 @@ export default ComposedComponent => {
 
   TokenizedComp.propTypes = {
     auth: PropTypes.object,
-    user: PropTypes.shape({
-      email: PropTypes.string,
-      id: PropTypes.string,
-      picture: PropTypes.string,
-      preferredName: PropTypes.string
-    }),
     router: PropTypes.object.isRequired
   };
 

src/universal/decorators/requireAuthAndRole/requireAuthAndRole.js

@@ -1,6 +1,6 @@
 import React, {Component, PropTypes} from 'react';
 import {showError} from 'universal/modules/notifications/ducks/notifications';
-import {getAuthQueryString, authedOptions} from 'universal/redux/getAuthedUser';
+import {getAuthQueryString, getAuthedOptions} from 'universal/redux/getAuthedUser';
 import {cashay} from 'cashay';
 import {connect} from 'react-redux';
 import {withRouter} from 'react-router';
@@ -16,10 +16,10 @@ const unauthenticated = {
 };
 
 const mapStateToProps = state => {
-  const user = cashay.query(getAuthQueryString, authedOptions).data.user;
+  const userId = state.auth.obj.sub;
   return {
     auth: state.auth.obj,
-    user
+    user: cashay.query(getAuthQueryString, getAuthedOptions(userId)).data.user
   };
 };
 

src/universal/decorators/socketWithPresence/socketWithPresence.js

@@ -4,29 +4,13 @@ import {reduxSocket} from 'redux-socket-cluster';
 import {cashay} from 'cashay';
 import requireAuth from 'universal/decorators/requireAuth/requireAuth';
 import reduxSocketOptions from 'universal/redux/reduxSocketOptions';
-import {PRESENCE} from 'universal/subscriptions/constants';
+import {PRESENCE, TEAM_MEMBERS} from 'universal/subscriptions/constants';
 import socketCluster from 'socketcluster-client';
 import presenceSubscriber from 'universal/subscriptions/presenceSubscriber';
 
-
-const presenceSubQuery = `
-query {
-  presence(teamId: $teamId) @live {
-    id
-    userId
-    editing
-  }
-}`;
-
-const mapStateToProps = (state, props) => {
-  const {params: {teamId}} = props;
+const mapStateToProps = (state) => {
   return {
-    presence: cashay.query(presenceSubQuery, {
-      op: 'socketWithPresence',
-      key: teamId,
-      variables: {teamId},
-      subscriber: {presence: presenceSubscriber}
-    })
+    tms: state.auth.obj.tms
   };
 };
 
@@ -40,19 +24,30 @@ export default ComposedComponent => {
       dispatch: PropTypes.func,
       params: PropTypes.shape({
         teamId: PropTypes.string
-      })
+      }),
+      tms: PropTypes.array
     };
 
     constructor(props) {
       super(props);
+      const {params, tms} = props;
+      const teamIds = params.teamId ? [params.teamId] : tms;
+      if (!teamIds) {
+        throw new Error(`Did not finish the welcome wizard! ${params} ${tms}`);
+        // TODO redirect?
+      }
       const socket = socketCluster.connect();
-      socket.on('subscribe', channelName => {
-        const {teamId} = props.params;
-        if (channelName === `${PRESENCE}/${teamId}`) {
-          const options = {variables: {teamId}};
-          cashay.mutate('soundOff', options);
-        }
-      });
+      for (let i = 0; i < teamIds.length; i++) {
+        const teamId = teamIds[i];
+        cashay.subscribe(PRESENCE, teamId, presenceSubscriber);
+        cashay.subscribe(TEAM_MEMBERS, teamId);
+        socket.on('subscribe', channelName => {
+          if (channelName === `${PRESENCE}/${teamId}`) {
+            const options = {variables: {teamId}};
+            cashay.mutate('soundOff', options);
+          }
+        });
+      }
     }
 
     render() {

src/universal/modules/invitation/containers/Invitation/Invitation.js

@@ -6,7 +6,7 @@ import LoadingView from 'universal/components/LoadingView/LoadingView';
 import {withRouter} from 'react-router';
 import {showError, showSuccess, showWarning} from 'universal/modules/notifications/ducks/notifications';
 import {setAuthToken} from 'universal/redux/authDuck';
-import {getAuthQueryString, authedOptions} from 'universal/redux/getAuthedUser';
+import {getAuthQueryString, getAuthedOptions} from 'universal/redux/getAuthedUser';
 import {setWelcomeActivity} from 'universal/modules/userDashboard/ducks/settingsDuck';
 import jwtDecode from 'jwt-decode';
 import {
@@ -18,10 +18,11 @@ import {
 
 const mapStateToProps = (state, props) => {
   const {params: {id}} = props;
+  const auth = state.auth.obj;
   return {
-    auth: state.auth.obj,
+    auth,
     inviteToken: id,
-    user: cashay.query(getAuthQueryString, authedOptions).data.user
+    user: cashay.query(getAuthQueryString, getAuthedOptions(auth.sub))
   };
 };
 

src/universal/modules/meeting/components/Sidebar/Sidebar.js

@@ -55,7 +55,7 @@ const Sidebar = (props) => {
         <a className={s.brandLink} onClick={handleLogoClick}>
           <img className={s.brandLogo} src={actionUIMark}/>
         </a>
-        <div className={s.teamName}>{teamName}</div>
+        <Link className={s.teamName} to={`/team/${teamId}`}>{teamName}</Link>
         <a className={s.shortUrl} href="/meetingLayout/lobby">{shortUrl}</a>
         {/* TODO: make me respond to props */}
       </div>
@@ -233,6 +233,7 @@ s = StyleSheet.create({
 
   teamName: {
     color: theme.palette.cool,
+    cursor: 'pointer',
     fontFamily: theme.typography.serif,
     fontSize: theme.typography.s5,
     fontStyle: 'italic',

src/universal/modules/meeting/containers/MeetingContainer/MeetingContainer.js

@@ -28,6 +28,8 @@ import {
 } from 'universal/utils/constants';
 import MeetingAgendaFirstCall from 'universal/modules/meeting/components/MeetingAgendaFirstCall/MeetingAgendaFirstCall';
 import MeetingAgendaLastCallContainer from 'universal/modules/meeting/containers/MeetingAgendaLastCall/MeetingAgendaLastCallContainer';
+import {TEAMS} from 'universal/subscriptions/constants';
+
 
 const resolveMeetingMembers = (queryData, userId) => {
   if (queryData !== resolveMeetingMembers.queryData) {
@@ -116,7 +118,7 @@ export default class MeetingContainer extends Component {
     const {localPhaseItem, params, router, team} = props;
     const {localPhase} = params;
     // subscribe to all teams, but don't do anything with that open subscription
-    cashay.subscribe('teams');
+    cashay.subscribe(TEAMS);
     handleRedirects(team, localPhase, localPhaseItem, router);
   }
 

src/universal/modules/teamDashboard/components/AgendaItem/AgendaItem.js

@@ -64,6 +64,9 @@ s = StyleSheet.create({
     },
     ':focus': {
       backgroundColor: theme.palette.dark20l
+    },
+    ':hover > div': {
+      opacity: 1
     }
   },
 
@@ -77,8 +80,10 @@ s = StyleSheet.create({
     cursor: 'pointer',
     left: '1.25rem',
     // paddingTop: '1px',
+    opacity: 0,
     position: 'absolute',
-    top: '.5rem'
+    top: '.5rem',
+    transition: 'opacity .1s ease-in'
   },
 
   desc: {

src/universal/modules/teamDashboard/components/TeamProjectCard/OutcomeCardTextarea.js

@@ -20,7 +20,7 @@ let styles = {};
 export default class OutcomeCardTextArea extends Component {
   static propTypes = {
     doFocus: PropTypes.bool,
-    editingStatus: PropTypes.string,
+    editingStatus: PropTypes.any,
     handleActive: PropTypes.func,
     handleSubmit: PropTypes.func,
     input: PropTypes.object,

src/universal/modules/userDashboard/components/UserActionList/UserActionList.js

@@ -6,7 +6,7 @@ const UserActionList = (props) => {
   const {actions} = props;
   return (
     <div className={styles.root}>
-      {actions.map(item => <div key={`action${item.id}`}>{item.content}</div>)}
+      {actions.map(item => <div key={`action${item.id}`}>{item.content} - {item.updatedAt.toString()}</div>)}
     </div>
   );
 };