aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-04-12 13:32:19 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-04-12 13:32:19 +0200
commitf941074dd7520efb63e9507294df8c420715b9df (patch)
tree614d03296254f02fe93a67a5c3b2feef1446e3aa /src/containers/settings
parentDon't invalidate user request on componentWillMount (diff)
parentfeat(App): Update electron to 4.1.4 (diff)
downloadferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.gz
ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.zst
ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.zip
Merge branch 'develop' into chore/streamline-dashboard
Diffstat (limited to 'src/containers/settings')
-rw-r--r--src/containers/settings/SettingsWindow.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 6d9e0ee77..663b9e2e4 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -7,6 +7,7 @@ import ServicesStore from '../../stores/ServicesStore';
7import Layout from '../../components/settings/SettingsLayout'; 7import Layout from '../../components/settings/SettingsLayout';
8import Navigation from '../../components/settings/navigation/SettingsNavigation'; 8import Navigation from '../../components/settings/navigation/SettingsNavigation';
9import ErrorBoundary from '../../components/util/ErrorBoundary'; 9import ErrorBoundary from '../../components/util/ErrorBoundary';
10import { workspaceStore } from '../../features/workspaces';
10 11
11export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { 12export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
12 render() { 13 render() {
@@ -16,6 +17,7 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
16 const navigation = ( 17 const navigation = (
17 <Navigation 18 <Navigation
18 serviceCount={stores.services.all.length} 19 serviceCount={stores.services.all.length}
20 workspaceCount={workspaceStore.workspaces.length}
19 /> 21 />
20 ); 22 );
21 23