update the subscription when conversation is created

Author: rockwellll

dist/hellotext.js

@@ -23,43 +23,30 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 var WebchatChannel = /*#__PURE__*/function (_ApplicationChannel) {
   _inherits(WebchatChannel, _ApplicationChannel);
   var _super = _createSuper(WebchatChannel);
-  function WebchatChannel(id, session) {
+  function WebchatChannel(id, session, conversation) {
     var _this;
     _classCallCheck(this, WebchatChannel);
     _this = _super.call(this);
     _this.id = id;
     _this.session = session;
+    _this.conversation = conversation;
     _this.subscribe();
     return _this;
   }
   _createClass(WebchatChannel, [{
     key: "subscribe",
-    value: function subscribe(conversation) {
+    value: function subscribe() {
       var params = {
         channel: "WebchatChannel",
         id: this.id,
         session: this.session,
-        conversation
+        conversation: this.conversation
       };
-      console.log(params);
       this.send({
         command: 'subscribe',
         identifier: params
       });
     }
-  }, {
-    key: "unsubscribe",
-    value: function unsubscribe() {
-      var params = {
-        channel: "WebchatChannel",
-        id: this.id,
-        session: this.session
-      };
-      this.send({
-        command: 'unsubscribe',
-        identifier: params
-      });
-    }
   }, {
     key: "onMessage",
     value: function onMessage(callback) {
@@ -96,8 +83,9 @@ var WebchatChannel = /*#__PURE__*/function (_ApplicationChannel) {
       });
     }
   }, {
-    key: "updateSubscription",
-    value: function updateSubscription() {
+    key: "updateSubscriptionWith",
+    value: function updateSubscriptionWith(conversation) {
+      this.conversation = conversation;
       this.subscribe();
     }
   }]);

lib/channels/webchat_channel.js

@@ -44,7 +44,7 @@ var _default = /*#__PURE__*/function (_Controller) {
     key: "initialize",
     value: function initialize() {
       this.messagesAPI = new _messages.default(this.idValue);
-      this.webChatChannel = new _webchat_channel.default(this.idValue, _hellotext.default.session);
+      this.webChatChannel = new _webchat_channel.default(this.idValue, _hellotext.default.session, this.conversationIdValue);
       this.files = [];
       this.onMessageReceived = this.onMessageReceived.bind(this);
       this.onConversationAssignment = this.onConversationAssignment.bind(this);
@@ -241,7 +241,6 @@ var _default = /*#__PURE__*/function (_Controller) {
       } else {
         this.onlineStatusTarget.style.display = 'none';
       }
-      this.webChatChannel.updateSubscription();
     }
   }, {
     key: "onAgentOnline",
@@ -288,13 +287,13 @@ var _default = /*#__PURE__*/function (_Controller) {
           return element.classList.add('failed');
         }
         var data = yield response.json();
-        console.log(data);
         element.setAttribute('data-id', data.id);
         message.id = data.id;
         _hellotext.default.eventEmitter.dispatch('webchat:message:sent', message);
-        this.conversationIdValue = data.conversation;
-        console.log(this.conversationIdValue);
-        this.webChatChannel.subscribe(this.conversationIdValue);
+        if (data.conversation !== this.conversationIdValue) {
+          this.conversationIdValue = data.conversation;
+          this.webChatChannel.subscribe(this.conversationIdValue);
+        }
       });
       function sendMessage() {
         return _sendMessage.apply(this, arguments);

lib/controllers/webchat_controller.js

@@ -1,38 +1,27 @@
 import ApplicationChannel from './application_channel'
 
 class WebchatChannel extends ApplicationChannel {
-  constructor(id, session) {
+  constructor(id, session, conversation) {
     super()
 
     this.id = id
     this.session = session
+    this.conversation = conversation
 
     this.subscribe()
   }
 
-  subscribe(conversation) {
+  subscribe() {
     const params = {
       channel: "WebchatChannel",
       id: this.id,
       session: this.session,
-      conversation,
+      conversation: this.conversation,
     }
 
-    console.log(params)
-
     this.send( { command: 'subscribe',  identifier: params })
   }
 
-  unsubscribe() {
-    const params = {
-      channel: "WebchatChannel",
-      id: this.id,
-      session: this.session
-    }
-
-    this.send({ command: 'unsubscribe', identifier: params })
-  }
-
   onMessage(callback) {
     super.onMessage((message) => {
       if(message.type !== 'message') return
@@ -64,7 +53,8 @@ class WebchatChannel extends ApplicationChannel {
     })
   }
 
-  updateSubscription() {
+  updateSubscriptionWith(conversation) {
+    this.conversation = conversation
     this.subscribe()
   }
 }

src/channels/webchat_channel.js

@@ -47,7 +47,7 @@ export default class extends Controller {
 
   initialize() {
     this.messagesAPI = new WebchatMessagesAPI(this.idValue)
-    this.webChatChannel = new WebchatChannel(this.idValue, Hellotext.session)
+    this.webChatChannel = new WebchatChannel(this.idValue, Hellotext.session, this.conversationIdValue)
     this.files = []
 
     this.onMessageReceived = this.onMessageReceived.bind(this)
@@ -261,8 +261,6 @@ export default class extends Controller {
     } else {
       this.onlineStatusTarget.style.display = 'none'
     }
-
-    this.webChatChannel.updateSubscription()
   }
 
   onAgentOnline() {
@@ -319,16 +317,15 @@ export default class extends Controller {
     }
 
     const data = await response.json()
-
-    console.log(data)
     element.setAttribute('data-id', data.id)
     message.id = data.id
 
     Hellotext.eventEmitter.dispatch('webchat:message:sent', message)
 
-    this.conversationIdValue = data.conversation
-    console.log(this.conversationIdValue)
-    this.webChatChannel.subscribe(this.conversationIdValue)
+    if(data.conversation !== this.conversationIdValue) {
+      this.conversationIdValue = data.conversation
+      this.webChatChannel.subscribe(this.conversationIdValue)
+    }
   }
 
   openAttachment() {