# 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>
135 lines
3.7 KiB
Vue
135 lines
3.7 KiB
Vue
<script setup>
|
|
import { computed, ref } from 'vue';
|
|
import { getInboxIconByType } from 'dashboard/helper/inbox';
|
|
import { useRouter, useRoute } from 'vue-router';
|
|
import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper.js';
|
|
import { dynamicTime, shortTimestamp } from 'shared/helpers/timeHelper';
|
|
|
|
import Icon from 'dashboard/components-next/icon/Icon.vue';
|
|
import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
|
|
import CardMessagePreview from './CardMessagePreview.vue';
|
|
import CardMessagePreviewWithMeta from './CardMessagePreviewWithMeta.vue';
|
|
import CardPriorityIcon from './CardPriorityIcon.vue';
|
|
|
|
const props = defineProps({
|
|
conversation: {
|
|
type: Object,
|
|
required: true,
|
|
},
|
|
contact: {
|
|
type: Object,
|
|
required: true,
|
|
},
|
|
stateInbox: {
|
|
type: Object,
|
|
required: true,
|
|
},
|
|
accountLabels: {
|
|
type: Array,
|
|
required: true,
|
|
},
|
|
});
|
|
|
|
const router = useRouter();
|
|
const route = useRoute();
|
|
|
|
const cardMessagePreviewWithMetaRef = ref(null);
|
|
|
|
const currentContact = computed(() => props.contact);
|
|
|
|
const currentContactName = computed(() => currentContact.value?.name);
|
|
const currentContactThumbnail = computed(() => currentContact.value?.thumbnail);
|
|
const currentContactStatus = computed(
|
|
() => currentContact.value?.availabilityStatus
|
|
);
|
|
|
|
const inbox = computed(() => props.stateInbox);
|
|
|
|
const inboxName = computed(() => inbox.value?.name);
|
|
|
|
const inboxIcon = computed(() => {
|
|
const { channelType, medium } = inbox.value;
|
|
return getInboxIconByType(channelType, medium);
|
|
});
|
|
|
|
const lastActivityAt = computed(() => {
|
|
const timestamp = props.conversation?.timestamp;
|
|
return timestamp ? shortTimestamp(dynamicTime(timestamp)) : '';
|
|
});
|
|
|
|
const showMessagePreviewWithoutMeta = computed(() => {
|
|
const { labels = [] } = props.conversation;
|
|
return (
|
|
!cardMessagePreviewWithMetaRef.value?.hasSlaThreshold && labels.length === 0
|
|
);
|
|
});
|
|
|
|
const onCardClick = e => {
|
|
const path = frontendURL(
|
|
conversationUrl({
|
|
accountId: route.params.accountId,
|
|
id: props.conversation.id,
|
|
})
|
|
);
|
|
|
|
if (e.metaKey || e.ctrlKey) {
|
|
window.open(
|
|
window.chatwootConfig.hostURL + path,
|
|
'_blank',
|
|
'noopener noreferrer nofollow'
|
|
);
|
|
return;
|
|
}
|
|
router.push({ path });
|
|
};
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
role="button"
|
|
class="flex w-full gap-3 px-3 py-4 transition-all duration-300 ease-in-out cursor-pointer"
|
|
@click="onCardClick"
|
|
>
|
|
<Avatar
|
|
:name="currentContactName"
|
|
:src="currentContactThumbnail"
|
|
:size="24"
|
|
:status="currentContactStatus"
|
|
rounded-full
|
|
/>
|
|
<div class="flex flex-col w-full gap-1 min-w-0">
|
|
<div class="flex items-center justify-between h-6 gap-2">
|
|
<h4 class="text-base font-medium truncate text-n-slate-12">
|
|
{{ currentContactName }}
|
|
</h4>
|
|
<div class="flex items-center gap-2">
|
|
<CardPriorityIcon :priority="conversation.priority || null" />
|
|
<div
|
|
v-tooltip.left="inboxName"
|
|
class="flex items-center justify-center flex-shrink-0 rounded-full bg-n-alpha-2 size-5"
|
|
>
|
|
<Icon
|
|
:icon="inboxIcon"
|
|
class="flex-shrink-0 text-n-slate-11 size-3"
|
|
/>
|
|
</div>
|
|
<span class="text-sm text-n-slate-10">
|
|
{{ lastActivityAt }}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<CardMessagePreview
|
|
v-show="showMessagePreviewWithoutMeta"
|
|
:conversation="conversation"
|
|
/>
|
|
<CardMessagePreviewWithMeta
|
|
v-show="!showMessagePreviewWithoutMeta"
|
|
ref="cardMessagePreviewWithMetaRef"
|
|
:conversation="conversation"
|
|
:contact="contact"
|
|
:account-labels="accountLabels"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</template>
|