Merge branch 'develop' into feature/mute-service

# Conflicts:
#	src/components/services/content/ServiceWebview.js
#	src/components/services/content/Services.js
#	src/components/services/tabs/TabItem.js
#	src/containers/layout/AppLayoutContainer.js

7 files changed, 93 insertions, 4 deletions

diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
new file mode 100644
index 000000000..732b6c003
--- /dev/null
+++ b/src/components/services/content/ServiceDisabled.js
@@ -0,0 +1,48 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+
+import Button from '../../ui/Button';
+
+const messages = defineMessages({
+  headline: {
+    id: 'service.disabledHandler.headline',
+    defaultMessage: '!!!{name} is disabled',
+  },
+  action: {
+    id: 'service.disabledHandler.action',
+    defaultMessage: '!!!Enable {name}',
+  },
+});
+
+@observer
+export default class ServiceDisabled extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    enable: PropTypes.func.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  countdownInterval = null;
+  countdownIntervalTimeout = 1000;
+
+  render() {
+    const { name, enable } = this.props;
+    const { intl } = this.context;
+
+    return (
+      <div className="services__crash-handler">
+        <h1>{intl.formatMessage(messages.headline, { name })}</h1>
+        <Button
+          label={intl.formatMessage(messages.action, { name })}
+          buttonType="inverted"
+          onClick={() => enable()}
+        />
+      </div>
+    );
+  }
+}
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 60bdf7e47..08ba5f33d 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -8,6 +8,7 @@ import classnames from 'classnames';
 import ServiceModel from '../../../models/Service';
 import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
 import WebviewCrashHandler from './WebviewCrashHandler';
+import ServiceDisabled from './ServiceDisabled';
 
 @observer
 export default class ServiceWebview extends Component {
@@ -15,7 +16,11 @@ export default class ServiceWebview extends Component {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
+<<<<<<< HEAD
     isAppMuted: PropTypes.bool.isRequired,
+=======
+    enable: PropTypes.func.isRequired,
+>>>>>>> develop
   };
 
   static defaultProps = {
@@ -58,6 +63,7 @@ export default class ServiceWebview extends Component {
       setWebviewReference,
       reload,
       isAppMuted,
+      enable,
     } = this.props;
 
     const webviewClasses = classnames({
@@ -82,6 +88,13 @@ export default class ServiceWebview extends Component {
             reload={reload}
           />
         )}
+        {!service.isEnabled && (
+          <ServiceDisabled
+            name={service.recipe.name}
+            webview={service.webview}
+            enable={enable}
+          />
+        )}
         <Webview
           ref={(element) => { this.webview = element; }}
           autosize
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 55a47cdd3..b1322afc2 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -27,6 +27,7 @@ export default class Services extends Component {
     openWindow: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
+    update: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -46,6 +47,7 @@ export default class Services extends Component {
       openWindow,
       reload,
       isAppMuted,
+      update,
     } = this.props;
     const { intl } = this.context;
 
@@ -79,6 +81,13 @@ export default class Services extends Component {
             openWindow={openWindow}
             reload={() => reload({ serviceId: service.id })}
             isAppMuted={isAppMuted}
+            enable={() => update({
+              serviceId: service.id,
+              serviceData: {
+                isEnabled: true,
+              },
+              redirect: false,
+            })}
           />
         ))}
       </div>
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 24903f3c5..d48152c18 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -25,7 +25,7 @@ const messages = defineMessages({
 });
 
 @observer
-export default class ServiceWebview extends Component {
+export default class WebviewCrashHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 0146f5b35..2daf55676 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -16,6 +16,7 @@ class TabBarSortableList extends Component {
     toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   }
 
   render() {
@@ -27,6 +28,7 @@ class TabBarSortableList extends Component {
       toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
 
@@ -46,6 +48,7 @@ class TabBarSortableList extends Component {
             toggleAudio={() => toggleAudio({ serviceId: service.id })}
             deleteService={() => deleteService({ serviceId: service.id })}
             disableService={() => disableService({ serviceId: service.id })}
+            enableService={() => enableService({ serviceId: service.id })}
             openSettings={openSettings}
           />
         ))}
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 7b001f6ee..4a37bad57 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -40,6 +40,10 @@ const messages = defineMessages({
     id: 'tabs.item.disableService',
     defaultMessage: '!!!Disable Service',
   },
+  enableService: {
+    id: 'tabs.item.enableService',
+    defaultMessage: '!!!Enable Service',
+  },
   deleteService: {
     id: 'tabs.item.deleteService',
     defaultMessage: '!!!Delete Service',
@@ -58,6 +62,7 @@ class TabItem extends Component {
     openSettings: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -74,6 +79,7 @@ class TabItem extends Component {
       toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
     const { intl } = this.context;
@@ -121,6 +127,7 @@ class TabItem extends Component {
           'tab-item': true,
           'is-active': service.isActive,
           'has-custom-icon': service.hasCustomIcon,
+          'is-disabled': !service.isEnabled,
         })}
         onClick={clickHandler}
         onContextMenu={() => menu.popup(remote.getCurrentWindow())}
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index e8cd80e33..fd4325107 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -30,20 +30,28 @@ export default class TabBar extends Component {
     reorder({ oldIndex, newIndex });
   };
 
-  disableService = ({ serviceId }) => {
+  toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
 
     if (serviceId) {
       updateService({
         serviceId,
         serviceData: {
-          isEnabled: false,
+          isEnabled,
         },
         redirect: false,
       });
     }
   }
 
+  disableService({ serviceId }) {
+    this.toggleService({ serviceId, isEnabled: false });
+  }
+
+  enableService({ serviceId }) {
+    this.toggleService({ serviceId, isEnabled: true });
+  }
+
   render() {
     const {
       services,
@@ -67,7 +75,8 @@ export default class TabBar extends Component {
           toggleNotifications={toggleNotifications}
           toggleAudio={toggleAudio}
           deleteService={deleteService}
-          disableService={this.disableService}
+          disableService={args => this.disableService(args)}
+          enableService={args => this.enableService(args)}
           openSettings={openSettings}
           distance={20}
           axis="y"