diff options
author | 2017-11-10 15:05:52 +0100 | |
---|---|---|
committer | 2017-11-10 15:05:52 +0100 | |
commit | 4f5dd248e23477a5a2ae55c63918b7308ffce99d (patch) | |
tree | 9606844c390deb0ba6647d70fb60e09318a6a900 /src/containers/layout | |
parent | Merge branch 'develop' of github.com:meetfranz/franz into develop (diff) | |
parent | get default local from default app config (diff) | |
download | ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.tar.gz ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.tar.zst ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.zip |
Merge pull request #248 from meetfranz/feature/192-display-disabled-services
Add option to show disabled services in tab bar
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 68ad1039e..cd3251082 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -61,7 +61,6 @@ export default class AppLayoutContainer extends Component { | |||
61 | } = this.props.actions.ui; | 61 | } = this.props.actions.ui; |
62 | 62 | ||
63 | const { children } = this.props; | 63 | const { children } = this.props; |
64 | const allServices = services.enabled; | ||
65 | 64 | ||
66 | const isLoadingServices = services.allServicesRequest.isExecuting | 65 | const isLoadingServices = services.allServicesRequest.isExecuting |
67 | && services.allServicesRequest.isExecutingFirstTime; | 66 | && services.allServicesRequest.isExecutingFirstTime; |
@@ -77,7 +76,7 @@ export default class AppLayoutContainer extends Component { | |||
77 | 76 | ||
78 | const sidebar = ( | 77 | const sidebar = ( |
79 | <Sidebar | 78 | <Sidebar |
80 | services={allServices} | 79 | services={services.allDisplayed} |
81 | setActive={setActive} | 80 | setActive={setActive} |
82 | openSettings={openSettings} | 81 | openSettings={openSettings} |
83 | closeSettings={closeSettings} | 82 | closeSettings={closeSettings} |
@@ -92,11 +91,12 @@ export default class AppLayoutContainer extends Component { | |||
92 | 91 | ||
93 | const servicesContainer = ( | 92 | const servicesContainer = ( |
94 | <Services | 93 | <Services |
95 | services={allServices} | 94 | services={services.allDisplayed} |
96 | handleIPCMessage={handleIPCMessage} | 95 | handleIPCMessage={handleIPCMessage} |
97 | setWebviewReference={setWebviewReference} | 96 | setWebviewReference={setWebviewReference} |
98 | openWindow={openWindow} | 97 | openWindow={openWindow} |
99 | reload={reload} | 98 | reload={reload} |
99 | update={updateService} | ||
100 | /> | 100 | /> |
101 | ); | 101 | ); |
102 | 102 | ||