From cd4b87a067240140b4ad5b039d63a1f3c9e3a82c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 30 Sep 2024 13:16:54 +0530
Subject: [PATCH 1/3] fix: redirect to specific comment or tab on click

---
 crm/api/notifications.py                  | 16 +++++++++++++++-
 frontend/src/components/Notifications.vue |  3 ++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/crm/api/notifications.py b/crm/api/notifications.py
index 2067b8f0..afe495db 100644
--- a/crm/api/notifications.py
+++ b/crm/api/notifications.py
@@ -27,7 +27,7 @@ def get_notifications():
                 "type": notification.type,
                 "to_user": notification.to_user,
                 "read": notification.read,
-                "comment": notification.comment,
+                "hash": get_hash(notification),
                 "notification_text": notification.notification_text,
                 "notification_type_doctype": notification.notification_type_doctype,
                 "notification_type_doc": notification.notification_type_doc,
@@ -58,3 +58,17 @@ def mark_as_read(user=None, doc=None):
         d = frappe.get_doc("CRM Notification", n.name)
         d.read = True
         d.save()
+
+def get_hash(notification):
+    _hash = ""
+    if notification.type == "Mention" and notification.notification_type_doc:
+        _hash = "#" + notification.notification_type_doc
+
+    if notification.type == "WhatsApp":
+        _hash = "#whatsapp"
+
+    if notification.type == "Assignment" and notification.notification_type_doctype == "CRM Task":
+        _hash = "#tasks"
+        if "has been removed by" in notification.message:
+            _hash = ""
+    return _hash
\ No newline at end of file
diff --git a/frontend/src/components/Notifications.vue b/frontend/src/components/Notifications.vue
index 74c2eca3..872e743b 100644
--- a/frontend/src/components/Notifications.vue
+++ b/frontend/src/components/Notifications.vue
@@ -147,10 +147,11 @@ function getRoute(notification) {
       dealId: notification.reference_name,
     }
   }
+
   return {
     name: notification.route_name,
     params: params,
-    hash: '#' + notification.comment || notification.notification_type_doc,
+    hash: notification.hash,
   }
 }
 

From 5c3196fb3db6fedf61ff781734b1744669360e17 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 30 Sep 2024 13:17:53 +0530
Subject: [PATCH 2/3] fix: redirect to notes/tasks tab if created from activity
 tab

---
 frontend/src/components/Activities/AllModals.vue | 16 ++++++++++++++++
 frontend/src/components/Modals/TaskModal.vue     |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Activities/AllModals.vue b/frontend/src/components/Activities/AllModals.vue
index b8b4a2c4..1217b039 100644
--- a/frontend/src/components/Activities/AllModals.vue
+++ b/frontend/src/components/Activities/AllModals.vue
@@ -5,6 +5,7 @@
     :task="task"
     :doctype="doctype"
     :doc="doc.data?.name"
+    @after="redirect('tasks')"
   />
   <NoteModal
     v-model="showNoteModal"
@@ -12,6 +13,7 @@
     :note="note"
     :doctype="doctype"
     :doc="doc.data?.name"
+    @after="redirect('notes')"
   />
 </template>
 <script setup>
@@ -19,6 +21,7 @@ import TaskModal from '@/components/Modals/TaskModal.vue'
 import NoteModal from '@/components/Modals/NoteModal.vue'
 import { call } from 'frappe-ui'
 import { ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 
 const props = defineProps({
   doctype: String,
@@ -74,6 +77,19 @@ function showNote(n) {
   showNoteModal.value = true
 }
 
+// common
+const route = useRoute()
+const router = useRouter()
+
+function redirect(tabName) {
+  if (route.name == 'Lead' || route.name == 'Deal') {
+    let hash = '#' + tabName
+    if (route.hash != hash) {
+      router.push({ ...route, hash })
+    }
+  }
+}
+
 defineExpose({
   showTask,
   deleteTask,
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 808d54b7..154eaca0 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -141,7 +141,7 @@ const props = defineProps({
 const show = defineModel()
 const tasks = defineModel('reloadTasks')
 
-const emit = defineEmits(['updateTask'])
+const emit = defineEmits(['updateTask', 'after'])
 
 const router = useRouter()
 const { getUser } = usersStore()
@@ -202,6 +202,7 @@ async function updateTask() {
     if (d.name) {
       capture('task_created')
       tasks.value.reload()
+      emit('after')
     }
   }
   show.value = false

From db078b52c41c04b0a6b4acce788709e94d44d334 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 30 Sep 2024 13:28:03 +0530
Subject: [PATCH 3/3] fix: do not scroll to bottom in tasks & notes tab

---
 frontend/src/components/Activities/Activities.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/Activities/Activities.vue b/frontend/src/components/Activities/Activities.vue
index 58a67cae..f8cf5fe1 100644
--- a/frontend/src/components/Activities/Activities.vue
+++ b/frontend/src/components/Activities/Activities.vue
@@ -720,6 +720,7 @@ watch([reload, reload_email], ([reload_value, reload_email_value]) => {
 })
 
 function scroll(hash) {
+  if (['tasks', 'notes'].includes(route.hash?.slice(1))) return
   setTimeout(() => {
     let el
     if (!hash) {