From b4d9461c6566be32324c330e875c3975adfd9f71 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 4 Feb 2024 16:55:17 +0530
Subject: [PATCH 1/4] fix: allow dynamic link in filters

---
 crm/api/doc.py                     | 1 +
 frontend/src/components/Filter.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crm/api/doc.py b/crm/api/doc.py
index bbafda0f7..e3c8acc42 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -41,6 +41,7 @@ def get_filterable_fields(doctype: str):
 		"Float",
 		"Int",
 		"Currency",
+		"Dynamic Link",
 		"Link",
 		"Long Text",
 		"Select",
diff --git a/frontend/src/components/Filter.vue b/frontend/src/components/Filter.vue
index f643d8885..d9a6ea38e 100644
--- a/frontend/src/components/Filter.vue
+++ b/frontend/src/components/Filter.vue
@@ -103,7 +103,7 @@ import { FormControl, Autocomplete, createResource } from 'frappe-ui'
 import { h, defineModel, computed } from 'vue'
 
 const typeCheck = ['Check']
-const typeLink = ['Link']
+const typeLink = ['Link', 'Dynamic Link']
 const typeNumber = ['Float', 'Int', 'Currency', 'Percent']
 const typeSelect = ['Select']
 const typeString = ['Data', 'Long Text', 'Small Text', 'Text Editor', 'Text']
