fix: Disable typing indicator for user when agent is typing a private note (#3303)

This commit is contained in:
Hugo Sarti
2021-11-01 05:20:07 -03:00
committed by GitHub
parent 000c7603d6
commit 68fa694268
8 changed files with 38 additions and 16 deletions

View File

@@ -64,9 +64,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
def toggle_typing_status
case params[:typing_status]
when 'on'
trigger_typing_event(CONVERSATION_TYPING_ON)
trigger_typing_event(CONVERSATION_TYPING_ON, params[:is_private])
when 'off'
trigger_typing_event(CONVERSATION_TYPING_OFF)
trigger_typing_event(CONVERSATION_TYPING_OFF, params[:is_private])
end
head :ok
end
@@ -90,9 +90,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
@conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
end
def trigger_typing_event(event)
def trigger_typing_event(event, is_private)
user = current_user.presence || @resource
Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user)
Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
end
def conversation

View File

@@ -51,9 +51,10 @@ class ConversationApi extends ApiClient {
return axios.post(`${this.url}/${id}/update_last_seen`);
}
toggleTyping({ conversationId, status }) {
toggleTyping({ conversationId, status, isPrivate }) {
return axios.post(`${this.url}/${conversationId}/toggle_typing_status`, {
typing_status: status,
is_private: isPrivate
});
}

View File

@@ -415,9 +415,11 @@ export default {
},
toggleTyping(status) {
const conversationId = this.currentChat.id;
const isPrivate = this.isPrivate;
this.$store.dispatch('conversationTypingStatus/toggleTyping', {
status,
conversationId,
isPrivate,
});
},
onFileUpload(file) {

View File

@@ -12,9 +12,9 @@ export const getters = {
};
export const actions = {
toggleTyping: async (_, { status, conversationId }) => {
toggleTyping: async (_, { status, conversationId, isPrivate }) => {
try {
await ConversationAPI.toggleTyping({ status, conversationId });
await ConversationAPI.toggleTyping({ status, conversationId, isPrivate });
} catch (error) {
// Handle error
}

View File

@@ -55,7 +55,10 @@ class ActionCableConnector extends BaseActionCableConnector {
ActionCableConnector.refreshConnector(pubsubToken);
};
onTypingOn = () => {
onTypingOn = data => {
if (data.is_private) {
return
}
this.clearTimer();
this.app.$store.dispatch('conversation/toggleAgentTyping', {
status: 'on',

View File

@@ -50,7 +50,8 @@ class ActionCableListener < BaseListener
tokens,
CONVERSATION_TYPING_ON,
conversation: conversation.push_event_data,
user: user.push_event_data
user: user.push_event_data,
is_private: event.data[:is_private] || false
)
end
@@ -65,7 +66,8 @@ class ActionCableListener < BaseListener
tokens,
CONVERSATION_TYPING_OFF,
conversation: conversation.push_event_data,
user: user.push_event_data
user: user.push_event_data,
is_private: event.data[:is_private] || false
)
end