Skip to content
Merged
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
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/lib/Helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ export const forwardRoomToDepartment = async (room: IOmnichannelRoom, guest: ILi
if (!chatQueued && oldServedBy && servedBy && oldServedBy._id === servedBy._id) {
if (!department?.fallbackForwardDepartment?.length) {
logger.debug(`Cannot forward room ${room._id}. Chat assigned to agent ${servedBy._id} (Previous was ${oldServedBy._id})`);
throw new Error('error-no-agents-online-in-department');
throw new Error('error-no-agents-available-for-service-on-department');
}

if (!transferData.originalDepartmentName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { RoutingManager } from '../../../../../../app/livechat/server/lib/Routin
import { settings } from '../../../../../../app/settings/server';
import type { IRoutingManagerConfig } from '../../../../../../definition/IRoutingManagerConfig';
import { getChatLimitsQuery } from '../../hooks/applySimultaneousChatsRestrictions';
import { logger } from '../logger';

/* Load Balancing Queuing method:
*
Expand Down Expand Up @@ -32,6 +33,8 @@ class LoadBalancing {
async getNextAgent(department?: string, ignoreAgentId?: string) {
const extraQuery = await getChatLimitsQuery(department);
const unavailableUsers = await Users.getUnavailableAgents(department, extraQuery);
logger.debug({ msg: 'Ignoring unavailable agents from assignment', unavailableUsers, department });

const nextAgent = await Users.getNextLeastBusyAgent(
department,
ignoreAgentId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { RoutingManager } from '../../../../../../app/livechat/server/lib/Routin
import { settings } from '../../../../../../app/settings/server';
import type { IRoutingManagerConfig } from '../../../../../../definition/IRoutingManagerConfig';
import { getChatLimitsQuery } from '../../hooks/applySimultaneousChatsRestrictions';
import { logger } from '../logger';

/* Load Rotation Queuing method:
* Routing method where the agent with the oldest routing time is the next agent to serve incoming chats
Expand All @@ -31,6 +32,8 @@ class LoadRotation {
public async getNextAgent(department?: string, ignoreAgentId?: string): Promise<IOmnichannelCustomAgent | undefined> {
const extraQuery = await getChatLimitsQuery(department);
const unavailableUsers = await Users.getUnavailableAgents(department, extraQuery);
logger.debug({ msg: 'Ignoring unavailable agents from assignment', unavailableUsers, department });

const nextAgent = await Users.getLastAvailableAgentRouted(
department,
ignoreAgentId,
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ describe('LIVECHAT - rooms', () => {
.expect(400)
.expect((res: Response) => {
expect(res.body).to.have.property('success', false);
expect(res.body).to.have.property('error', 'error-no-agents-online-in-department');
expect(res.body).to.have.property('error', 'error-no-agents-available-for-service-on-department');
});

await deleteDepartment(initialDepartment._id);
Expand Down Expand Up @@ -1377,7 +1377,7 @@ describe('LIVECHAT - rooms', () => {
});

expect(res.status).to.equal(400);
expect(res.body).to.have.property('error', 'error-no-agents-online-in-department');
expect(res.body).to.have.property('error', 'error-no-agents-available-for-service-on-department');

await Promise.all([
deleteDepartment(initialDepartment._id),
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/ar.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4391,7 +4391,6 @@
"error-message-editing-blocked": "تحرير الرسالة محظور",
"error-message-size-exceeded": "حجم الرسالة تجاوز الحد المسموح به Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "يلزمك توفير رابط [unsubscribe].",
"error-no-agents-online-in-department": "لا يوجد وكلاء على الإنترنت في القسم",
"error-no-message-for-unread": "لا توجد رسائل لوضع علامة غير مقروء",
"error-no-owner-channel": "يمكن للمالكين وحدهم إضافة هذه القناة إلى الفريق",
"error-no-permission-team-channel": "ليس لديك إذن لإضافة هذه القناة إلى الفريق",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/ca.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4273,7 +4273,6 @@
"error-message-editing-blocked": "L'edició de missatges està bloquejada",
"error-message-size-exceeded": "El missatge s'excedeix de Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Ha de proporcionar l'enllaç [unsubscribe].",
"error-no-agents-online-in-department": "No hi ha agents en línia en el departament",
"error-no-message-for-unread": "No hi ha missatges per marcar com a no llegits",
"error-no-owner-channel": "Només els propietaris poden afegir aquest canal a l'equip",
"error-no-permission-team-channel": "No tens permís per afegir aquest canal a l'equip.",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/de.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4900,7 +4900,6 @@
"error-message-editing-blocked": "Nachrichten bearbeiten ist gesperrt",
"error-message-size-exceeded": "Nachrichtengröße überschreitet Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Sie müssen einen Link zum [unsubscribe] angeben.",
"error-no-agents-online-in-department": "Keine Agenten der Abteilung online",
"error-no-message-for-unread": "Es gibt keine Nachrichten um sie als ungelesen zu markieren",
"error-no-owner-channel": "Nur Besitzer können diesen Channel zum Team hinzufügen",
"error-no-permission-team-channel": "Sie haben nicht die Berechtigung, diesen Channel zum Team hinzuzufügen",
Expand Down
2 changes: 1 addition & 1 deletion packages/i18n/src/locales/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -6097,7 +6097,7 @@
"error-message-editing-blocked": "Message editing is blocked",
"error-message-size-exceeded": "Message size exceeds Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "You must provide the [unsubscribe] link.",
"error-no-agents-online-in-department": "No agents online in the department",
"error-no-agents-available-for-service-on-department": "No agents are available for service on this department.",
"error-no-message-for-unread": "There are no messages to mark unread",
"error-no-owner-channel": "Only owners can add this channel to the team",
"error-no-permission-team-channel": "You don't have permission to add this channel to the team",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/es.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4536,7 +4536,6 @@
"error-message-editing-blocked": "La edición de mensajes está bloqueada",
"error-message-size-exceeded": "El tamaño de mensaje excede el máximo: Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Debe proporcionar el enlace [unsubscribe].",
"error-no-agents-online-in-department": "No hay agentes en línea en el departamento",
"error-no-message-for-unread": "No hay mensajes para marcar como no leídos",
"error-no-owner-channel": "Solo los propietarios pueden añadir este canal al equipo",
"error-no-permission-team-channel": "No tienes permiso para añadir este canal al equipo",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/fi.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -5084,7 +5084,6 @@
"error-message-editing-blocked": "Viestin muokkaus on estetty",
"error-message-size-exceeded": "Viestin koko on yli Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Sinun on annettava [unsubscribe] -linkki.",
"error-no-agents-online-in-department": "Osastolla ei ole paikalla olevia agentteja",
"error-no-message-for-unread": "Ei viestejä, joita voi merkitä lukemattomiksi",
"error-no-owner-channel": "Vain omistajat voivat lisätä tämän kanavan tiimille",
"error-no-permission-team-channel": "Sinulla ei ole oikeutta lisätä tätä kanavaa tiimille",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/fr.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4397,7 +4397,6 @@
"error-message-editing-blocked": "La modification de message est bloquée",
"error-message-size-exceeded": "La taille du message dépasse Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Vous devez fournir le lien [unsubscribe].",
"error-no-agents-online-in-department": "Aucun agent en ligne dans le département",
"error-no-message-for-unread": "Il n'y a aucun message à marquer comme non lu",
"error-no-owner-channel": "Seuls les propriétaires peuvent ajouter ce canal à l’équipe",
"error-no-permission-team-channel": "Vous n'avez pas l'autorisation d'ajouter ce canal à l'équipe",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/hi-IN.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -5426,7 +5426,6 @@
"error-message-editing-blocked": "संदेश संपादन अवरुद्ध है",
"error-message-size-exceeded": "संदेश का आकार Message_MaxAllowedSize से अधिक है",
"error-missing-unsubscribe-link": "आपको [सदस्यता समाप्त करें] लिंक प्रदान करना होगा।",
"error-no-agents-online-in-department": "विभाग में कोई एजेंट ऑनलाइन नहीं है",
"error-no-message-for-unread": "अपठित चिह्नित करने के लिए कोई संदेश नहीं हैं",
"error-no-owner-channel": "केवल मालिक ही इस चैनल को टीम में जोड़ सकते हैं",
"error-no-permission-team-channel": "आपको इस चैनल को टीम में जोड़ने की अनुमति नहीं है",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/hu.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4791,7 +4791,6 @@
"error-message-editing-blocked": "Az üzenet szerkesztése tiltva van",
"error-message-size-exceeded": "Az üzenet mérete túllépi a Message_MaxAllowedSize méretet",
"error-missing-unsubscribe-link": "Meg kell adnia a [unsubscribe] hivatkozást.",
"error-no-agents-online-in-department": "Nincsenek elérhető ügyintézők a részlegen",
"error-no-message-for-unread": "Nincsenek olvasatlanként megjelölendő üzenetek",
"error-no-owner-channel": "Csak a tulajdonosok adhatják hozzá ezt a csatornát a csapathoz",
"error-no-permission-team-channel": "Nincs jogosultsága ahhoz, hogy ezt a csatornát a csapathoz adja",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/ja.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4353,7 +4353,6 @@
"error-message-editing-blocked": "メッセージの編集がブロックされています",
"error-message-size-exceeded": "メッセージサイズがMessage_MaxAllowedSizeを超えています",
"error-missing-unsubscribe-link": "[unsubscribe]リンクを入力してください。",
"error-no-agents-online-in-department": "部署にオンラインのエージェントがいません",
"error-no-message-for-unread": "未読にするメッセージがありません",
"error-no-owner-channel": "所有者のみがこのチャネルをチームに追加できます",
"error-no-permission-team-channel": "このチャネルをチームに追加する権限がありません。",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/nb.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -6071,7 +6071,6 @@
"error-message-editing-blocked": "Meldingsredigering er blokkert",
"error-message-size-exceeded": "Meldingsstørrelsen overskrider Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Du må oppgi [unsubscribe]-lenken.",
"error-no-agents-online-in-department": "Ingen agenter online i avdelingen",
"error-no-message-for-unread": "Det er ingen meldinger å merke som ulest",
"error-no-owner-channel": "Bare eiere kan legge til denne kanalen i teamet",
"error-no-permission-team-channel": "Du har ikke tillatelse til å legge til denne kanalen i teamet",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/nl.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4386,7 +4386,6 @@
"error-message-editing-blocked": "Het bewerken van berichten is geblokkeerd",
"error-message-size-exceeded": "De berichtgrootte is groter dan Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Je moet een [unsubscribe] link opgeven.",
"error-no-agents-online-in-department": "Geen agenten online in de afdeling",
"error-no-message-for-unread": "Er zijn geen berichten die als ongelezen kunnen worden gemarkeerd",
"error-no-owner-channel": "Alleen eigenaren kunnen dit kanaal aan het team toevoegen",
"error-no-permission-team-channel": "Je hebt geen toestemming om dit kanaal aan het team toe te voegen",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/nn.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -5615,7 +5615,6 @@
"error-message-editing-blocked": "Meldingsredigering er blokkert",
"error-message-size-exceeded": "Meldingsstørrelsen overstiger Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Du må gi koblingen [oppheve].",
"error-no-agents-online-in-department": "Ingen agenter online i avdelingen",
"error-no-message-for-unread": "Det er ingen meldinger å merke som ulest",
"error-no-owner-channel": "Bare eiere kan legge til denne kanalen i teamet",
"error-no-permission-team-channel": "Du har ikke tillatelse til å legge til denne kanalen i teamet",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/pl.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4795,7 +4795,6 @@
"error-message-editing-blocked": "Edytowanie wiadomości jest zablokowane",
"error-message-size-exceeded": "Rozmiar wiadomości przekracza Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Musisz wstawić w treści znacznik [unsubscribe].",
"error-no-agents-online-in-department": "Brak agentów online w dziale",
"error-no-message-for-unread": "Nie ma żadnych wiadomości do oznaczenia jako nieprzeczytane",
"error-no-owner-channel": "Tylko właściciele mogą dodać ten kanał do zespołu",
"error-no-permission-team-channel": "Nie masz uprawnień, aby dodać ten kanał do zespołu",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/pt-BR.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -6063,7 +6063,6 @@
"error-message-editing-blocked": "Edição de mensagens bloqueada",
"error-message-size-exceeded": "O tamanho da mensagem excede Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Você deve fornecer o link para [cancelar inscrição].",
"error-no-agents-online-in-department": "Nenhum agente online no departamento",
"error-no-message-for-unread": "Não há mensagens para serem marcadas como não lidas",
"error-no-owner-channel": "Apenas proprietários podem adicionar este canal à equipe",
"error-no-permission-team-channel": "Você não tem permissão para incluir este canal à equipe",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/ru.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4568,7 +4568,6 @@
"error-message-editing-blocked": "Редактирование сообщений запрещено",
"error-message-size-exceeded": "Размер сообщения превышает Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Для того, чтобы [unsubscribe], вы должны предоставить эту ссылку.",
"error-no-agents-online-in-department": "В отделе нет агентов онлайн",
"error-no-message-for-unread": "Нет сообщений, которые можно отметить как непрочитанные",
"error-no-owner-channel": "Только владельцы могут добавить этот канал к команде",
"error-no-permission-team-channel": "У вас нет разрешения на добавление этого канала к команде",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/sv.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -6046,7 +6046,6 @@
"error-message-editing-blocked": "Meddelanderedigering är blockerad",
"error-message-size-exceeded": "Meddelandestorleken överstiger Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "Du måste ge en [unsubscribe]-länk.",
"error-no-agents-online-in-department": "Inga agenter online i avdelningen",
"error-no-message-for-unread": "Det finns inga meddelanden att markera som olästa",
"error-no-owner-channel": "Det är bara ägare som kan lägga till den här kanalen i teamet",
"error-no-permission-team-channel": "Du har inte behörighet att lägga till kanalen i teamet",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/zh-TW.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4148,7 +4148,6 @@
"error-message-editing-blocked": "訊息編輯已停用",
"error-message-size-exceeded": "訊息大小超過 Message_MaxAllowedSize",
"error-missing-unsubscribe-link": "您必須提供 [unsubscribe] 的網址。",
"error-no-agents-online-in-department": "部門內沒有客服在線上",
"error-no-message-for-unread": "這裡沒有訊息是標示未讀取",
"error-no-owner-channel": "只有擁有者才能將此頻道增加到團隊",
"error-no-permission-team-channel": "您沒有權限將此頻道增加到團隊",
Expand Down
Loading