diff options
Diffstat (limited to 'src/stores/FeaturesStore.js')
-rw-r--r-- | src/stores/FeaturesStore.js | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index d2842083c..8fe576813 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -1,4 +1,9 @@ | |||
1 | import { computed, observable, reaction } from 'mobx'; | 1 | import { |
2 | computed, | ||
3 | observable, | ||
4 | reaction, | ||
5 | runInAction, | ||
6 | } from 'mobx'; | ||
2 | 7 | ||
3 | import Store from './lib/Store'; | 8 | import Store from './lib/Store'; |
4 | import CachedRequest from './lib/CachedRequest'; | 9 | import CachedRequest from './lib/CachedRequest'; |
@@ -7,6 +12,7 @@ import delayApp from '../features/delayApp'; | |||
7 | import spellchecker from '../features/spellchecker'; | 12 | import spellchecker from '../features/spellchecker'; |
8 | import serviceProxy from '../features/serviceProxy'; | 13 | import serviceProxy from '../features/serviceProxy'; |
9 | import basicAuth from '../features/basicAuth'; | 14 | import basicAuth from '../features/basicAuth'; |
15 | import workspaces from '../features/workspaces'; | ||
10 | import shareFranz from '../features/shareFranz'; | 16 | import shareFranz from '../features/shareFranz'; |
11 | 17 | ||
12 | import { DEFAULT_FEATURES_CONFIG } from '../config'; | 18 | import { DEFAULT_FEATURES_CONFIG } from '../config'; |
@@ -16,13 +22,16 @@ export default class FeaturesStore extends Store { | |||
16 | 22 | ||
17 | @observable featuresRequest = new CachedRequest(this.api.features, 'features'); | 23 | @observable featuresRequest = new CachedRequest(this.api.features, 'features'); |
18 | 24 | ||
25 | @observable features = Object.assign({}, DEFAULT_FEATURES_CONFIG); | ||
26 | |||
19 | async setup() { | 27 | async setup() { |
20 | this.registerReactions([ | 28 | this.registerReactions([ |
29 | this._updateFeatures, | ||
21 | this._monitorLoginStatus.bind(this), | 30 | this._monitorLoginStatus.bind(this), |
22 | ]); | 31 | ]); |
23 | 32 | ||
24 | await this.featuresRequest._promise; | 33 | await this.featuresRequest._promise; |
25 | setTimeout(this._enableFeatures.bind(this), 1); | 34 | setTimeout(this._setupFeatures.bind(this), 1); |
26 | 35 | ||
27 | // single key reaction | 36 | // single key reaction |
28 | reaction(() => this.stores.user.data.isPremium, () => { | 37 | reaction(() => this.stores.user.data.isPremium, () => { |
@@ -36,13 +45,16 @@ export default class FeaturesStore extends Store { | |||
36 | return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; | 45 | return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; |
37 | } | 46 | } |
38 | 47 | ||
39 | @computed get features() { | 48 | _updateFeatures = () => { |
49 | const features = Object.assign({}, DEFAULT_FEATURES_CONFIG); | ||
40 | if (this.stores.user.isLoggedIn) { | 50 | if (this.stores.user.isLoggedIn) { |
41 | return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; | 51 | const requestResult = this.featuresRequest.execute().result; |
52 | Object.assign(features, requestResult); | ||
42 | } | 53 | } |
43 | 54 | runInAction('FeaturesStore::_updateFeatures', () => { | |
44 | return DEFAULT_FEATURES_CONFIG; | 55 | this.features = features; |
45 | } | 56 | }); |
57 | }; | ||
46 | 58 | ||
47 | _monitorLoginStatus() { | 59 | _monitorLoginStatus() { |
48 | if (this.stores.user.isLoggedIn) { | 60 | if (this.stores.user.isLoggedIn) { |
@@ -52,11 +64,12 @@ export default class FeaturesStore extends Store { | |||
52 | } | 64 | } |
53 | } | 65 | } |
54 | 66 | ||
55 | _enableFeatures() { | 67 | _setupFeatures() { |
56 | delayApp(this.stores, this.actions); | 68 | delayApp(this.stores, this.actions); |
57 | spellchecker(this.stores, this.actions); | 69 | spellchecker(this.stores, this.actions); |
58 | serviceProxy(this.stores, this.actions); | 70 | serviceProxy(this.stores, this.actions); |
59 | basicAuth(this.stores, this.actions); | 71 | basicAuth(this.stores, this.actions); |
72 | workspaces(this.stores, this.actions); | ||
60 | shareFranz(this.stores, this.actions); | 73 | shareFranz(this.stores, this.actions); |
61 | } | 74 | } |
62 | } | 75 | } |