@@ -324,6 +324,9 @@ function getValSelect(f) {
       })),
     })
   } else if (typeLink.includes(fieldtype)) {
+    if (field.fieldtype === 'Dynamic Link') {
+      return h(FormControl, { type: 'text' })
+    }
     return h(Link, { class: 'form-control', doctype: options })
   } else if (typeNumber.includes(fieldtype)) {
     return h(FormControl, { type: 'number' })

From e06d110cbcc971b79e1edc1a504210350ec3ab0e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 4 Feb 2024 16:56:10 +0530
Subject: [PATCH 2/4] fix: added tasks in sidebar & router.js

---
 frontend/src/components/Layouts/AppSidebar.vue | 6 ++++++
 frontend/src/router.js                         | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index aff93339a..615823ac8 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -105,6 +105,7 @@ import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
 import NoteIcon from '@/components/Icons/NoteIcon.vue'
+import TaskIcon from '@/components/Icons/TaskIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
 import NotificationsIcon from '@/components/Icons/NotificationsIcon.vue'
@@ -146,6 +147,11 @@ const links = [
     icon: NoteIcon,
     to: 'Notes',
   },
+  {
+    label: 'Tasks',
+    icon: TaskIcon,
+    to: 'Tasks',
+  },
   {
     label: 'Call Logs',
     icon: PhoneIcon,
diff --git a/frontend/src/router.js b/frontend/src/router.js
index adc3f17f3..06129b76f 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -37,6 +37,11 @@ const routes = [
     name: 'Notes',
     component: () => import('@/pages/Notes.vue'),
   },
+  {
+    path: '/tasks',
+    name: 'Tasks',
+    component: () => import('@/pages/Tasks.vue'),
+  },
   {
     path: '/contacts',
     name: 'Contacts',

From 531e5710b8f5e34776fe21c680a7b741e3ad03e4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 4 Feb 2024 16:56:52 +0530
Subject: [PATCH 3/4] fix: added task listview and dialog

---
 crm/fcrm/doctype/crm_task/crm_task.py         |  53 +++++-
 .../components/ListViews/TasksListView.vue    | 164 ++++++++++++++++++
 frontend/src/pages/Tasks.vue                  | 106 +++++++++++
 3 files changed, 322 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/ListViews/TasksListView.vue
 create mode 100644 frontend/src/pages/Tasks.vue

diff --git a/crm/fcrm/doctype/crm_task/crm_task.py b/crm/fcrm/doctype/crm_task/crm_task.py
index 325843cc0..c244ba73a 100644
--- a/crm/fcrm/doctype/crm_task/crm_task.py
+++ b/crm/fcrm/doctype/crm_task/crm_task.py
@@ -6,4 +6,55 @@
 
 
 class CRMTask(Document):
-	pass
+	@staticmethod
+	def default_list_data():
+		columns = [
+			{
+				'label': 'Title',
+				'type': 'Data',
+				'key': 'title',
+				'width': '12rem',
+			},
+			{
+				'label': 'Status',
+				'type': 'Select',
+				'key': 'status',
+				'width': '8rem',
+			},
+			{
+				'label': 'Priority',
+				'type': 'Select',
+				'key': 'priority',
+				'width': '8rem',
+			},
+			{
+				'label': 'Due Date',
+				'type': 'Date',
+				'key': 'due_date',
+				'width': '8rem',
+			},
+			{
+				'label': 'Assigned To',
+				'type': 'Link',
+				'key': 'assigned_to',
+				'width': '10rem',
+			},
+			{
+				'label': 'Last Modified',
+				'type': 'Datetime',
+				'key': 'modified',
+				'width': '8rem',
+			},
+		]
+
+		rows = [
+			"name",
+			"title",
+			"description",
+			"assigned_to",
+			"due_date",
+			"status",
+			"priority",
+			"modified",
+		]
+		return {'columns': columns, 'rows': rows}
diff --git a/frontend/src/components/ListViews/TasksListView.vue b/frontend/src/components/ListViews/TasksListView.vue
new file mode 100644
index 000000000..b6e9f1ced
--- /dev/null
+++ b/frontend/src/components/ListViews/TasksListView.vue
@@ -0,0 +1,164 @@
+<template>
+  <ListView
+    :columns="columns"
+    :rows="rows"
+    :options="{
+      onRowClick: (row) => emit('showTask', row.name),
+      selectable: options.selectable,
+    }"
+    row-key="name"
+  >
+    <ListHeader class="mx-5" />
+    <ListRows id="list-rows">
+      <ListRow
+        class="mx-5"
+        v-for="row in rows"
+        :key="row.name"
+        v-slot="{ column, item }"
+        :row="row"
+      >
+        <div
+          v-if="column.key === 'due_date'"
+          class="flex items-center gap-2 text-base"
+        >
+          <CalendarIcon />
+          <div v-if="item">
+            <Tooltip :text="dateFormat(item, 'ddd, MMM D, YYYY')">
+              {{ dateFormat(item, 'D MMM') }}
+            </Tooltip>
+          </div>
+        </div>
+        <ListRowItem v-else :item="item">
+          <template #prefix>
+            <div v-if="column.key === 'status'">
+              <TaskStatusIcon :status="item" />
+            </div>
+            <div v-else-if="column.key === 'priority'">
+              <TaskPriorityIcon :priority="item" />
+            </div>
+            <div v-else-if="column.key === 'assigned_to'">
+              <Avatar
+                v-if="item.full_name"
+                class="flex items-center"
+                :image="item.user_image"
+                :label="item.full_name"
+                size="sm"
+              />
+            </div>
+          </template>
+          <div
+            v-if="['modified', 'creation'].includes(column.key)"
+            class="truncate text-base"
+          >
+            {{ item.timeAgo }}
+          </div>
+          <div v-else-if="column.type === 'Check'">
+            <FormControl
+              type="checkbox"
+              :modelValue="item"
+              :disabled="true"
+              class="text-gray-900"
+            />
+          </div>
+        </ListRowItem>
+      </ListRow>
+    </ListRows>
+    <ListSelectBanner>
+      <template #actions="{ selections, unselectAll }">
+        <Button
+          theme="red"
+          variant="subtle"
+          label="Delete"
+          @click="deleteTask(selections, unselectAll)"
+        />
+      </template>
+    </ListSelectBanner>
+  </ListView>
+  <ListFooter
+    class="border-t px-5 py-2"
+    v-model="pageLengthCount"
+    :options="{
+      rowCount: options.rowCount,
+      totalCount: options.totalCount,
+    }"
+    @loadMore="emit('loadMore')"
+  />
+</template>
+<script setup>
+import TaskStatusIcon from '@/components/Icons/TaskStatusIcon.vue'
+import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue'
+import CalendarIcon from '@/components/Icons/CalendarIcon.vue'
+import { dateFormat } from '@/utils'
+import { globalStore } from '@/stores/global'
+import {
+  Avatar,
+  ListView,
+  ListHeader,
+  ListRows,
+  ListRow,
+  ListSelectBanner,
+  ListRowItem,
+  ListFooter,
+  call,
+  Tooltip,
+} from 'frappe-ui'
+import { defineModel } from 'vue'
+
+const props = defineProps({
+  rows: {
+    type: Array,
+    required: true,
+  },
+  columns: {
+    type: Array,
+    required: true,
+  },
+  options: {
+    type: Object,
+    default: () => ({
+      selectable: true,
+      totalCount: 0,
+      rowCount: 0,
+    }),
+  },
+})
+
+const emit = defineEmits(['loadMore', 'showTask', 'reload'])
+
+const pageLengthCount = defineModel()
+
+const { $dialog } = globalStore()
+
+function deleteTask(selections, unselectAll) {
+  let title = 'Delete task'
+  let message = 'Are you sure you want to delete this task?'
+
+  if (selections.size > 1) {
+    title = 'Delete tasks'
+    message = 'Are you sure you want to delete these tasks?'
+  }
+
+  $dialog({
+    title: title,
+    message: message,
+    actions: [
+      {
+        label: 'Delete',
+        theme: 'red',
+        variant: 'solid',
+        async onClick(close) {
+          for (const selection of selections) {
+            await call('frappe.client.delete', {
+              doctype: 'CRM Task',
+              name: selection,
+            })
+          }
+          close()
+          unselectAll()
+          emit('reload')
+        },
+      },
+    ],
+  })
+}
+</script>
diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue
new file mode 100644
index 000000000..2a5c11ebe
--- /dev/null
+++ b/frontend/src/pages/Tasks.vue
@@ -0,0 +1,106 @@
+<template>
+  <LayoutHeader>
+    <template #left-header>
+      <Breadcrumbs :items="breadcrumbs" />
+    </template>
+    <template #right-header>
+      <Button variant="solid" label="Create" @click="showTaskModal = true">
+        <template #prefix><FeatherIcon name="plus" class="h-4" /></template>
+      </Button>
+    </template>
+  </LayoutHeader>
+  <ViewControls
+    v-model="tasks"
+    v-model:loadMore="loadMore"
+    doctype="CRM Task"
+  />
+  <TasksListView
+    v-if="tasks.data && rows.length"
+    v-model="tasks.data.page_length_count"
+    :rows="rows"
+    :columns="tasks.data.columns"
+    :options="{
+      rowCount: tasks.data.row_count,
+      totalCount: tasks.data.total_count,
+    }"
+    @loadMore="() => loadMore++"
+    @showTask="showTask"
+    @reload="() => tasks.reload()"
+  />
+  <div v-else-if="tasks.data" class="flex h-full items-center justify-center">
+    <div
+      class="flex flex-col items-center gap-3 text-xl font-medium text-gray-500"
+    >
+      <EmailIcon class="h-10 w-10" />
+      <span>No Tasks Found</span>
+    </div>
+  </div>
+  <TaskModal v-model="showTaskModal" v-model:reloadTasks="tasks" :task="task" />
+</template>
+
+<script setup>
+import EmailIcon from '@/components/Icons/EmailIcon.vue'
+import LayoutHeader from '@/components/LayoutHeader.vue'
+import ViewControls from '@/components/ViewControls.vue'
+import TasksListView from '@/components/ListViews/TasksListView.vue'
+import TaskModal from '@/components/Modals/TaskModal.vue'
+import { usersStore } from '@/stores/users'
+import { dateFormat, dateTooltipFormat, timeAgo } from '@/utils'
+import { Breadcrumbs } from 'frappe-ui'
+import { computed, ref } from 'vue'
+
+const breadcrumbs = [{ label: 'Tasks', route: { name: 'Tasks' } }]
+
+const { getUser } = usersStore()
+
+// tasks data is loaded in the ViewControls component
+const tasks = ref({})
+const loadMore = ref(1)
+
+const rows = computed(() => {
+  if (!tasks.value?.data?.data) return []
+  return tasks.value?.data.data.map((task) => {
+    let _rows = {}
+    tasks.value?.data.rows.forEach((row) => {
+      _rows[row] = task[row]
+
+      if (['modified', 'creation'].includes(row)) {
+        _rows[row] = {
+          label: dateFormat(task[row], dateTooltipFormat),
+          timeAgo: timeAgo(task[row]),
+        }
+      } else if (row == 'assigned_to') {
+        _rows[row] = {
+          label: task.assigned_to && getUser(task.assigned_to).full_name,
+          ...(task.assigned_to && getUser(task.assigned_to)),
+        }
+      } 
+    })
+    return _rows
+  })
+})
+
+const showTaskModal = ref(false)
+
+const task = ref({
+  title: '',
+  description: '',
+  assigned_to: '',
+  due_date: '',
+  status: 'Backlog',
+  priority: 'Low',
+})
+
+function showTask(name) {
+  let t = rows.value?.find((row) => row.name === name)
+  task.value = {
+    title: t.title,
+    description: t.description,
+    assigned_to: t.assigned_to?.email || '',
+    due_date: t.due_date,
+    status: t.status,
+    priority: t.priority,
+  }
+  showTaskModal.value = true
+}
+</script>

