Skip to content
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
28 changes: 20 additions & 8 deletions webplugin/js/app/kommunicate-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ KommunicateUI = {
isCSATtriggeredByUser: false,
isConvJustResolved: false,
isConversationResolvedFromZendesk: false,
restartBannerForced: false,
faqEventsInitialized: false,
faqCategoriesReady: false,
faqCategoryRequestPending: false,
Expand Down Expand Up @@ -1440,13 +1441,8 @@ KommunicateUI = {
!isCSATtriggeredByUser &&
!isConvJustResolved
) {
kommunicateCommons.getFeedback(CURRENT_GROUP_DATA.tabId, feedbackResponseCallback);
function feedbackResponseCallback(data) {
var feedback = data.data;
KommunicateUI.convRatedTabIds[CURRENT_GROUP_DATA.tabId] = feedback
? KommunicateConstants.FEEDBACK_API_STATUS.RATED
: KommunicateConstants.FEEDBACK_API_STATUS.INIT;
CURRENT_GROUP_DATA.currentGroupFeedback = feedback;
var activeTabIdForFeedback = CURRENT_GROUP_DATA.tabId;
if (!KommunicateUI.restartBannerForced) {
kommunicateCommons.hide('.mck-box-form-container');
kommunicateCommons.show('.mck-csat-text-1');
kommunicateCommons.modifyClassList(
Expand All @@ -1455,7 +1451,22 @@ KommunicateUI = {
},
'mck-restart-conv-banner'
);
kommunicateCommons.hide('#csat-1', '#csat-2', '#csat-3', '#km-widget-options');
KommunicateUI.updateScroll(messageBody);
}
kommunicateCommons.hide('#csat-1', '#csat-2', '#csat-3', '#km-widget-options');
kommunicateCommons.getFeedback(activeTabIdForFeedback, feedbackResponseCallback);
function feedbackResponseCallback(data) {
if (
!CURRENT_GROUP_DATA ||
String(CURRENT_GROUP_DATA.tabId) !== String(activeTabIdForFeedback)
) {
return;
}
var feedback = data.data;
KommunicateUI.convRatedTabIds[CURRENT_GROUP_DATA.tabId] = feedback
? KommunicateConstants.FEEDBACK_API_STATUS.RATED
: KommunicateConstants.FEEDBACK_API_STATUS.INIT;
CURRENT_GROUP_DATA.currentGroupFeedback = feedback;
/*
csat-1 : csat rating first screen where you can rate via emoticons.
csat-2 : csat rating second screen where you can add comments.
Expand Down Expand Up @@ -1516,6 +1527,7 @@ KommunicateUI = {
kommunicateCommons.hide('#mck-conversation-status-box');
!KM_GLOBAL.disableTextArea && kommunicateCommons.show('.mck-box-form-container');
kommunicateCommons.hide('.mck-csat-text-1');
KommunicateUI.restartBannerForced = false;
}
},
handleAttachmentIconVisibility: function (enableAttachment, msg, groupReloaded) {
Expand Down
54 changes: 37 additions & 17 deletions webplugin/js/app/mck-sidebox-1.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -3401,11 +3401,11 @@ const firstVisibleMsg = {
}

CURRENT_GROUP_DATA.currentGroupFeedback = result.data.data;
KommunicateUI.showClosedConversationBanner(false);
KommunicateUI.restartBannerForced = true;
KommunicateUI.showClosedConversationBanner(true);
var submitBtn = document.getElementById('mck-submit-comment');
submitBtn && submitBtn.removeAttribute('disabled');
document.getElementById('mck-feedback-comment').value = '';
$applozic('#mck-sidebox-ft').removeClass(
'mck-restart-conv-banner km-mid-conv-csat'
);
if (appOptions?.appSettings?.chatWidget?.csatRatingBase == 5) {
ratingService.resetStarsColor();
}
Expand All @@ -3423,6 +3423,8 @@ const firstVisibleMsg = {
}
},
error: function () {
var submitBtn = document.getElementById('mck-submit-comment');
submitBtn && submitBtn.removeAttribute('disabled');
console.log('Error submitting feedback');
},
});
Expand Down Expand Up @@ -3776,6 +3778,15 @@ const firstVisibleMsg = {
userId: MCK_USER_ID,
email: LOGGED_IN_USER.email,
};
kommunicateCommons.show('.mck-csat-text-1');
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shows the restart banner text (“If you have any other queries, just Restart this conversation”).

kommunicateCommons.modifyClassList(
{
id: ['mck-sidebox-ft'],
},
'mck-restart-conv-banner'
);
var messageBody = document.querySelector('.mck-message-inner.mck-group-inner');
messageBody && KommunicateUI.updateScroll(messageBody);
_this.sendFeedback(feedbackObject);
});
function updateStarFillFromValue(val) {
Expand Down Expand Up @@ -4236,7 +4247,9 @@ const firstVisibleMsg = {
'',
'mck-restart-conv-banner'
);

if (CURRENT_GROUP_DATA) {
CURRENT_GROUP_DATA.currentGroupFeedback = null;
}
KommunicateUI.showClosedConversationBanner(false);
KommunicateUI.isConvJustResolved = false;
KommunicateUI.isConversationResolvedFromZendesk = false;
Expand Down Expand Up @@ -6898,6 +6911,23 @@ const firstVisibleMsg = {
data.message[0] && data.message[0].contactIds;
CURRENT_GROUP_DATA.teamId =
data && data.groupFeeds[0] && data.groupFeeds[0].metadata.KM_TEAM_ID;
// Ensure resolved/closed banner shows immediately on chat open.
if (
!params.startTime &&
params.tabId &&
params.isGroup &&
typeof CURRENT_GROUP_DATA.conversationStatus !== 'undefined'
) {
var isClosedConversation =
CURRENT_GROUP_DATA.conversationStatus ==
Kommunicate.conversationHelper.status.CLOSED;
if (isClosedConversation) {
KommunicateUI.isConvJustResolved = true;
KommunicateUI.showClosedConversationBanner(true);
} else {
KommunicateUI.showClosedConversationBanner(false);
}
}
params.isWaitingQueue && KommunicateUI.handleWaitingQueueMessage();

const assignee =
Expand Down Expand Up @@ -15510,18 +15540,8 @@ const firstVisibleMsg = {
resp.message.metadata.KM_STATUS ===
KommunicateConstants.CONVERSATION_RESOLVED_STATUS
Comment thread
sentry[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
) {
if (
MCK_BOT_MESSAGE_DELAY !== 0 &&
mckMessageLayout.isMessageSentByBot(resp.message, contact) &&
!CURRENT_GROUP_DATA.TOKENIZE_RESPONSE
) {
setTimeout(function () {
KommunicateUI.showClosedConversationBanner(true);
}, MCK_BOT_MESSAGE_DELAY);
} else {
KommunicateUI.isConvJustResolved = !!!KommunicateUI.isConvJustResolved;
KommunicateUI.showClosedConversationBanner(true);
}
KommunicateUI.isConvJustResolved = true;
KommunicateUI.showClosedConversationBanner(true);
} else if (
resp.message.metadata.KM_STATUS ===
KommunicateConstants.CONVERSATION_OPEN_STATUS
Expand Down
Loading