diff options
Diffstat (limited to 'src/stores/RequestStore.js')
-rw-r--r-- | src/stores/RequestStore.js | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js index a92f4c685..6d2f2ef91 100644 --- a/src/stores/RequestStore.js +++ b/src/stores/RequestStore.js | |||
@@ -13,7 +13,7 @@ export default class RequestStore extends Store { | |||
13 | 13 | ||
14 | @observable showRequiredRequestsError = false; | 14 | @observable showRequiredRequestsError = false; |
15 | 15 | ||
16 | @observable localServerPort = 45569; | 16 | @observable localServerPort = 45_569; |
17 | 17 | ||
18 | retries = 0; | 18 | retries = 0; |
19 | 19 | ||
@@ -22,11 +22,11 @@ export default class RequestStore extends Store { | |||
22 | constructor(...args) { | 22 | constructor(...args) { |
23 | super(...args); | 23 | super(...args); |
24 | 24 | ||
25 | this.actions.requests.retryRequiredRequests.listen(this._retryRequiredRequests.bind(this)); | 25 | this.actions.requests.retryRequiredRequests.listen( |
26 | this._retryRequiredRequests.bind(this), | ||
27 | ); | ||
26 | 28 | ||
27 | this.registerReactions([ | 29 | this.registerReactions([this._autoRetry.bind(this)]); |
28 | this._autoRetry.bind(this), | ||
29 | ]); | ||
30 | } | 30 | } |
31 | 31 | ||
32 | setup() { | 32 | setup() { |
@@ -41,13 +41,11 @@ export default class RequestStore extends Store { | |||
41 | } | 41 | } |
42 | 42 | ||
43 | @computed get areRequiredRequestsSuccessful() { | 43 | @computed get areRequiredRequestsSuccessful() { |
44 | return !this.userInfoRequest.isError | 44 | return !this.userInfoRequest.isError && !this.servicesRequest.isError; |
45 | && !this.servicesRequest.isError; | ||
46 | } | 45 | } |
47 | 46 | ||
48 | @computed get areRequiredRequestsLoading() { | 47 | @computed get areRequiredRequestsLoading() { |
49 | return this.userInfoRequest.isExecuting | 48 | return this.userInfoRequest.isExecuting || this.servicesRequest.isExecuting; |
50 | || this.servicesRequest.isExecuting; | ||
51 | } | 49 | } |
52 | 50 | ||
53 | @action _retryRequiredRequests() { | 51 | @action _retryRequiredRequests() { |
@@ -67,7 +65,7 @@ export default class RequestStore extends Store { | |||
67 | } | 65 | } |
68 | 66 | ||
69 | this._autoRetry(); | 67 | this._autoRetry(); |
70 | debug(`Retry required requests delayed in ${(delay) / 1000}s`); | 68 | debug(`Retry required requests delayed in ${delay / 1000}s`); |
71 | }, delay); | 69 | }, delay); |
72 | } | 70 | } |
73 | } | 71 | } |