-1;
const isShortCodeActive = isSlashCommand && !hasNextWord;
if (isShortCodeActive) {
- this.showCannedModal = true;
+ this.showCannedResponsesList = true;
if (val.length > 1) {
const searchKey = val.substr(1, val.length);
this.$store.dispatch('getCannedResponse', {
@@ -117,26 +127,28 @@ export default {
this.$store.dispatch('getCannedResponse');
}
} else {
- this.showCannedModal = false;
+ this.showCannedResponsesList = false;
}
},
},
mounted() {
- /* eslint-disable no-confusing-arrow */
- document.addEventListener('keydown', e => {
+ document.addEventListener('keydown', this.handleKeyEvents);
+ },
+ destroyed() {
+ document.removeEventListener('keydown', this.handleKeyEvents);
+ },
+ methods: {
+ handleKeyEvents(e) {
if (this.isEscape(e)) {
this.hideEmojiPicker();
this.hideCannedResponse();
- }
- if (this.isEnter(e)) {
+ } else if (this.isEnter(e)) {
if (!e.shiftKey) {
e.preventDefault();
this.sendMessage();
}
}
- });
- },
- methods: {
+ },
isEnter(e) {
return e.keyCode === 13;
},
@@ -144,11 +156,11 @@ export default {
return e.keyCode === 27; // ESCAPE
},
sendMessage() {
- const messageHasOnlyNewLines = !this.message.replace(/\n/g, '').length;
- if (messageHasOnlyNewLines) {
+ const isMessageEmpty = !this.message.replace(/\n/g, '').length;
+ if (isMessageEmpty) {
return;
}
- if (this.message.length !== 0 && !this.showCannedModal) {
+ if (!this.showCannedResponsesList) {
this.$store
.dispatch('sendMessage', {
conversationId: this.currentChat.id,
@@ -165,7 +177,7 @@ export default {
replaceText(message) {
setTimeout(() => {
this.message = message;
- }, 200);
+ }, 100);
},
makePrivate() {
this.isPrivate = true;
@@ -192,7 +204,7 @@ export default {
}
},
hideCannedResponse() {
- this.showCannedModal = false;
+ this.showCannedResponsesList = false;
},
onBlur() {
@@ -203,18 +215,22 @@ export default {
this.toggleTyping('on');
},
markSeen() {
- this.$store.dispatch('markSeen', {
- inboxId: this.currentChat.inbox_id,
- contactId: this.currentChat.meta.sender.id,
- });
+ if (this.channelType !== 'Channel::FacebookPage') {
+ this.$store.dispatch('markSeen', {
+ inboxId: this.currentChat.inbox_id,
+ contactId: this.currentChat.meta.sender.id,
+ });
+ }
},
toggleTyping(status) {
- this.$store.dispatch('toggleTyping', {
- status,
- inboxId: this.currentChat.inbox_id,
- contactId: this.currentChat.meta.sender.id,
- });
+ if (this.channelType !== 'Channel::FacebookPage') {
+ this.$store.dispatch('toggleTyping', {
+ status,
+ inboxId: this.currentChat.inbox_id,
+ contactId: this.currentChat.meta.sender.id,
+ });
+ }
},
disableButton() {
const messageHasOnlyNewLines = !this.message.replace(/\n/g, '').length;
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index b3a97a334..6a779dbe7 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -14,7 +14,7 @@
},
"FOOTER": {
"MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
- "PRIVATE_MSG_INPUT": "Shift + enter for new line.This will be visible only to Agents"
+ "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
},
"REPLYBOX": {
"SEND": "Send",
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 983cec8bd..9c082a3df 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -9,6 +9,10 @@ module Channel
has_one :inbox, as: :channel, dependent: :destroy
has_secure_token :website_token
+ def name
+ 'Website'
+ end
+
def create_contact_inbox
ActiveRecord::Base.transaction do
contact = inbox.account.contacts.create!(name: ::Haikunator.haikunate(1000))
diff --git a/app/models/facebook_page.rb b/app/models/facebook_page.rb
deleted file mode 100644
index dd1726dac..000000000
--- a/app/models/facebook_page.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class FacebookPage < ApplicationRecord
- validates :account_id, presence: true
- validates_uniqueness_of :page_id, scope: :account_id
- mount_uploader :avatar, AvatarUploader
- belongs_to :account
-
- has_one :inbox, as: :channel, dependent: :destroy
-
- before_destroy :unsubscribe
-
- def name
- 'Facebook'
- end
-
- private
-
- def unsubscribe
- Facebook::Messenger::Subscriptions.unsubscribe(access_token: page_access_token)
- rescue StandardError => e
- true
- end
-end
diff --git a/app/views/api/v1/conversations/index.json.jbuilder b/app/views/api/v1/conversations/index.json.jbuilder
index 35dbf3988..fefa3c61a 100644
--- a/app/views/api/v1/conversations/index.json.jbuilder
+++ b/app/views/api/v1/conversations/index.json.jbuilder
@@ -12,7 +12,7 @@ json.data do
json.id conversation.contact.id
json.name conversation.contact.name
json.thumbnail conversation.contact.avatar.thumb.url
- json.channel conversation.inbox.try(:channel).try(:name)
+ json.channel conversation.inbox.try(:channel_type)
end
json.assignee conversation.assignee
end