Merge pull request #1978 from hmhealey/plt1484

PLT-1484 Changed first preference load to be done synchronously

1 files changed, 12 insertions, 9 deletions

diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx
index 79eab4fe1..7ecaf0a95 100644
--- a/web/react/stores/preference_store.jsx
+++ b/web/react/stores/preference_store.jsx
@@ -133,6 +133,16 @@ class PreferenceStoreClass extends EventEmitter {
         return preference;
     }
 
+    setPreferences(newPreferences) {
+        const preferences = this.getAllPreferences();
+
+        for (const preference of newPreferences) {
+            preferences.set(getPreferenceKeyForModel(preference), preference);
+        }
+
+        this.setAllPreferences(preferences);
+    }
+
     emitChange() {
         this.emit(CHANGE_EVENT);
     }
@@ -155,18 +165,11 @@ class PreferenceStoreClass extends EventEmitter {
             this.emitChange();
             break;
         }
-        case ActionTypes.RECIEVED_PREFERENCES: {
-            const preferences = this.getAllPreferences();
-
-            for (const preference of action.preferences) {
-                preferences.set(getPreferenceKeyForModel(preference), preference);
-            }
-
-            this.setAllPreferences(preferences);
+        case ActionTypes.RECIEVED_PREFERENCES:
+            this.setPreferences(action.preferences);
             this.emitChange();
             break;
         }
-        }
     }
 }