From ae804baf9bf37d199a0d0f4b31b0ce1569f27c40 Mon Sep 17 00:00:00 2001
From: iamsivin <iamsivin@gmail.com>
Date: Mon, 11 Nov 2024 21:51:32 +0530
Subject: [PATCH] chore: More changes

---
 .../components-next/Contacts/ContactsLayout.vue    |  2 +-
 .../Contacts/ContactsSidebar/ContactNotes.vue      | 10 ++++++++++
 .../dashboard/components-next/Editor/Editor.vue    |  2 +-
 .../contact/pages/ContactsPageRouteView.vue        | 14 +++++++++++++-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsLayout.vue b/app/javascript/dashboard/components-next/Contacts/ContactsLayout.vue
index 95062b08c..44e157c39 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsLayout.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsLayout.vue
@@ -147,7 +147,7 @@ const updateCurrentPage = page => {
                 @update:sort="emit('sort', $event)"
                 @more="emit('more')"
               />
-              <div class="w-px h-4 bg-n-strong" />
+              <div v-if="!isDetailView" class="w-px h-4 bg-n-strong" />
               <Button :label="buttonLabel" size="sm" @click="emit('message')" />
             </div>
           </div>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
index 017913554..2f7478730 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
@@ -5,6 +5,7 @@ import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { useRoute } from 'vue-router';
 import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
 import { dynamicTime } from 'shared/helpers/timeHelper';
+import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 
 import Editor from 'dashboard/components-next/Editor/Editor.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
@@ -47,6 +48,14 @@ const onDelete = noteId => {
   const { contactId } = route.params;
   store.dispatch('contactNotes/delete', { noteId, contactId });
 };
+
+const keyboardEvents = {
+  '$mod+Enter': {
+    action: () => onAdd(state.message),
+    allowOnFocusedInput: true,
+  },
+};
+useKeyboardEvents(keyboardEvents);
 </script>
 
 <template>
@@ -54,6 +63,7 @@ const onDelete = noteId => {
     <Editor
       v-model="state.message"
       :placeholder="t('CONTACTS_LAYOUT.SIDEBAR.NOTES.PLACEHOLDER')"
+      focus-on-mount
       class="[&>div]:!border-transparent [&>div]:px-4 [&>div]:py-4 px-6"
     >
       <template #actions>
diff --git a/app/javascript/dashboard/components-next/Editor/Editor.vue b/app/javascript/dashboard/components-next/Editor/Editor.vue
index 0a645edbd..717658d09 100644
--- a/app/javascript/dashboard/components-next/Editor/Editor.vue
+++ b/app/javascript/dashboard/components-next/Editor/Editor.vue
@@ -83,7 +83,7 @@ const handleBlur = () => {
 watch(
   () => props.modelValue,
   newValue => {
-    if (props.maxLength && props.showCharacterCount) {
+    if (props.maxLength && props.showCharacterCount && !slots.actions) {
       if (characterCount.value >= props.maxLength) {
         emit('update:modelValue', newValue.slice(0, props.maxLength));
       }
diff --git a/app/javascript/dashboard/routes/dashboard/contact/pages/ContactsPageRouteView.vue b/app/javascript/dashboard/routes/dashboard/contact/pages/ContactsPageRouteView.vue
index 585a29b05..7d2011e9e 100644
--- a/app/javascript/dashboard/routes/dashboard/contact/pages/ContactsPageRouteView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contact/pages/ContactsPageRouteView.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { onMounted, computed, ref, reactive, watch } from 'vue';
 import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { debounce } from '@chatwoot/utils';
 import { useUISettings } from 'dashboard/composables/useUISettings';
@@ -14,6 +15,7 @@ const DEBOUNCE_DELAY = 300;
 
 const store = useStore();
 const route = useRoute();
+const { t } = useI18n();
 
 const { updateUISettings, uiSettings } = useUISettings();
 
@@ -53,6 +55,16 @@ const activeSegment = computed(() =>
     : undefined
 );
 
+const headerTitle = computed(() => {
+  if (activeSegmentId.value) {
+    return activeSegment.value.name;
+  }
+  if (activeLabel.value) {
+    return `#${activeLabel.value}`;
+  }
+  return t('CONTACTS_LAYOUT.HEADER.TITLE');
+});
+
 const buildSortAttr = () =>
   `${sortState.activeOrdering}${sortState.activeSort}`;
 
@@ -153,7 +165,7 @@ onMounted(async () => {
     class="flex flex-col justify-between flex-1 h-full m-0 overflow-auto bg-n-background"
   >
     <ContactsLayout
-      :header-title="$t('CONTACTS_LAYOUT.HEADER.TITLE')"
+      :header-title="headerTitle"
       :button-label="$t('CONTACTS_LAYOUT.HEADER.MESSAGE_BUTTON')"
       :current-page="currentPage"
       :total-items="totalItems"