Merge pull request #350 from nickago/MM-1684

MM-1684 Refactored code to remove errors on startup
2015-08-11 12:05:20 -04:00
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -439,7 +439,7 @@ module.exports = React.createClass({
                currentPostDay = utils.getDateForUnixTicks(post.create_at);
                if (currentPostDay.toDateString() != previousPostDay.toDateString()) {
                    postCtls.push(
-                        <div className="date-separator">
+                        <div key={currentPostDay.toDateString()} className="date-separator">
                            <hr className="separator__hr" />
                            <div className="separator__text">{currentPostDay.toDateString()}</div>
                        </div>
@@ -449,7 +449,7 @@ module.exports = React.createClass({
                if (post.create_at > last_viewed && !rendered_last_viewed) {
                    rendered_last_viewed = true;
                    postCtls.push(
-                        <div className="new-separator">
+                        <div key="unviewed" className="new-separator">
                            <hr id="new_message" className="separator__hr" />
                            <div className="separator__text">New Messages</div>
                        </div>
--- a/web/react/components/settings_sidebar.jsx
+++ b/web/react/components/settings_sidebar.jsx
@@ -4,6 +4,7 @@
 var utils = require('../utils/utils.jsx');

 module.exports = React.createClass({
+    displayName:'SettingsSidebar',
    updateTab: function(tab) {
        this.props.updateTab(tab);
        $('.settings-modal').addClass('display--content');
@@ -14,7 +15,7 @@ module.exports = React.createClass({
            <div className="">
                <ul className="nav nav-pills nav-stacked">
                    {this.props.tabs.map(function(tab) {
-                        return <li className={self.props.activeTab == tab.name ? 'active' : ''}><a href="#" onClick={function(){self.updateTab(tab.name);}}><i className={tab.icon}></i>{tab.ui_name}</a></li>
+                        return <li key={tab.name+'_li'} className={self.props.activeTab == tab.name ? 'active' : ''}><a key={tab.name + '_a'} href="#" onClick={function(){self.updateTab(tab.name);}}><i key={tab.name+'_i'} className={tab.icon}></i>{tab.ui_name}</a></li>
                    })}
                </ul>
            </div>
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -87,7 +87,7 @@ var NavbarDropdown = React.createClass({
                }
            });
        }
-        teams.push(<li><a href={utils.getWindowLocationOrigin() + '/signup_team'}>Create a New Team</a></li>);
+        teams.push(<li key='newTeam_li'><a key='newTeam_a' href={utils.getWindowLocationOrigin() + '/signup_team' }>Create a New Team</a></li>);

        return (
            <ul className='nav navbar-nav navbar-right'>
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -4,7 +4,6 @@
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var EventEmitter = require('events').EventEmitter;
 var assign = require('object-assign');
-var client = require('../utils/client.jsx');

 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
@@ -18,244 +17,248 @@ var CHANGE_EVENT_STATUSES = 'change_statuses';

 var UserStore = assign({}, EventEmitter.prototype, {

-    _current_id: null,
+    gCurrentId: null,

-  emitChange: function(userId) {
-    this.emit(CHANGE_EVENT, userId);
-  },
-  addChangeListener: function(callback) {
-    this.on(CHANGE_EVENT, callback);
-  },
-  removeChangeListener: function(callback) {
-    this.removeListener(CHANGE_EVENT, callback);
-  },
-  emitSessionsChange: function() {
-    this.emit(CHANGE_EVENT_SESSIONS);
-  },
-  addSessionsChangeListener: function(callback) {
-    this.on(CHANGE_EVENT_SESSIONS, callback);
-  },
-  removeSessionsChangeListener: function(callback) {
-    this.removeListener(CHANGE_EVENT_SESSIONS, callback);
-  },
-  emitAuditsChange: function() {
-    this.emit(CHANGE_EVENT_AUDITS);
-  },
-  addAuditsChangeListener: function(callback) {
-    this.on(CHANGE_EVENT_AUDITS, callback);
-  },
-  removeAuditsChangeListener: function(callback) {
-    this.removeListener(CHANGE_EVENT_AUDITS, callback);
-  },
-  emitTeamsChange: function() {
-    this.emit(CHANGE_EVENT_TEAMS);
-  },
-  addTeamsChangeListener: function(callback) {
-    this.on(CHANGE_EVENT_TEAMS, callback);
-  },
-  removeTeamsChangeListener: function(callback) {
-    this.removeListener(CHANGE_EVENT_TEAMS, callback);
-  },
-  emitStatusesChange: function() {
-    this.emit(CHANGE_EVENT_STATUSES);
-  },
-  addStatusesChangeListener: function(callback) {
-    this.on(CHANGE_EVENT_STATUSES, callback);
-  },
-  removeStatusesChangeListener: function(callback) {
-    this.removeListener(CHANGE_EVENT_STATUSES, callback);
-  },
-  setCurrentId: function(id) {
-     this._current_id = id;
-     if (id == null) {
-         BrowserStore.removeGlobalItem("current_user_id");
-     } else {
-         BrowserStore.setGlobalItem("current_user_id", id);
-     }
-  },
-  getCurrentId: function(skipFetch) {
-    var current_id = this._current_id;
+    emitChange: function(userId) {
+        this.emit(CHANGE_EVENT, userId);
+    },
+    addChangeListener: function(callback) {
+        this.on(CHANGE_EVENT, callback);
+    },
+    removeChangeListener: function(callback) {
+        this.removeListener(CHANGE_EVENT, callback);
+    },
+    emitSessionsChange: function() {
+        this.emit(CHANGE_EVENT_SESSIONS);
+    },
+    addSessionsChangeListener: function(callback) {
+        this.on(CHANGE_EVENT_SESSIONS, callback);
+    },
+    removeSessionsChangeListener: function(callback) {
+        this.removeListener(CHANGE_EVENT_SESSIONS, callback);
+    },
+    emitAuditsChange: function() {
+        this.emit(CHANGE_EVENT_AUDITS);
+    },
+    addAuditsChangeListener: function(callback) {
+        this.on(CHANGE_EVENT_AUDITS, callback);
+    },
+    removeAuditsChangeListener: function(callback) {
+        this.removeListener(CHANGE_EVENT_AUDITS, callback);
+    },
+    emitTeamsChange: function() {
+        this.emit(CHANGE_EVENT_TEAMS);
+    },
+    addTeamsChangeListener: function(callback) {
+        this.on(CHANGE_EVENT_TEAMS, callback);
+    },
+    removeTeamsChangeListener: function(callback) {
+        this.removeListener(CHANGE_EVENT_TEAMS, callback);
+    },
+    emitStatusesChange: function() {
+        this.emit(CHANGE_EVENT_STATUSES);
+    },
+    addStatusesChangeListener: function(callback) {
+        this.on(CHANGE_EVENT_STATUSES, callback);
+    },
+    removeStatusesChangeListener: function(callback) {
+        this.removeListener(CHANGE_EVENT_STATUSES, callback);
+    },
+    setCurrentId: function(id) {
+        this.gCurrentId = id;
+        if (id == null) {
+            BrowserStore.removeGlobalItem('current_user_id');
+        } else {
+            BrowserStore.setGlobalItem('current_user_id', id);
+        }
+    },
+    getCurrentId: function() {
+        var currentId = this.gCurrentId;

-    if (current_id == null) {
-        current_id = BrowserStore.getGlobalItem("current_user_id");
-    }
+        if (currentId == null) {
+            currentId = BrowserStore.getGlobalItem('current_user_id');
+            this.gCurrentId = currentId;
+        }

-    // this is a speical case to force fetch the
-    // current user if it's missing
-    // it's synchronous to block rendering
-    if (current_id == null && !skipFetch) {
-      var me = client.getMeSynchronous();
-      if (me != null) {
-        this.setCurrentUser(me);
-        current_id = me.id;
-      }
-    }
+        return currentId;
+    },
+    getCurrentUser: function() {
+        if (this.getCurrentId() == null) {
+            return null;
+        }

-    return current_id;
-  },
-  getCurrentUser: function(skipFetch) {
-    if (this.getCurrentId(skipFetch) == null) {
-      return null;
-    }
+        return this._getProfiles()[this.getCurrentId()];
+    },
+    setCurrentUser: function(user) {
+        this.setCurrentId(user.id);
+        this.saveProfile(user);
+    },
+    getLastEmail: function() {
+        return BrowserStore.getItem('last_email', '');
+    },
+    setLastEmail: function(email) {
+        BrowserStore.setItem('last_email', email);
+    },
+    removeCurrentUser: function() {
+        this.setCurrentId(null);
+    },
+    hasProfile: function(userId) {
+        return this._getProfiles()[userId] != null;
+    },
+    getProfile: function(userId) {
+        return this._getProfiles()[userId];
+    },
+    getProfileByUsername: function(username) {
+        return this._getProfilesUsernameMap()[username];
+    },
+    getProfilesUsernameMap: function() {
+        return this._getProfilesUsernameMap();
+    },
+    getProfiles: function() {

-    return this._getProfiles()[this.getCurrentId()];
-  },
-  setCurrentUser: function(user) {
-    this.setCurrentId(user.id);
-    this.saveProfile(user);
-  },
-  getLastEmail: function() {
-      return BrowserStore.getItem("last_email", '');
-  },
-  setLastEmail: function(email) {
-    BrowserStore.setItem("last_email", email);
-  },
-  removeCurrentUser: function() {
-    this.setCurrentId(null);
-  },
-  hasProfile: function(userId) {
-    return this._getProfiles()[userId] != null;
-  },
-  getProfile: function(userId) {
-    return this._getProfiles()[userId];
-  },
-  getProfileByUsername: function(username) {
-    return this._getProfilesUsernameMap()[username];
-  },
-  getProfilesUsernameMap: function() {
-    return this._getProfilesUsernameMap();
-  },
-  getProfiles: function() {
+        return this._getProfiles();
+    },
+    getActiveOnlyProfiles: function() {
+        var active = {};
+        var current = this._getProfiles();

-    return this._getProfiles();
-  },
-  getActiveOnlyProfiles: function() {
-    active = {};
-    current = this._getProfiles();
+        for (var key in current) {
+            if (current[key].delete_at === 0) {
+                active[key] = current[key];
+            }
+        }

-    for (var key in current) {
-      if (current[key].delete_at == 0) {
-        active[key] = current[key];
-      }
-    }
+        return active;
+    },
+    saveProfile: function(profile) {
+        var ps = this._getProfiles();
+        ps[profile.id] = profile;
+        this._storeProfiles(ps);
+    },
+    _storeProfiles: function(profiles) {
+        BrowserStore.setItem('profiles', profiles);
+        var profileUsernameMap = {};
+        for (var id in profiles) {
+            profileUsernameMap[profiles[id].username] = profiles[id];
+        }
+        BrowserStore.setItem('profileUsernameMap', profileUsernameMap);
+    },
+    _getProfiles: function() {
+        return BrowserStore.getItem('profiles', {});
+    },
+    _getProfilesUsernameMap: function() {
+        return BrowserStore.getItem('profileUsernameMap', {});
+    },
+    setSessions: function(sessions) {
+        BrowserStore.setItem('sessions', sessions);
+    },
+    getSessions: function() {
+        return BrowserStore.getItem('sessions', {loading: true});
+    },
+    setAudits: function(audits) {
+        BrowserStore.setItem('audits', audits);
+    },
+    getAudits: function() {
+        return BrowserStore.getItem('audits', {loading: true});
+    },
+    setTeams: function(teams) {
+        BrowserStore.setItem('teams', teams);
+    },
+    getTeams: function() {
+        return BrowserStore.getItem('teams', []);
+    },
+    getCurrentMentionKeys: function() {
+        var user = this.getCurrentUser();

-    return active;
-  },
-  saveProfile: function(profile) {
-    var ps = this._getProfiles();
-    ps[profile.id] = profile;
-    this._storeProfiles(ps);
-  },
-  _storeProfiles: function(profiles) {
-    BrowserStore.setItem("profiles", profiles);
-    var profileUsernameMap = {};
-    for (var id in profiles) {
-        profileUsernameMap[profiles[id].username] = profiles[id];
-    }
-    BrowserStore.setItem("profileUsernameMap", profileUsernameMap);
-  },
-  _getProfiles: function() {
-    return BrowserStore.getItem("profiles", {});
-  },
-  _getProfilesUsernameMap: function() {
-    return BrowserStore.getItem("profileUsernameMap", {});
-  },
-  setSessions: function(sessions) {
-    BrowserStore.setItem("sessions", sessions);
-  },
-  getSessions: function() {
-    return BrowserStore.getItem("sessions", {loading: true});
-  },
-  setAudits: function(audits) {
-    BrowserStore.setItem("audits", audits);
-  },
-  getAudits: function() {
-    return BrowserStore.getItem("audits", {loading: true});
-  },
-  setTeams: function(teams) {
-    BrowserStore.setItem("teams", teams);
-  },
-  getTeams: function() {
-    return BrowserStore.getItem("teams", []);
-  },
-  getCurrentMentionKeys: function() {
-    var user = this.getCurrentUser();
+        var keys = [];

-    var keys = [];
+        if (!user || !user.notify_props) {
+            return keys;
+        }
+
+        if (user.notify_props.mention_keys) {
+            keys = keys.concat(user.notify_props.mention_keys.split(','));
+        }
+
+        if (user.notify_props.first_name === 'true' && user.first_name) {
+            keys.push(user.first_name);
+        }
+
+        if (user.notify_props.all === 'true') {
+            keys.push('@all');
+        }
+
+        if (user.notify_props.channel === 'true') {
+            keys.push('@channel');
+        }

-    if (!user)
        return keys;
-
-    if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(','));
-    if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name);
-    if (user.notify_props.all === "true") keys.push('@all');
-    if (user.notify_props.channel === "true") keys.push('@channel');
-
-    return keys;
-  },
-  getLastVersion: function() {
-    return BrowserStore.getItem("last_version", '');
-  },
-  setLastVersion: function(version) {
-    BrowserStore.setItem("last_version", version);
-  },
-  setStatuses: function(statuses) {
-    this._setStatuses(statuses);
-    this.emitStatusesChange();
-  },
-  _setStatuses: function(statuses) {
-    BrowserStore.setItem("statuses", statuses);
-  },
-  setStatus: function(user_id, status) {
-    var statuses = this.getStatuses();
-    statuses[user_id] = status;
-    this._setStatuses(statuses);
-    this.emitStatusesChange();
-  },
-  getStatuses: function() {
-    return BrowserStore.getItem("statuses", {});
-  },
-  getStatus: function(id) {
-    return this.getStatuses()[id];
-  }
+    },
+    getLastVersion: function() {
+        return BrowserStore.getItem('last_version', '');
+    },
+    setLastVersion: function(version) {
+        BrowserStore.setItem('last_version', version);
+    },
+    setStatuses: function(statuses) {
+        this._setStatuses(statuses);
+        this.emitStatusesChange();
+    },
+    _setStatuses: function(statuses) {
+        BrowserStore.setItem('statuses', statuses);
+    },
+    setStatus: function(userId, status) {
+        var statuses = this.getStatuses();
+        statuses[userId] = status;
+        this._setStatuses(statuses);
+        this.emitStatusesChange();
+    },
+    getStatuses: function() {
+        return BrowserStore.getItem('statuses', {});
+    },
+    getStatus: function(id) {
+        return this.getStatuses()[id];
+    }
 });

 UserStore.dispatchToken = AppDispatcher.register(function(payload) {
-  var action = payload.action;
+    var action = payload.action;

-  switch(action.type) {
-    case ActionTypes.RECIEVED_PROFILES:
-      for(var id in action.profiles) {
-        // profiles can have incomplete data, so don't overwrite current user
-        if (id === UserStore.getCurrentId()) continue;
-        var profile = action.profiles[id];
-        UserStore.saveProfile(profile);
-        UserStore.emitChange(profile.id);
-      }
-      break;
-    case ActionTypes.RECIEVED_ME:
-      UserStore.setCurrentUser(action.me);
-      UserStore.emitChange(action.me.id);
-      break;
-    case ActionTypes.RECIEVED_SESSIONS:
-      UserStore.setSessions(action.sessions);
-      UserStore.emitSessionsChange();
-      break;
-    case ActionTypes.RECIEVED_AUDITS:
-      UserStore.setAudits(action.audits);
-      UserStore.emitAuditsChange();
-      break;
-    case ActionTypes.RECIEVED_TEAMS:
-      UserStore.setTeams(action.teams);
-      UserStore.emitTeamsChange();
-      break;
-    case ActionTypes.RECIEVED_STATUSES:
-      UserStore._setStatuses(action.statuses);
-      UserStore.emitStatusesChange();
-      break;
+    switch (action.type) {
+        case ActionTypes.RECIEVED_PROFILES:
+            for (var id in action.profiles) {
+                // profiles can have incomplete data, so don't overwrite current user
+                if (id === UserStore.getCurrentId()) {
+                    continue;
+                }
+                var profile = action.profiles[id];
+                UserStore.saveProfile(profile);
+                UserStore.emitChange(profile.id);
+            }
+            break;
+        case ActionTypes.RECIEVED_ME:
+            UserStore.setCurrentUser(action.me);
+            UserStore.emitChange(action.me.id);
+            break;
+        case ActionTypes.RECIEVED_SESSIONS:
+            UserStore.setSessions(action.sessions);
+            UserStore.emitSessionsChange();
+            break;
+        case ActionTypes.RECIEVED_AUDITS:
+            UserStore.setAudits(action.audits);
+            UserStore.emitAuditsChange();
+            break;
+        case ActionTypes.RECIEVED_TEAMS:
+            UserStore.setTeams(action.teams);
+            UserStore.emitTeamsChange();
+            break;
+        case ActionTypes.RECIEVED_STATUSES:
+            UserStore._setStatuses(action.statuses);
+            UserStore.emitStatusesChange();
+            break;

-    default:
-  }
+        default:
+    }
 });

 UserStore.setMaxListeners(0);
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -322,7 +322,7 @@ module.exports.getMe = function() {
    if (isCallInProgress("getMe")) return;

    callTracker["getMe"] = utils.getTimestamp();
-    client.getMeSynchronous(
+    client.getMe(
        function(data, textStatus, xhr) {
            callTracker["getMe"] = 0;

--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -279,32 +279,24 @@ module.exports.getAudits = function(userId, success, error) {
    });
 };

-module.exports.getMeSynchronous = function(success, error) {
-
-    var current_user = null;
+module.exports.getMe = function(success, error) {

    $.ajax({
-        async: false,
        url: "/api/v1/users/me",
        dataType: 'json',
        contentType: 'application/json',
        type: 'GET',
-        success: function(data, textStatus, xhr) {
-            current_user = data;
-            if (success) success(data, textStatus, xhr);
-        },
+        success: success,
        error: function(xhr, status, err) {
            var ieChecker = window.navigator.userAgent; // This and the condition below is used to check specifically for browsers IE10 & 11 to suppress a 200 'OK' error from appearing on login
            if (xhr.status != 200 || !(ieChecker.indexOf("Trident/7.0") > 0 || ieChecker.indexOf("Trident/6.0") > 0)) {
                if (error) {
-                    e = handleError("getMeSynchronous", xhr, status, err);
+                    e = handleError("getMe", xhr, status, err);
                    error(e);
                };
            };
        }
    });
-
-    return current_user;
 };

 module.exports.inviteMembers = function(data, success, error) {