diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-12-09 23:44:54 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-12-09 23:44:54 +0100 |
commit | b4f1f04e5f464dc2aaceb207bee634ed54c4e7ac (patch) | |
tree | d99da049d58d9552788385a597c9678ca9ecdbbb /src | |
parent | Only show loader when service is enabled (diff) | |
download | ferdium-app-b4f1f04e5f464dc2aaceb207bee634ed54c4e7ac.tar.gz ferdium-app-b4f1f04e5f464dc2aaceb207bee634ed54c4e7ac.tar.zst ferdium-app-b4f1f04e5f464dc2aaceb207bee634ed54c4e7ac.zip |
Only render service handler when service is selected
Diffstat (limited to 'src')
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 69983a80a..9919163b9 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { autorun } from 'mobx'; | 3 | import { autorun } from 'mobx'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
@@ -89,33 +89,41 @@ export default @observer class ServiceWebview extends Component { | |||
89 | 89 | ||
90 | return ( | 90 | return ( |
91 | <div className={webviewClasses}> | 91 | <div className={webviewClasses}> |
92 | {service.hasCrashed && ( | 92 | {service.isActive && ( |
93 | <WebviewCrashHandler | 93 | <Fragment> |
94 | name={service.recipe.name} | 94 | {service.hasCrashed && ( |
95 | webview={service.webview} | 95 | <WebviewCrashHandler |
96 | reload={reload} | 96 | name={service.recipe.name} |
97 | /> | 97 | webview={service.webview} |
98 | )} | 98 | reload={reload} |
99 | {service.isEnabled && service.isLoading && service.isFirstLoad && ( | 99 | /> |
100 | <WebviewLoader | 100 | )} |
101 | loaded={!service.isLoading} | 101 | {service.isEnabled && service.isLoading && service.isFirstLoad && ( |
102 | name={service.name} | 102 | <WebviewLoader |
103 | /> | 103 | loaded={!service.isLoading} |
104 | )} | 104 | name={service.name} |
105 | {service.isError && ( | 105 | /> |
106 | <WebviewErrorHandler | 106 | )} |
107 | name={service.recipe.name} | 107 | {service.isError && ( |
108 | errorMessage={service.errorMessage} | 108 | <WebviewErrorHandler |
109 | reload={reload} | 109 | name={service.recipe.name} |
110 | edit={edit} | 110 | errorMessage={service.errorMessage} |
111 | /> | 111 | reload={reload} |
112 | edit={edit} | ||
113 | /> | ||
114 | )} | ||
115 | </Fragment> | ||
112 | )} | 116 | )} |
113 | {!service.isEnabled ? ( | 117 | {!service.isEnabled ? ( |
114 | <ServiceDisabled | 118 | <Fragment> |
115 | name={service.recipe.name} | 119 | {service.isActive && ( |
116 | webview={service.webview} | 120 | <ServiceDisabled |
117 | enable={enable} | 121 | name={service.recipe.name} |
118 | /> | 122 | webview={service.webview} |
123 | enable={enable} | ||
124 | /> | ||
125 | )} | ||
126 | </Fragment> | ||
119 | ) : ( | 127 | ) : ( |
120 | <Webview | 128 | <Webview |
121 | ref={(element) => { this.webview = element; }} | 129 | ref={(element) => { this.webview = element; }} |