From 6c41e855189d7ae4bdf9e23040a093b6401d17d4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 4 Feb 2024 17:32:12 +0530
Subject: [PATCH 4/4] fix: show linked lead & deal button

---
 crm/fcrm/doctype/crm_task/crm_task.py        |  4 ++-
 frontend/src/components/Modals/TaskModal.vue | 33 ++++++++++++++++++++
 frontend/src/pages/Tasks.vue                 |  6 +++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/crm/fcrm/doctype/crm_task/crm_task.py b/crm/fcrm/doctype/crm_task/crm_task.py
index c244ba73a..1559ff3e0 100644
--- a/crm/fcrm/doctype/crm_task/crm_task.py
+++ b/crm/fcrm/doctype/crm_task/crm_task.py
@@ -13,7 +13,7 @@ def default_list_data():
 				'label': 'Title',
 				'type': 'Data',
 				'key': 'title',
-				'width': '12rem',
+				'width': '16rem',
 			},
 			{
 				'label': 'Status',
@@ -55,6 +55,8 @@ def default_list_data():
 			"due_date",
 			"status",
 			"priority",
+			"reference_doctype",
+			"reference_docname",
 			"modified",
 		]
 		return {'columns': columns, 'rows': rows}
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index e5439860a..ee6326814 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -13,6 +13,24 @@
       ],
     }"
   >
