diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-10-08 19:46:50 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-10-08 19:46:50 +0200 |
commit | d3009b91b487627e5d510ac01d79c29c90c82053 (patch) | |
tree | 739eb684c3c227ca121df2df445ed352a32c8129 /src/features/workspaces/store.js | |
parent | Fix non-related issues (diff) | |
parent | remove external url event (diff) | |
download | ferdium-app-d3009b91b487627e5d510ac01d79c29c90c82053.tar.gz ferdium-app-d3009b91b487627e5d510ac01d79c29c90c82053.tar.zst ferdium-app-d3009b91b487627e5d510ac01d79c29c90c82053.zip |
Merge branch 'release/5.4.0-beta.3' into 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, 2 insertions, 10 deletions
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index b83fe335a..13227e033 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -146,16 +146,8 @@ export default class WorkspacesStore extends FeatureStore { | |||
146 | 146 | ||
147 | filterServicesByActiveWorkspace = (services) => { | 147 | filterServicesByActiveWorkspace = (services) => { |
148 | const { activeWorkspace, isFeatureActive } = this; | 148 | const { activeWorkspace, isFeatureActive } = this; |
149 | if (isFeatureActive) { | 149 | if (isFeatureActive && activeWorkspace) { |
150 | if (activeWorkspace) { | 150 | return this.getWorkspaceServices(activeWorkspace); |
151 | return this.getWorkspaceServices(activeWorkspace); | ||
152 | } | ||
153 | // There is no active workspace yet but we might be still loading them | ||
154 | if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) { | ||
155 | // If so, do not show any services to avoid loading all of them unfiltered | ||
156 | // and then having the filter flashing in (which is ugly and slow). | ||
157 | return []; | ||
158 | } | ||
159 | } | 151 | } |
160 | return services; | 152 | return services; |
161 | }; | 153 | }; |