diff --git a/app/javascript/dashboard/components/widgets/conversation/ContentTemplates/ContentTemplatesModal.vue b/app/javascript/dashboard/components/widgets/conversation/ContentTemplates/ContentTemplatesModal.vue
new file mode 100644
index 000000000..7ae95fe59
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/ContentTemplates/ContentTemplatesModal.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/ContentTemplates/ContentTemplatesPicker.vue b/app/javascript/dashboard/components/widgets/conversation/ContentTemplates/ContentTemplatesPicker.vue
new file mode 100644
index 000000000..89d82fe0c
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/ContentTemplates/ContentTemplatesPicker.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('CONTENT_TEMPLATES.PICKER.NO_TEMPLATES_FOUND') }}
+ {{ query }}
+
+
+
+
+ {{ t('CONTENT_TEMPLATES.PICKER.NO_TEMPLATES_AVAILABLE') }}
+
+
+
+
+
+
+
+
+ {{ $t(voiceLabelKey) }}
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index e5243ac04..3db4779b0 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -15,7 +15,7 @@ import ReplyEmailHead from './ReplyEmailHead.vue';
import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue';
import ArticleSearchPopover from 'dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue';
import MessageSignatureMissingAlert from './MessageSignatureMissingAlert.vue';
-import Banner from 'dashboard/components/ui/Banner.vue';
+import ReplyBoxBanner from './ReplyBoxBanner.vue';
import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
import AudioRecorder from 'dashboard/components/widgets/WootWriter/AudioRecorder.vue';
@@ -27,6 +27,7 @@ import {
replaceVariablesInMessage,
} from '@chatwoot/utils';
import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
+import ContentTemplates from './ContentTemplates/ContentTemplatesModal.vue';
import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
import inboxMixin, { INBOX_FEATURES } from 'shared/mixins/inboxMixin';
import { trimContent, debounce, getRecipients } from '@chatwoot/utils';
@@ -52,8 +53,8 @@ export default {
ArticleSearchPopover,
AttachmentPreview,
AudioRecorder,
- Banner,
CannedResponse,
+ ReplyBoxBanner,
EmojiInput,
MessageSignatureMissingAlert,
ReplyBottomPanel,
@@ -61,6 +62,7 @@ export default {
ReplyToMessage,
ReplyTopPanel,
ResizableTextArea,
+ ContentTemplates,
WhatsappTemplates,
WootMessageEditor,
},
@@ -109,6 +111,7 @@ export default {
toEmails: '',
doAutoSaveDraft: () => {},
showWhatsAppTemplatesModal: false,
+ showContentTemplatesModal: false,
updateEditorSelectionWith: '',
undefinedVariableMessage: '',
showMentions: false,
@@ -155,38 +158,12 @@ export default {
return false;
},
- assignedAgent: {
- get() {
- return this.currentChat.meta.assignee;
- },
- set(agent) {
- const agentId = agent ? agent.id : 0;
- this.$store.dispatch('setCurrentChatAssignee', agent);
- this.$store
- .dispatch('assignAgent', {
- conversationId: this.currentChat.id,
- agentId,
- })
- .then(() => {
- useAlert(this.$t('CONVERSATION.CHANGE_AGENT'));
- });
- },
- },
- showSelfAssignBanner() {
- if (this.message !== '' && !this.isOnPrivateNote) {
- if (!this.assignedAgent) {
- return true;
- }
- if (this.assignedAgent.id !== this.currentUser.id) {
- return true;
- }
- }
-
- return false;
- },
showWhatsappTemplates() {
return this.isAWhatsAppCloudChannel && !this.isPrivate;
},
+ showContentTemplates() {
+ return this.isATwilioWhatsAppChannel && !this.isPrivate;
+ },
isPrivate() {
if (this.currentChat.can_reply || this.isAWhatsAppChannel) {
return this.isOnPrivateNote;
@@ -659,28 +636,11 @@ export default {
hideWhatsappTemplatesModal() {
this.showWhatsAppTemplatesModal = false;
},
- onClickSelfAssign() {
- const {
- account_id,
- availability_status,
- available_name,
- email,
- id,
- name,
- role,
- avatar_url,
- } = this.currentUser;
- const selfAssign = {
- account_id,
- availability_status,
- available_name,
- email,
- id,
- name,
- role,
- thumbnail: avatar_url,
- };
- this.assignedAgent = selfAssign;
+ openContentTemplateModal() {
+ this.showContentTemplatesModal = true;
+ },
+ hideContentTemplatesModal() {
+ this.showContentTemplatesModal = false;
},
confirmOnSendReply() {
if (this.isReplyButtonDisabled) {
@@ -774,6 +734,13 @@ export default {
});
this.hideWhatsappTemplatesModal();
},
+ async onSendContentTemplateReply(messagePayload) {
+ this.sendMessage({
+ conversationId: this.currentChat.id,
+ ...messagePayload,
+ });
+ this.hideContentTemplatesModal();
+ },
replaceText(message) {
if (this.sendWithSignature && !this.private) {
// if signature is enabled, append it to the message
@@ -793,6 +760,10 @@ export default {
}, 100);
},
setReplyMode(mode = REPLY_EDITOR_MODES.REPLY) {
+ // Clear attachments when switching between private note and reply modes
+ // This is to prevent from breaking the upload rules
+ if (this.attachedFiles.length > 0) this.attachedFiles = [];
+
const { can_reply: canReply } = this.currentChat;
this.$store.dispatch('draftMessages/setReplyEditorMode', {
mode,
@@ -1095,16 +1066,7 @@ export default {
-
+
+
+
+import { computed } from 'vue';
+import { useStore } from 'vuex';
+import { useMapGetter } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import wootConstants from 'dashboard/constants/globals';
+
+import Banner from 'dashboard/components/ui/Banner.vue';
+
+const props = defineProps({
+ message: {
+ type: String,
+ default: '',
+ },
+ isOnPrivateNote: {
+ type: Boolean,
+ default: false,
+ },
+});
+
+const store = useStore();
+const { t } = useI18n();
+
+const currentChat = useMapGetter('getSelectedChat');
+const currentUser = useMapGetter('getCurrentUser');
+
+const assignedAgent = computed({
+ get() {
+ return currentChat.value?.meta?.assignee;
+ },
+ set(agent) {
+ const agentId = agent ? agent.id : 0;
+ store.dispatch('setCurrentChatAssignee', agent);
+ store.dispatch('assignAgent', {
+ conversationId: currentChat.value?.id,
+ agentId,
+ });
+ },
+});
+
+const isUserTyping = computed(
+ () => props.message !== '' && !props.isOnPrivateNote
+);
+const isUnassigned = computed(() => !assignedAgent.value);
+const isAssignedToOtherAgent = computed(
+ () => assignedAgent.value?.id !== currentUser.value?.id
+);
+
+const showSelfAssignBanner = computed(() => {
+ return (
+ isUserTyping.value && (isUnassigned.value || isAssignedToOtherAgent.value)
+ );
+});
+
+const showBotHandoffBanner = computed(
+ () =>
+ isUserTyping.value &&
+ currentChat.value?.status === wootConstants.STATUS_TYPE.PENDING
+);
+
+const botHandoffActionLabel = computed(() => {
+ return assignedAgent.value?.id === currentUser.value?.id
+ ? t('CONVERSATION.BOT_HANDOFF_REOPEN_ACTION')
+ : t('CONVERSATION.BOT_HANDOFF_ACTION');
+});
+
+const selfAssignConversation = async () => {
+ const { avatar_url, ...rest } = currentUser.value || {};
+ assignedAgent.value = { ...rest, thumbnail: avatar_url };
+};
+
+const needsAssignmentToCurrentUser = computed(() => {
+ return isUnassigned.value || isAssignedToOtherAgent.value;
+});
+
+const onClickSelfAssign = async () => {
+ try {
+ await selfAssignConversation();
+ useAlert(t('CONVERSATION.CHANGE_AGENT'));
+ } catch (error) {
+ useAlert(t('CONVERSATION.CHANGE_AGENT_FAILED'));
+ }
+};
+
+const reopenConversation = async () => {
+ await store.dispatch('toggleStatus', {
+ conversationId: currentChat.value?.id,
+ status: wootConstants.STATUS_TYPE.OPEN,
+ });
+};
+
+const onClickBotHandoff = async () => {
+ try {
+ await reopenConversation();
+
+ if (needsAssignmentToCurrentUser.value) {
+ await selfAssignConversation();
+ }
+
+ useAlert(t('CONVERSATION.BOT_HANDOFF_SUCCESS'));
+ } catch (error) {
+ useAlert(t('CONVERSATION.BOT_HANDOFF_ERROR'));
+ }
+};
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
index bddd8884e..ad3464854 100644
--- a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
@@ -1,10 +1,10 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/assignmentPolicy.routes.js b/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/assignmentPolicy.routes.js
new file mode 100644
index 000000000..2d62674b0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/assignmentPolicy.routes.js
@@ -0,0 +1,30 @@
+import { FEATURE_FLAGS } from '../../../../featureFlags';
+import { frontendURL } from '../../../../helper/URLHelper';
+import SettingsWrapper from '../SettingsWrapper.vue';
+import AssignmentPolicyIndex from './Index.vue';
+
+export default {
+ routes: [
+ {
+ path: frontendURL('accounts/:accountId/settings/assignment-policy'),
+ component: SettingsWrapper,
+ children: [
+ {
+ path: '',
+ redirect: to => {
+ return { name: 'assignment_policy_index', params: to.params };
+ },
+ },
+ {
+ path: 'index',
+ name: 'assignment_policy_index',
+ component: AssignmentPolicyIndex,
+ meta: {
+ featureFlag: FEATURE_FLAGS.ASSIGNMENT_V2,
+ permissions: ['administrator'],
+ },
+ },
+ ],
+ },
+ ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
index 17752dfd2..c05c6724b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
@@ -63,9 +63,7 @@ export default {
-