+    <template #body-title>
+      <div class="flex items-center gap-3">
+        <h3 class="text-2xl font-semibold leading-6 text-gray-900">
+          {{ editMode ? 'Edit Task' : 'Create Task' }}
+        </h3>
+        <Button
+          v-if="task?.reference_docname"
+          variant="outline"
+          size="sm"
+          :label="task.reference_doctype == 'CRM Deal' ? 'Open Deal' : 'Open Lead'"
+          @click="redirect()"
+        >
+          <template #suffix>
+            <ArrowUpRightIcon class="h-4 w-4" />
+          </template>
+        </Button>
+      </div>
+    </template>
     <template #body-content>
       <div class="flex flex-col gap-4">
         <div>
@@ -86,12 +104,14 @@
 <script setup>
 import TaskStatusIcon from '@/components/Icons/TaskStatusIcon.vue'
 import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue'
+import ArrowUpRightIcon from '@/components/Icons/ArrowUpRightIcon.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import Link from '@/components/Controls/Link.vue'
 import { taskStatusOptions, taskPriorityOptions } from '@/utils'
 import { usersStore } from '@/stores/users'
 import { TextEditor, Dropdown, Tooltip, DatePicker, call } from 'frappe-ui'
 import { ref, defineModel, watch, nextTick } from 'vue'
+import { useRouter } from 'vue-router'
 
 const props = defineProps({
   task: {
@@ -113,6 +133,7 @@ const tasks = defineModel('reloadTasks')
 
 const emit = defineEmits(['updateTask'])
 
+const router = useRouter()
 const { getUser } = usersStore()
 
 const title = ref(null)
@@ -124,6 +145,8 @@ const _task = ref({
   due_date: '',
   status: 'Backlog',
   priority: 'Low',
+  reference_doctype: props.doctype,
+  reference_docname: null,
 })
 
 function updateTaskStatus(status) {
@@ -134,6 +157,16 @@ function updateTaskPriority(priority) {
   _task.value.priority = priority
 }
 
+function redirect() {
+  if (!props.task?.reference_docname) return
+  let name = props.task.reference_doctype == 'CRM Deal' ? 'Deal' : 'Lead'
+  let params = { leadId: props.task.reference_docname }
+  if (name == 'Deal') {
+    params = { dealId: props.task.reference_docname }
+  }
+  router.push({ name: name, params: params })
+}
+
 async function updateTask() {
   if (!_task.value.assigned_to) {
     _task.value.assigned_to = getUser().email
diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue
index 2a5c11ebe..c5eee8848 100644
--- a/frontend/src/pages/Tasks.vue
+++ b/frontend/src/pages/Tasks.vue
@@ -74,7 +74,7 @@ const rows = computed(() => {
           label: task.assigned_to && getUser(task.assigned_to).full_name,
           ...(task.assigned_to && getUser(task.assigned_to)),
         }
-      } 
+      }
     })
     return _rows
   })
@@ -89,6 +89,8 @@ const task = ref({
   due_date: '',
   status: 'Backlog',
   priority: 'Low',
+  reference_doctype: 'CRM Lead',
+  reference_docname: '',
 })
 
 function showTask(name) {
@@ -100,6 +102,8 @@ function showTask(name) {
     due_date: t.due_date,
     status: t.status,
     priority: t.priority,
+    reference_doctype: t.reference_doctype,
+    reference_docname: t.reference_docname,
   }
   showTaskModal.value = true
 }