# 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>
195 lines
6.2 KiB
Vue
195 lines
6.2 KiB
Vue
<script setup>
|
|
import { computed, useTemplateRef } from 'vue';
|
|
import { getLastMessage } from 'dashboard/helper/conversationHelper';
|
|
import CardAvatar from './CardAvatar.vue';
|
|
import CardContent from './CardContent.vue';
|
|
import CardLabels from './CardLabelsV5.vue';
|
|
import CardPriorityIcon from './CardPriorityIcon.vue';
|
|
import InboxName from 'dashboard/components-next/Conversation/InboxName.vue';
|
|
import Avatar from 'next/avatar/Avatar.vue';
|
|
import TimeAgo from 'dashboard/components/ui/TimeAgo.vue';
|
|
import SLACardLabel from 'dashboard/components-next/Conversation/Sla/SLACardLabel.vue';
|
|
import CardStatusIcon from './CardStatusIcon.vue';
|
|
import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
|
|
import Icon from 'dashboard/components-next/icon/Icon.vue';
|
|
|
|
const props = defineProps({
|
|
chat: { type: Object, required: true },
|
|
currentContact: { type: Object, required: true },
|
|
assignee: { type: Object, default: () => ({}) },
|
|
inbox: { type: Object, default: () => ({}) },
|
|
selected: { type: Boolean, default: false },
|
|
isActiveChat: { type: Boolean, default: false },
|
|
showAssignee: { type: Boolean, default: false },
|
|
showInboxName: { type: Boolean, default: false },
|
|
isInboxView: { type: Boolean, default: false },
|
|
});
|
|
|
|
const emit = defineEmits([
|
|
'selectConversation',
|
|
'deSelectConversation',
|
|
'click',
|
|
'contextmenu',
|
|
]);
|
|
|
|
const lastMessageInChat = computed(() => getLastMessage(props.chat));
|
|
const showLabelsSection = computed(() => props.chat.labels?.length > 0);
|
|
|
|
const voiceCallData = computed(() => {
|
|
const last = lastMessageInChat.value;
|
|
if (last?.content_type !== 'voice_call' || !last.call) {
|
|
return { status: null, direction: null };
|
|
}
|
|
return {
|
|
status: last.call.status,
|
|
direction: last.call.direction === 'outgoing' ? 'outbound' : 'inbound',
|
|
};
|
|
});
|
|
|
|
const unreadCount = computed(() => props.chat.unread_count);
|
|
|
|
const slaCardLabel = useTemplateRef('slaCardLabel');
|
|
|
|
const hasSlaPolicyId = computed(
|
|
() =>
|
|
!props.currentContact?.blocked &&
|
|
(props.chat?.applied_sla?.id || slaCardLabel.value?.hasSlaThreshold)
|
|
);
|
|
|
|
const selectedModel = computed({
|
|
get: () => props.selected,
|
|
set: value => {
|
|
if (value) {
|
|
emit('selectConversation', value);
|
|
} else {
|
|
emit('deSelectConversation', value);
|
|
}
|
|
},
|
|
});
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
class="conversation relative cursor-pointer group grid gap-4 items-center px-3 h-12 border-b border-n-slate-3 hover:border-n-surface-1 hover:z-[1] before:content-[none] before:absolute before:-top-px before:inset-x-0 before:h-px before:bg-n-surface-1 before:pointer-events-none hover:before:content-['']"
|
|
:class="{
|
|
'active animate-card-select bg-n-alpha-1 dark:bg-n-alpha-3 !border-n-surface-1':
|
|
isActiveChat,
|
|
'selected bg-n-slate-2 dark:bg-n-slate-3 !border-n-surface-1': selected,
|
|
'hover:bg-n-alpha-1': !isActiveChat && !selected,
|
|
'grid-cols-[minmax(0,2fr)_minmax(0,1fr)]': showLabelsSection,
|
|
'grid-cols-[minmax(0,2fr)_max-content]': !showLabelsSection,
|
|
}"
|
|
@click="$emit('click', $event)"
|
|
@contextmenu="$emit('contextmenu', $event)"
|
|
>
|
|
<!-- LEFT SECTION -->
|
|
<div class="flex items-center gap-2 min-w-0 flex-1">
|
|
<div class="flex items-center justify-center flex-shrink-0" @click.stop>
|
|
<Checkbox v-model="selectedModel" />
|
|
</div>
|
|
|
|
<div class="w-px h-3 bg-n-slate-6 flex-shrink-0" />
|
|
|
|
<div class="w-4 flex items-center justify-center flex-shrink-0">
|
|
<CardPriorityIcon :priority="chat.priority" show-empty />
|
|
</div>
|
|
|
|
<div class="w-4 flex items-center justify-center flex-shrink-0">
|
|
<Avatar
|
|
v-if="showAssignee && assignee.name"
|
|
v-tooltip.top="{
|
|
content: assignee.name,
|
|
delay: { show: 500, hide: 0 },
|
|
}"
|
|
:name="assignee.name"
|
|
:src="assignee.thumbnail"
|
|
:size="14"
|
|
:status="assignee.availability_status"
|
|
hide-offline-status
|
|
/>
|
|
<Icon
|
|
v-else
|
|
icon="i-woot-empty-assignee"
|
|
class="size-4 text-n-slate-7"
|
|
/>
|
|
</div>
|
|
|
|
<div class="w-4 flex items-center justify-center flex-shrink-0">
|
|
<CardStatusIcon :status="chat.status" show-empty />
|
|
</div>
|
|
|
|
<div class="w-px h-3 bg-n-slate-6 flex-shrink-0" />
|
|
|
|
<div v-if="!isInboxView && showInboxName" class="w-20 flex-shrink-0">
|
|
<InboxName v-if="showInboxName" :inbox="inbox" class="min-w-0" />
|
|
</div>
|
|
|
|
<div
|
|
v-if="!isInboxView && showInboxName"
|
|
class="w-px h-3 bg-n-slate-6 flex-shrink-0"
|
|
/>
|
|
|
|
<div
|
|
v-tooltip.top="{
|
|
content: chat.id,
|
|
delay: { show: 500, hide: 0 },
|
|
}"
|
|
class="h-6 flex items-center gap-1 max-w-20 w-full min-w-0 flex-shrink-0"
|
|
>
|
|
<Icon
|
|
icon="i-woot-hash"
|
|
class="size-3.5 text-n-slate-10 flex-shrink-0"
|
|
/>
|
|
<span class="text-body-main text-n-slate-11 truncate">
|
|
{{ chat.id }}
|
|
</span>
|
|
</div>
|
|
|
|
<CardAvatar
|
|
:contact="currentContact"
|
|
:selected="false"
|
|
:enable-selection="false"
|
|
:hide-thumbnail="false"
|
|
/>
|
|
|
|
<h4
|
|
class="text-heading-3 my-0 capitalize truncate text-n-slate-12 font-medium w-32 flex-shrink-0"
|
|
>
|
|
{{ currentContact.name }}
|
|
</h4>
|
|
|
|
<CardContent
|
|
:last-message="lastMessageInChat"
|
|
:voice-call-status="voiceCallData.status"
|
|
:voice-call-direction="voiceCallData.direction"
|
|
:unread-count="unreadCount"
|
|
:show-expanded-preview="false"
|
|
/>
|
|
</div>
|
|
|
|
<!-- RIGHT SECTION -->
|
|
<div class="flex items-center justify-end gap-1.5 flex-shrink-0">
|
|
<div v-if="showLabelsSection" class="min-w-0 w-full">
|
|
<CardLabels
|
|
:labels="chat.labels"
|
|
disable-toggle
|
|
class="my-0 [&>div]:justify-end justify-end"
|
|
/>
|
|
</div>
|
|
|
|
<div v-if="hasSlaPolicyId" class="flex-shrink-0">
|
|
<SLACardLabel ref="slaCardLabel" :chat="chat" />
|
|
</div>
|
|
|
|
<div class="flex-shrink-0 w-[4.375rem] text-end">
|
|
<TimeAgo
|
|
:conversation-id="chat.id"
|
|
:last-activity-timestamp="chat.timestamp"
|
|
:created-at-timestamp="chat.created_at"
|
|
class="font-440 !text-xs text-n-slate-11"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|