# Pull Request Template ## Description Blocked contacts are now excluded from SLA assignment, processing, reports, and conversation SLA UI while they remain blocked. Existing SLA records are preserved, and SLA behavior resumes if the contact is unblocked. Fixes https://linear.app/chatwoot/issue/CW-7435/sla-should-not-trigger-for-blocked-contacts ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? - `bundle exec rspec spec/enterprise/models/conversation_spec.rb spec/enterprise/models/applied_sla_spec.rb spec/enterprise/services/enterprise/action_service_spec.rb spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/presenters/conversations/event_data_presenter_spec.rb` — 78 examples, 0 failures - `bundle exec rubocop enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb enterprise/app/jobs/sla/process_account_applied_slas_job.rb enterprise/app/models/applied_sla.rb enterprise/app/models/enterprise/concerns/conversation.rb enterprise/app/presenters/enterprise/conversations/event_data_presenter.rb enterprise/app/services/enterprise/action_service.rb enterprise/app/services/sla/evaluate_applied_sla_service.rb lib/tasks/apply_sla.rake spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb spec/enterprise/controllers/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb spec/enterprise/models/applied_sla_spec.rb spec/enterprise/models/conversation_spec.rb spec/enterprise/presenters/conversations/event_data_presenter_spec.rb spec/enterprise/services/enterprise/action_service_spec.rb spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb` — no offenses - `pnpm exec vitest --no-watch --no-cache --no-coverage app/javascript/dashboard/components/widgets/conversation/specs/ConversationCard.spec.js` — 2 tests passed - `pnpm exec eslint app/javascript/dashboard/components-next/Conversation/ConversationCard/CardMessagePreviewWithMeta.vue app/javascript/dashboard/components-next/Conversation/ConversationCard/ConversationCardExpanded.vue app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue app/javascript/dashboard/components/widgets/conversation/specs/ConversationCard.spec.js` — passed with existing raw-text warnings in `ConversationHeader.vue` - `git diff --cached --check` — clean ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
182 lines
5.5 KiB
Vue
182 lines
5.5 KiB
Vue
<script setup>
|
|
import { computed, ref } from 'vue';
|
|
import { useRoute } from 'vue-router';
|
|
import { useStore } from 'vuex';
|
|
import { useElementSize } from '@vueuse/core';
|
|
import BackButton from '../BackButton.vue';
|
|
import InboxName from '../InboxName.vue';
|
|
import MoreActions from './MoreActions.vue';
|
|
import Avatar from 'next/avatar/Avatar.vue';
|
|
import SLACardLabel from './components/SLACardLabel.vue';
|
|
import ConversationCallButton from './ConversationCallButton.vue';
|
|
import wootConstants from 'dashboard/constants/globals';
|
|
import { conversationListPageURL } from 'dashboard/helper/URLHelper';
|
|
import { snoozedReopenTime } from 'dashboard/helper/snoozeHelpers';
|
|
import { useInbox } from 'dashboard/composables/useInbox';
|
|
import { useAlert } from 'dashboard/composables';
|
|
import { useI18n } from 'vue-i18n';
|
|
import { copyTextToClipboard } from 'shared/helpers/clipboard';
|
|
|
|
const props = defineProps({
|
|
chat: {
|
|
type: Object,
|
|
default: () => ({}),
|
|
},
|
|
showBackButton: {
|
|
type: Boolean,
|
|
default: false,
|
|
},
|
|
});
|
|
|
|
const { t } = useI18n();
|
|
const store = useStore();
|
|
const route = useRoute();
|
|
const conversationHeader = ref(null);
|
|
const { width } = useElementSize(conversationHeader);
|
|
const { isAWebWidgetInbox } = useInbox();
|
|
|
|
const currentChat = computed(() => store.getters.getSelectedChat);
|
|
const accountId = computed(() => store.getters.getCurrentAccountId);
|
|
|
|
const chatMetadata = computed(() => props.chat.meta);
|
|
|
|
const backButtonUrl = computed(() => {
|
|
const {
|
|
params: { inbox_id: inboxId, label, teamId, id: customViewId },
|
|
name,
|
|
} = route;
|
|
|
|
const conversationTypeMap = {
|
|
conversation_through_mentions: 'mention',
|
|
conversation_through_participating: 'participating',
|
|
conversation_through_unattended: 'unattended',
|
|
};
|
|
return conversationListPageURL({
|
|
accountId: accountId.value,
|
|
inboxId,
|
|
label,
|
|
teamId,
|
|
conversationType: conversationTypeMap[name],
|
|
customViewId,
|
|
});
|
|
});
|
|
|
|
const isHMACVerified = computed(() => {
|
|
if (!isAWebWidgetInbox.value) {
|
|
return true;
|
|
}
|
|
return chatMetadata.value.hmac_verified;
|
|
});
|
|
|
|
const currentContact = computed(() =>
|
|
store.getters['contacts/getContact'](props.chat.meta.sender.id)
|
|
);
|
|
|
|
const isSnoozed = computed(
|
|
() => currentChat.value.status === wootConstants.STATUS_TYPE.SNOOZED
|
|
);
|
|
|
|
const snoozedDisplayText = computed(() => {
|
|
const { snoozed_until: snoozedUntil } = currentChat.value;
|
|
if (snoozedUntil) {
|
|
return `${t('CONVERSATION.HEADER.SNOOZED_UNTIL')} ${snoozedReopenTime(snoozedUntil)}`;
|
|
}
|
|
return t('CONVERSATION.HEADER.SNOOZED_UNTIL_NEXT_REPLY');
|
|
});
|
|
|
|
const inbox = computed(() => {
|
|
const { inbox_id: inboxId } = props.chat;
|
|
return store.getters['inboxes/getInbox'](inboxId);
|
|
});
|
|
|
|
const hasMultipleInboxes = computed(
|
|
() => store.getters['inboxes/getInboxes'].length > 1
|
|
);
|
|
|
|
const hasSlaPolicyId = computed(
|
|
() => props.chat?.applied_sla?.id && !currentContact.value?.blocked
|
|
);
|
|
|
|
const copyConversationId = async () => {
|
|
try {
|
|
await copyTextToClipboard(String(props.chat.id));
|
|
useAlert(t('CONVERSATION.HEADER.COPY_ID_SUCCESS'));
|
|
} catch (error) {
|
|
// error
|
|
}
|
|
};
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
ref="conversationHeader"
|
|
class="flex flex-col gap-3 items-center justify-between flex-1 w-full min-w-0 xl:flex-row px-3 pt-3 pb-2 h-24 xl:h-12"
|
|
>
|
|
<div
|
|
class="flex items-center justify-start w-full xl:w-auto max-w-full min-w-0 xl:flex-1"
|
|
>
|
|
<BackButton
|
|
v-if="showBackButton"
|
|
:back-url="backButtonUrl"
|
|
class="ltr:mr-2 rtl:ml-2"
|
|
/>
|
|
<Avatar
|
|
:name="currentContact.name"
|
|
:src="currentContact.thumbnail"
|
|
:size="32"
|
|
:status="currentContact.availability_status"
|
|
hide-offline-status
|
|
/>
|
|
<div
|
|
class="flex flex-col items-start min-w-0 ml-2 overflow-hidden rtl:ml-0 rtl:mr-2"
|
|
>
|
|
<div class="flex flex-row items-center max-w-full gap-1 p-0 m-0">
|
|
<span
|
|
class="text-sm font-medium truncate leading-tight text-n-slate-12"
|
|
>
|
|
{{ currentContact.name }}
|
|
</span>
|
|
<fluent-icon
|
|
v-if="!isHMACVerified"
|
|
v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
|
|
size="14"
|
|
class="text-n-amber-10 my-0 mx-0 min-w-[14px] flex-shrink-0"
|
|
icon="warning"
|
|
/>
|
|
</div>
|
|
|
|
<div
|
|
class="flex items-center gap-1 overflow-hidden text-xs conversation--header--actions text-n-slate-11 text-ellipsis whitespace-nowrap"
|
|
>
|
|
<button
|
|
type="button"
|
|
class="truncate text-label-small text-n-slate-11 hover:text-n-slate-12 !p-0 cucursor-pointer"
|
|
@click="copyConversationId"
|
|
>
|
|
{{ `#${chat.id}` }}
|
|
</button>
|
|
<span v-if="hasMultipleInboxes">•</span>
|
|
<InboxName v-if="hasMultipleInboxes" :inbox="inbox" class="!mx-0" />
|
|
<span v-if="isSnoozed">•</span>
|
|
<span v-if="isSnoozed" class="font-medium text-n-amber-10">
|
|
{{ snoozedDisplayText }}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div
|
|
class="flex flex-row items-center justify-start xl:justify-end flex-shrink-0 gap-2 w-full xl:w-auto header-actions-wrap"
|
|
>
|
|
<SLACardLabel
|
|
v-if="hasSlaPolicyId"
|
|
:chat="chat"
|
|
show-extended-info
|
|
:parent-width="width"
|
|
class="hidden md:flex"
|
|
/>
|
|
<ConversationCallButton :inbox="inbox" :chat="currentChat" />
|
|
<MoreActions :conversation-id="currentChat.id" />
|
|
</div>
|
|
</div>
|
|
</template>
|