diff options
author | 2019-10-04 18:55:51 +0200 | |
---|---|---|
committer | 2019-10-04 18:55:51 +0200 | |
commit | b521a232ac7c79527d0f3c9baa46695fa5d5e62d (patch) | |
tree | 4a8af14730b665e4e1a662239a4cd3ead3bb3da9 /src/features/workspaces/store.js | |
parent | Merge branch 'i18n' into release/5.4.0 (diff) | |
parent | Remove console.log (diff) | |
download | ferdium-app-b521a232ac7c79527d0f3c9baa46695fa5d5e62d.tar.gz ferdium-app-b521a232ac7c79527d0f3c9baa46695fa5d5e62d.tar.zst ferdium-app-b521a232ac7c79527d0f3c9baa46695fa5d5e62d.zip |
fix(Workspaces): Only initialize active Workspace services when app is starting
Fix/only load workspace related services
Diffstat (limited to 'src/features/workspaces/store.js')
-rw-r--r-- | src/features/workspaces/store.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index 7f41cfc88..f08323e6c 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -141,8 +141,16 @@ export default class WorkspacesStore extends FeatureStore { | |||
141 | 141 | ||
142 | filterServicesByActiveWorkspace = (services) => { | 142 | filterServicesByActiveWorkspace = (services) => { |
143 | const { activeWorkspace, isFeatureActive } = this; | 143 | const { activeWorkspace, isFeatureActive } = this; |
144 | if (isFeatureActive && activeWorkspace) { | 144 | if (isFeatureActive) { |
145 | return this.getWorkspaceServices(activeWorkspace); | 145 | if (activeWorkspace) { |
146 | return this.getWorkspaceServices(activeWorkspace); | ||
147 | } | ||
148 | // There is no active workspace yet but we might be still loading them | ||
149 | if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) { | ||
150 | // If so, do not show any services to avoid loading all of them unfiltered | ||
151 | // and then having the filter flashing in (which is ugly and slow). | ||
152 | return []; | ||
153 | } | ||
146 | } | 154 | } |
147 | return services; | 155 | return services; |
148 | }; | 156 | }; |