Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/lib/triggers.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class Triggers {
constructor() {
if (!Triggers.instance) {
this._started = false;
this._chatOpened = false;
this._requests = [];
this._triggers = [];
this._enabled = true;
Expand Down Expand Up @@ -90,8 +91,8 @@ class Triggers {
}

async fire(trigger) {
const { token, user, firedTriggers = [] } = store.state;
if (!this._enabled || user) {
const { token, firedTriggers = [] } = store.state;
if (!this._enabled) {
return;
}
const { actions } = trigger;
Expand Down Expand Up @@ -146,6 +147,15 @@ class Triggers {
this.processTriggers();
}

processChatOpened() {
this._chatOpened = true;
if (!this._started) {
return;
}

this.processTriggers();
}

processTriggers() {
this._triggers.forEach((trigger) => {
if (trigger.skip) {
Expand All @@ -172,6 +182,13 @@ class Triggers {
this.fire(trigger);
}, parseInt(condition.value, 10) * 1000);
break;
case 'chat-opened-by-visitor':
if (!this._chatOpened) {
break;
}
this._chatOpened = false;
self.fire(trigger);
break;
}
});
});
Expand Down
5 changes: 4 additions & 1 deletion src/routes/Chat/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import constants from '../../lib/constants';
import { loadConfig } from '../../lib/main';
import { parentCall, runCallbackEventEmitter } from '../../lib/parentCall';
import { initRoom, closeChat, loadMessages, loadMoreMessages, defaultRoomParams, getGreetingMessages } from '../../lib/room';
import triggers from '../../lib/triggers';
import { Consumer } from '../../store';
import Chat from './component';

Expand Down Expand Up @@ -289,7 +290,7 @@ export class ChatContainer extends Component {
}

async componentDidUpdate(prevProps) {
const { messages, visible, minimized, dispatch } = this.props;
const { messages, visible, minimized, dispatch, room } = this.props;
const { messages: prevMessages, alerts: prevAlerts } = prevProps;

if (messages && prevMessages && messages.length !== prevMessages.length && visible && !minimized) {
Expand All @@ -299,6 +300,8 @@ export class ChatContainer extends Component {
const newAlerts = prevAlerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
dispatch({ alerts: newAlerts, unread: null, lastReadMessageId: nextLastMessage._id });
}
} else if (!room && visible && !minimized) {
triggers.processChatOpened();
}

await this.checkConnectingAgent();
Expand Down