diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-10-30 10:33:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 10:33:52 +0100 |
commit | bc64a9733cc26698931f4bcca4bceff072ce60e7 (patch) | |
tree | def65fbcf4e4cd6539325fb3d61aa8799663f938 | |
parent | Merge pull request #157 from RainoBoy97/master (diff) | |
parent | Reset setting status when navigating away from services screen (diff) | |
download | ferdium-app-bc64a9733cc26698931f4bcca4bceff072ce60e7.tar.gz ferdium-app-bc64a9733cc26698931f4bcca4bceff072ce60e7.tar.zst ferdium-app-bc64a9733cc26698931f4bcca4bceff072ce60e7.zip |
Merge pull request #169 from dannyqiu/fix-service-status
Reset status when navigating away from services screen
-rw-r--r-- | src/actions/service.js | 1 | ||||
-rw-r--r-- | src/containers/settings/ServicesScreen.js | 2 | ||||
-rw-r--r-- | src/stores/ServicesStore.js | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/actions/service.js b/src/actions/service.js index cdd4bbf16..ea6ea5acc 100644 --- a/src/actions/service.js +++ b/src/actions/service.js | |||
@@ -63,6 +63,7 @@ export default { | |||
63 | needle: PropTypes.string.isRequired, | 63 | needle: PropTypes.string.isRequired, |
64 | }, | 64 | }, |
65 | resetFilter: {}, | 65 | resetFilter: {}, |
66 | resetStatus: {}, | ||
66 | reorder: { | 67 | reorder: { |
67 | oldIndex: PropTypes.number.isRequired, | 68 | oldIndex: PropTypes.number.isRequired, |
68 | newIndex: PropTypes.number.isRequired, | 69 | newIndex: PropTypes.number.isRequired, |
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index d0580041f..8cfe5efbf 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js | |||
@@ -18,6 +18,7 @@ export default class ServicesScreen extends Component { | |||
18 | 18 | ||
19 | componentWillUnmount() { | 19 | componentWillUnmount() { |
20 | this.props.actions.service.resetFilter(); | 20 | this.props.actions.service.resetFilter(); |
21 | this.props.actions.service.resetStatus(); | ||
21 | } | 22 | } |
22 | 23 | ||
23 | deleteService() { | 24 | deleteService() { |
@@ -70,6 +71,7 @@ ServicesScreen.wrappedComponent.propTypes = { | |||
70 | toggleService: PropTypes.func.isRequired, | 71 | toggleService: PropTypes.func.isRequired, |
71 | filter: PropTypes.func.isRequired, | 72 | filter: PropTypes.func.isRequired, |
72 | resetFilter: PropTypes.func.isRequired, | 73 | resetFilter: PropTypes.func.isRequired, |
74 | resetStatus: PropTypes.func.isRequired, | ||
73 | }).isRequired, | 75 | }).isRequired, |
74 | }).isRequired, | 76 | }).isRequired, |
75 | }; | 77 | }; |
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 4510146e0..64e6bb42b 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -41,6 +41,7 @@ export default class ServicesStore extends Store { | |||
41 | this.actions.service.openWindow.listen(this._openWindow.bind(this)); | 41 | this.actions.service.openWindow.listen(this._openWindow.bind(this)); |
42 | this.actions.service.filter.listen(this._filter.bind(this)); | 42 | this.actions.service.filter.listen(this._filter.bind(this)); |
43 | this.actions.service.resetFilter.listen(this._resetFilter.bind(this)); | 43 | this.actions.service.resetFilter.listen(this._resetFilter.bind(this)); |
44 | this.actions.service.resetStatus.listen(this._resetStatus.bind(this)); | ||
44 | this.actions.service.reload.listen(this._reload.bind(this)); | 45 | this.actions.service.reload.listen(this._reload.bind(this)); |
45 | this.actions.service.reloadActive.listen(this._reloadActive.bind(this)); | 46 | this.actions.service.reloadActive.listen(this._reloadActive.bind(this)); |
46 | this.actions.service.reloadAll.listen(this._reloadAll.bind(this)); | 47 | this.actions.service.reloadAll.listen(this._reloadAll.bind(this)); |
@@ -338,6 +339,10 @@ export default class ServicesStore extends Store { | |||
338 | this.filterNeedle = null; | 339 | this.filterNeedle = null; |
339 | } | 340 | } |
340 | 341 | ||
342 | @action _resetStatus() { | ||
343 | this.actionStatus = []; | ||
344 | } | ||
345 | |||
341 | @action _reload({ serviceId }) { | 346 | @action _reload({ serviceId }) { |
342 | const service = this.one(serviceId); | 347 | const service = this.one(serviceId); |
343 | service.resetMessageCount(); | 348 | service.resetMessageCount(); |