Merge pull request #330 from meetfranz/developv5.0.0-beta.14

Beta 14

7 files changed, 233 insertions, 42 deletions

diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
new file mode 100644
index 000000000..b5af3743d
--- /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__info-layer">
+        <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 3ee3155be..faa356d3d 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -7,12 +7,17 @@ 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 {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    isAppMuted: PropTypes.bool.isRequired,
+    enable: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -53,6 +58,9 @@ export default class ServiceWebview extends Component {
     const {
       service,
       setWebviewReference,
+      reload,
+      isAppMuted,
+      enable,
     } = this.props;
 
     const webviewClasses = classnames({
@@ -70,26 +78,37 @@ export default class ServiceWebview extends Component {
 
     return (
       <div className={webviewClasses}>
-        <Webview
-          ref={(element) => { this.webview = element; }}
-
-          autosize
-          src={service.url}
-          preload="./webview/plugin.js"
-          partition={`persist:service-${service.id}`}
-
-          onDidAttach={() => setWebviewReference({
-            serviceId: service.id,
-            webview: this.webview.view,
-          })}
-
-          onUpdateTargetUrl={this.updateTargetUrl}
-
-          useragent={service.userAgent}
-
-          disablewebsecurity
-          allowpopups
-        />
+        {service.hasCrashed && (
+          <WebviewCrashHandler
+            name={service.recipe.name}
+            webview={service.webview}
+            reload={reload}
+          />
+        )}
+        {!service.isEnabled ? (
+          <ServiceDisabled
+            name={service.recipe.name}
+            webview={service.webview}
+            enable={enable}
+          />
+        ) : (
+          <Webview
+            ref={(element) => { this.webview = element; }}
+            autosize
+            src={service.url}
+            preload="./webview/plugin.js"
+            partition={`persist:service-${service.id}`}
+            onDidAttach={() => setWebviewReference({
+              serviceId: service.id,
+              webview: this.webview.view,
+            })}
+            onUpdateTargetUrl={this.updateTargetUrl}
+            useragent={service.userAgent}
+            muted={isAppMuted || service.isMuted}
+            disablewebsecurity
+            allowpopups
+          />
+        )}
         {statusBar}
       </div>
     );
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 03c68b06f..b1322afc2 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -25,6 +25,9 @@ export default class Services extends Component {
     setWebviewReference: PropTypes.func.isRequired,
     handleIPCMessage: PropTypes.func.isRequired,
     openWindow: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    isAppMuted: PropTypes.bool.isRequired,
+    update: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -42,6 +45,9 @@ export default class Services extends Component {
       handleIPCMessage,
       setWebviewReference,
       openWindow,
+      reload,
+      isAppMuted,
+      update,
     } = this.props;
     const { intl } = this.context;
 
@@ -73,6 +79,15 @@ export default class Services extends Component {
             handleIPCMessage={handleIPCMessage}
             setWebviewReference={setWebviewReference}
             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
new file mode 100644
index 000000000..d3e6951f3
--- /dev/null
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -0,0 +1,81 @@
+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.crashHandler.headline',
+    defaultMessage: '!!!Oh no!',
+  },
+  text: {
+    id: 'service.crashHandler.text',
+    defaultMessage: '!!!{name} has caused an error.',
+  },
+  action: {
+    id: 'service.crashHandler.action',
+    defaultMessage: '!!!Reload {name}',
+  },
+  autoReload: {
+    id: 'service.crashHandler.autoReload',
+    defaultMessage: '!!!Trying to automatically restore {name} in {seconds} seconds',
+  },
+});
+
+@observer
+export default class WebviewCrashHandler extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    reload: PropTypes.func.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  state = {
+    countdown: 10000,
+  }
+
+  componentDidMount() {
+    const { reload } = this.props;
+
+    this.countdownInterval = setInterval(() => {
+      this.setState({
+        countdown: this.state.countdown - this.countdownIntervalTimeout,
+      });
+
+      if (this.state.countdown <= 0) {
+        reload();
+        clearInterval(this.countdownInterval);
+      }
+    }, this.countdownIntervalTimeout);
+  }
+
+  countdownInterval = null;
+  countdownIntervalTimeout = 1000;
+
+  render() {
+    const { name, reload } = this.props;
+    const { intl } = this.context;
+
+    return (
+      <div className="services__info-layer">
+        <h1>{intl.formatMessage(messages.headline)}</h1>
+        <p>{intl.formatMessage(messages.text, { name })}</p>
+        <Button
+          // label={`Reload ${name}`}
+          label={intl.formatMessage(messages.action, { name })}
+          buttonType="inverted"
+          onClick={() => reload()}
+        />
+        <p className="footnote">{intl.formatMessage(messages.autoReload, {
+          name,
+          seconds: this.state.countdown / 1000,
+        })}</p>
+      </div>
+    );
+  }
+}
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index e5ae36419..2daf55676 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -2,17 +2,8 @@ import React, { Component } from 'react';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import PropTypes from 'prop-types';
 import { SortableContainer } from 'react-sortable-hoc';
-import { defineMessages, intlShape } from 'react-intl';
 
 import TabItem from './TabItem';
-import { ctrlKey } from '../../../environment';
-
-const messages = defineMessages({
-  addNewService: {
-    id: 'sidebar.addNewService',
-    defaultMessage: '!!!Add new service',
-  },
-});
 
 @observer
 class TabBarSortableList extends Component {
@@ -22,27 +13,25 @@ class TabBarSortableList extends Component {
     openSettings: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
     toggleNotifications: PropTypes.func.isRequired,
+    toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   }
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       services,
       setActive,
       reload,
       toggleNotifications,
+      toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
 
-    const { intl } = this.context;
-
     return (
       <ul
         className="tabs"
@@ -56,12 +45,14 @@ class TabBarSortableList extends Component {
             shortcutIndex={index + 1}
             reload={() => reload({ serviceId: service.id })}
             toggleNotifications={() => toggleNotifications({ serviceId: service.id })}
+            toggleAudio={() => toggleAudio({ serviceId: service.id })}
             deleteService={() => deleteService({ serviceId: service.id })}
             disableService={() => disableService({ serviceId: service.id })}
+            enableService={() => enableService({ serviceId: service.id })}
             openSettings={openSettings}
           />
         ))}
-        <li>
+        {/* <li>
           <button
             className="sidebar__add-service"
             onClick={() => openSettings({ path: 'recipes' })}
@@ -69,7 +60,7 @@ class TabBarSortableList extends Component {
           >
             <span className="mdi mdi-plus" />
           </button>
-        </li>
+        </li> */}
       </ul>
     );
   }
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 9e03d2e21..a7136c43f 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -28,10 +28,22 @@ const messages = defineMessages({
     id: 'tabs.item.enableNotification',
     defaultMessage: '!!!Enable notifications',
   },
+  disableAudio: {
+    id: 'tabs.item.disableAudio',
+    defaultMessage: '!!!Disable audio',
+  },
+  enableAudio: {
+    id: 'tabs.item.enableAudio',
+    defaultMessage: '!!!Enable audio',
+  },
   disableService: {
     id: 'tabs.item.disableService',
     defaultMessage: '!!!Disable Service',
   },
+  enableService: {
+    id: 'tabs.item.enableService',
+    defaultMessage: '!!!Enable Service',
+  },
   deleteService: {
     id: 'tabs.item.deleteService',
     defaultMessage: '!!!Delete Service',
@@ -46,9 +58,11 @@ class TabItem extends Component {
     shortcutIndex: PropTypes.number.isRequired,
     reload: PropTypes.func.isRequired,
     toggleNotifications: PropTypes.func.isRequired,
+    toggleAudio: PropTypes.func.isRequired,
     openSettings: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
+    enableService: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -62,8 +76,10 @@ class TabItem extends Component {
       shortcutIndex,
       reload,
       toggleNotifications,
+      toggleAudio,
       deleteService,
       disableService,
+      enableService,
       openSettings,
     } = this.props;
     const { intl } = this.context;
@@ -90,8 +106,13 @@ class TabItem extends Component {
         : intl.formatMessage(messages.enableNotifications),
       click: () => toggleNotifications(),
     }, {
-      label: intl.formatMessage(messages.disableService),
-      click: () => disableService(),
+      label: service.isMuted
+        ? intl.formatMessage(messages.enableAudio)
+        : intl.formatMessage(messages.disableAudio),
+      click: () => toggleAudio(),
+    }, {
+      label: intl.formatMessage(service.isEnabled ? messages.disableService : messages.enableService),
+      click: () => (service.isEnabled ? disableService() : enableService()),
     }, {
       type: 'separator',
     }, {
@@ -106,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 fdb2c0a59..9da1090b7 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -15,6 +15,7 @@ export default class TabBar extends Component {
     reorder: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
     toggleNotifications: PropTypes.func.isRequired,
+    toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     updateService: PropTypes.func.isRequired,
   }
@@ -29,20 +30,30 @@ export default class TabBar extends Component {
     reorder({ oldIndex, newIndex });
   };
 
-  disableService = ({ serviceId }) => {
+  shouldPreventSorting = event => event.target.tagName !== 'LI';
+
+  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,
@@ -51,6 +62,7 @@ export default class TabBar extends Component {
       disableToolTip,
       reload,
       toggleNotifications,
+      toggleAudio,
       deleteService,
     } = this.props;
 
@@ -61,10 +73,13 @@ export default class TabBar extends Component {
           setActive={setActive}
           onSortEnd={this.onSortEnd}
           onSortStart={disableToolTip}
+          shouldCancelStart={this.shouldPreventSorting}
           reload={reload}
           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"