diff options
author | 2019-03-23 14:15:57 +0100 | |
---|---|---|
committer | 2019-03-23 14:15:57 +0100 | |
commit | 0af622e6e81a5aee64f839eeadd23b4a62b3cf62 (patch) | |
tree | 0e2264b83c3f57f2850062f6b7293bf06416bb49 /src/stores | |
parent | fix merge conflicts with latest develop (diff) | |
download | ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.tar.gz ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.tar.zst ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.zip |
refactor state management for workspace feature
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/ServicesStore.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index cc8eed65b..0ec6bf550 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -12,7 +12,7 @@ import Request from './lib/Request'; | |||
12 | import CachedRequest from './lib/CachedRequest'; | 12 | import CachedRequest from './lib/CachedRequest'; |
13 | import { matchRoute } from '../helpers/routing-helpers'; | 13 | import { matchRoute } from '../helpers/routing-helpers'; |
14 | import { gaEvent } from '../lib/analytics'; | 14 | import { gaEvent } from '../lib/analytics'; |
15 | import { filterServicesByActiveWorkspace, getActiveWorkspaceServices } from '../features/workspaces'; | 15 | import { workspaceStore } from '../features/workspaces'; |
16 | 16 | ||
17 | const debug = require('debug')('Franz:ServiceStore'); | 17 | const debug = require('debug')('Franz:ServiceStore'); |
18 | 18 | ||
@@ -109,7 +109,7 @@ export default class ServicesStore extends Store { | |||
109 | 109 | ||
110 | @computed get allDisplayed() { | 110 | @computed get allDisplayed() { |
111 | const services = this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled; | 111 | const services = this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled; |
112 | return filterServicesByActiveWorkspace(services); | 112 | return workspaceStore.filterServicesByActiveWorkspace(services); |
113 | } | 113 | } |
114 | 114 | ||
115 | // This is just used to avoid unnecessary rerendering of resource-heavy webviews | 115 | // This is just used to avoid unnecessary rerendering of resource-heavy webviews |
@@ -117,7 +117,7 @@ export default class ServicesStore extends Store { | |||
117 | const { showDisabledServices } = this.stores.settings.all.app; | 117 | const { showDisabledServices } = this.stores.settings.all.app; |
118 | const services = this.allServicesRequest.execute().result || []; | 118 | const services = this.allServicesRequest.execute().result || []; |
119 | const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled); | 119 | const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled); |
120 | return getActiveWorkspaceServices(filteredServices); | 120 | return workspaceStore.filterServicesByActiveWorkspace(filteredServices); |
121 | } | 121 | } |
122 | 122 | ||
123 | @computed get filtered() { | 123 | @computed get filtered() { |