From 0af622e6e81a5aee64f839eeadd23b4a62b3cf62 Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Sat, 23 Mar 2019 14:15:57 +0100 Subject: refactor state management for workspace feature --- src/stores/ServicesStore.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/stores/ServicesStore.js') 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'; import CachedRequest from './lib/CachedRequest'; import { matchRoute } from '../helpers/routing-helpers'; import { gaEvent } from '../lib/analytics'; -import { filterServicesByActiveWorkspace, getActiveWorkspaceServices } from '../features/workspaces'; +import { workspaceStore } from '../features/workspaces'; const debug = require('debug')('Franz:ServiceStore'); @@ -109,7 +109,7 @@ export default class ServicesStore extends Store { @computed get allDisplayed() { const services = this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled; - return filterServicesByActiveWorkspace(services); + return workspaceStore.filterServicesByActiveWorkspace(services); } // This is just used to avoid unnecessary rerendering of resource-heavy webviews @@ -117,7 +117,7 @@ export default class ServicesStore extends Store { const { showDisabledServices } = this.stores.settings.all.app; const services = this.allServicesRequest.execute().result || []; const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled); - return getActiveWorkspaceServices(filteredServices); + return workspaceStore.filterServicesByActiveWorkspace(filteredServices); } @computed get filtered() { -- cgit v1.2.3-54-g00ecf