Merge pull request #1079 from hmhealey/initprefs

Added an initial call to get all user preferences on page load

5 files changed, 25 insertions, 13 deletions

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 7a209de2b..89506c028 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -132,11 +132,7 @@ export default class Sidebar extends React.Component {
         SocketStore.addChangeListener(this.onSocketChange);
         PreferenceStore.addChangeListener(this.onChange);
 
-        AsyncClient.getDirectChannelPreferences();
-
-        if ($(window).width() > 768) {
-            $('.nav-pills__container').perfectScrollbar();
-        }
+        $('.nav-pills__container').perfectScrollbar();
 
         this.updateTitle();
         this.updateUnreadIndicators();
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index d9b78dada..20ed1bf0a 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -37,6 +37,7 @@ var RegisterAppModal = require('../components/register_app_modal.jsx');
 var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
 var TeamStore = require('../stores/team_store.jsx');
 
+var AsyncClient = require('../utils/async_client.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
@@ -54,6 +55,8 @@ function setupChannelPage(props) {
         id: props.TeamId
     });
 
+    AsyncClient.getAllPreferences();
+
     // ChannelLoader must be rendered first
     ReactDOM.render(
         <ChannelLoader/>,
diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx
index d71efa10f..f630d150d 100644
--- a/web/react/stores/preference_store.jsx
+++ b/web/react/stores/preference_store.jsx
@@ -120,3 +120,4 @@ class PreferenceStoreClass extends EventEmitter {
 
 const PreferenceStore = new PreferenceStoreClass();
 export default PreferenceStore;
+window.PreferenceStore = PreferenceStore;
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 1bf8a6fee..b22d7237e 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -638,16 +638,15 @@ export function getMyTeam() {
     );
 }
 
-export function getDirectChannelPreferences() {
-    if (isCallInProgress('getDirectChannelPreferences')) {
+export function getAllPreferences() {
+    if (isCallInProgress('getAllPreferences')) {
         return;
     }
 
-    callTracker.getDirectChannelPreferences = utils.getTimestamp();
-    client.getPreferenceCategory(
-        Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
+    callTracker.getAllPreferences = utils.getTimestamp();
+    client.getAllPreferences(
         (data, textStatus, xhr) => {
-            callTracker.getDirectChannelPreferences = 0;
+            callTracker.getAllPreferences = 0;
 
             if (xhr.status === 304 || !data) {
                 return;
@@ -659,8 +658,8 @@ export function getDirectChannelPreferences() {
             });
         },
         (err) => {
-            callTracker.getDirectChannelPreferences = 0;
-            dispatchError(err, 'getDirectChannelPreferences');
+            callTracker.getAllPreferences = 0;
+            dispatchError(err, 'getAllPreferences');
         }
     );
 }
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 76a402855..f6aee362c 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -1142,6 +1142,19 @@ export function listIncomingHooks(success, error) {
     });
 }
 
+export function getAllPreferences(success, error) {
+    $.ajax({
+        url: `/api/v1/preferences/`,
+        dataType: 'json',
+        type: 'GET',
+        success,
+        error: (xhr, status, err) => {
+            var e = handleError('getAllPreferences', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
 export function getPreferenceCategory(category, success, error) {
     $.ajax({
         url: `/api/v1/preferences/${category}`,