Merge pull request #294 from meetfranz/feature/192-display-disabled-services

[PR] Disable/Enable service optimizations

5 files changed, 17 insertions, 6 deletions

diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 732b6c003..b5af3743d 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -35,7 +35,7 @@ export default class ServiceDisabled extends Component {
     const { intl } = this.context;
 
     return (
-      <div className="services__crash-handler">
+      <div className="services__info-layer">
         <h1>{intl.formatMessage(messages.headline, { name })}</h1>
         <Button
           label={intl.formatMessage(messages.action, { name })}
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index d48152c18..d3e6951f3 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -62,7 +62,7 @@ export default class WebviewCrashHandler extends Component {
     const { intl } = this.context;
 
     return (
-      <div className="services__crash-handler">
+      <div className="services__info-layer">
         <h1>{intl.formatMessage(messages.headline)}</h1>
         <p>{intl.formatMessage(messages.text, { name })}</p>
         <Button
diff --git a/src/models/Service.js b/src/models/Service.js
index eb68493fe..d0985969b 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,4 +1,4 @@
-import { computed, observable } from 'mobx';
+import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
@@ -58,6 +58,15 @@ export default class Service {
     this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
 
     this.recipe = recipe;
+
+    autorun(() => {
+      if (!this.isEnabled) {
+        this.webview = null;
+        this.isAttached = false;
+        this.unreadDirectMessageCount = 0;
+        this.unreadIndirectMessageCount = 0;
+      }
+    });
   }
 
   @computed get url() {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 87d31c0c5..9af5d81da 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -547,6 +547,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       const loop = () => {
+        if (!service.webview) return;
+
         service.webview.send('poll');
 
         setTimeout(loop, delay);
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 2a6540e0b..282c15121 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -13,7 +13,7 @@
   }
 
   .services__webview, 
-  .services__crash-handler {
+  .services__info-layer {
     position: absolute;
     width: 100%;
     top: 0;
@@ -44,7 +44,7 @@
   }
 
   .services__no-service, 
-  .services__crash-handler {
+  .services__info-layer {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -63,7 +63,7 @@
     }
   }
 
-  .services__crash-handler {
+  .services__info-layer {
     position: absolut;
     z-index: 110;
   }