From 13714dabfd48f2d7bd991d685fb4514f1edb149b Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 19 Feb 2024 18:45:19 +0530
Subject: [PATCH 1/4] build(deps): bump frappeui to 0.1.31

---
 frappe-ui             | 2 +-
 frontend/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe-ui b/frappe-ui
index 388c8706..5b17c224 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 388c8706d0f96d918651018ca58d85a56d2bf5cb
+Subproject commit 5b17c2242369729b4e9aa31c0c78d3d53676a77f
diff --git a/frontend/package.json b/frontend/package.json
index e0eb1aae..abb5eb08 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,7 +13,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.30",
+    "frappe-ui": "^0.1.31",
     "mime": "^4.0.1",
     "pinia": "^2.0.33",
     "socket.io-client": "^4.7.2",

From 1ba6cb78e196b35b865fe7d0644f89927bb10ff3 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 20 Feb 2024 15:10:53 +0530
Subject: [PATCH 2/4] fix: added data-name on avatar div

---
 frontend/src/components/MultipleAvatar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/MultipleAvatar.vue b/frontend/src/components/MultipleAvatar.vue
index 9cbdd132..adba7bad 100644
--- a/frontend/src/components/MultipleAvatar.vue
+++ b/frontend/src/components/MultipleAvatar.vue
@@ -24,11 +24,12 @@
       :key="avatar.name"
     >
       <Avatar
-        class="-mr-1.5 transform ring-2 ring-white transition hover:z-10 hover:scale-110"
+        class="user-avatar -mr-1.5 transform ring-2 ring-white transition hover:z-10 hover:scale-110"
         shape="circle"
         :image="avatar.image"
         :label="avatar.label"
         :size="size"
+        :data-name="avatar.name"
       />
     </Tooltip>
   </div>

From 486eba41eda3a4735aea3f7a120ccef647c42e00 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 20 Feb 2024 15:11:50 +0530
Subject: [PATCH 3/4] fix: added & exposed applyFilter method in ViewControls

---
 frontend/src/components/ViewControls.vue | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 41e8333e..4235b30b 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -536,6 +536,39 @@ function saveView() {
   showViewModal.value = true
 }
 
+function applyFilter({ event, idx, column, item }) {
+  let restrictedFieldtypes = ['Duration', 'Datetime', 'Time']
+  if (restrictedFieldtypes.includes(column.type) || idx === 0) return
+
+  event.stopPropagation()
+  event.preventDefault()
+
+  let filters = { ...list.value.params.filters }
+
+  let value = item.name || item.label || item
+
+  if (value) {
+    filters[column.key] = value
+  } else {
+    delete filters[column.key]
+  }
+
+  if (column.key == '_assign') {
+    if (item.length > 1) {
+      let target = e.target.closest('.user-avatar')
+      if (target) {
+        let name = target.getAttribute('data-name')
+        filters['_assign'] = ['LIKE', `%${name}%`]
+      }
+    } else {
+      filters['_assign'] = ['LIKE', `%${item[0].name}%`]
+    }
+  }
+  updateFilter(filters)
+}
+
+defineExpose({ applyFilter })
+
 // Watchers
 watch(
   () => getView(route.query.view),

From 76d21200768bc2f6b4bfe3559ba2eafc8d409a23 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 20 Feb 2024 15:34:28 +0530
Subject: [PATCH 4/4] fix: apply applyFilter feat in all listviews

---
 .../components/ListViews/CallLogsListView.vue | 14 ++++++++++---
 .../components/ListViews/ContactsListView.vue |  8 +++++--
 .../components/ListViews/DealsListView.vue    | 21 +++++++++++++++----
 .../ListViews/EmailTemplatesListView.vue      |  8 +++++--
 .../components/ListViews/LeadsListView.vue    | 21 +++++++++++++++----
 .../ListViews/OrganizationsListView.vue       |  8 +++++--
 .../components/ListViews/TasksListView.vue    |  9 ++++++--
 frontend/src/pages/CallLogs.vue               |  3 +++
 frontend/src/pages/Contacts.vue               |  3 +++
 frontend/src/pages/Deals.vue                  |  3 +++
 frontend/src/pages/EmailTemplates.vue         |  3 +++
 frontend/src/pages/Leads.vue                  |  3 +++
 frontend/src/pages/Organizations.vue          |  3 +++
 frontend/src/pages/Tasks.vue                  |  3 +++
 14 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/ListViews/CallLogsListView.vue b/frontend/src/components/ListViews/CallLogsListView.vue
index 60757240..1ccb7202 100644
--- a/frontend/src/components/ListViews/CallLogsListView.vue
+++ b/frontend/src/components/ListViews/CallLogsListView.vue
@@ -18,10 +18,13 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
-        <ListRowItem :item="item">
+        <ListRowItem
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <template #prefix>
             <div v-if="['caller', 'receiver'].includes(column.key)">
               <Avatar
@@ -108,7 +111,12 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['loadMore', 'updatePageCount', 'columnWidthUpdated'])
+const emit = defineEmits([
+  'loadMore',
+  'updatePageCount',
+  'columnWidthUpdated',
+  'applyFilter',
+])
 
 const pageLengthCount = defineModel()
 
diff --git a/frontend/src/components/ListViews/ContactsListView.vue b/frontend/src/components/ListViews/ContactsListView.vue
index 57d5b9c2..a221b94c 100644
--- a/frontend/src/components/ListViews/ContactsListView.vue
+++ b/frontend/src/components/ListViews/ContactsListView.vue
@@ -19,10 +19,13 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
-        <ListRowItem :item="item">
+        <ListRowItem
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <template #prefix>
             <div v-if="column.key === 'full_name'">
               <Avatar
@@ -138,6 +141,7 @@ const emit = defineEmits([
   'updatePageCount',
   'reload',
   'columnWidthUpdated',
+  'applyFilter',
 ])
 
 const pageLengthCount = defineModel()
diff --git a/frontend/src/components/ListViews/DealsListView.vue b/frontend/src/components/ListViews/DealsListView.vue
index 8b2d926f..22f1abd9 100644
--- a/frontend/src/components/ListViews/DealsListView.vue
+++ b/frontend/src/components/ListViews/DealsListView.vue
@@ -16,13 +16,21 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
-        <div v-if="column.key === '_assign'" class="flex items-center">
+        <div
+          v-if="column.key === '_assign'"
+          class="flex items-center"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <MultipleAvatar :avatars="item" size="sm" />
         </div>
-        <ListRowItem v-else :item="item">
+        <ListRowItem
+          v-else
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <template #prefix>
             <div v-if="column.key === 'status'">
               <IndicatorIcon :class="item.color" />
@@ -164,7 +172,12 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['loadMore', 'updatePageCount', 'columnWidthUpdated'])
+const emit = defineEmits([
+  'loadMore',
+  'updatePageCount',
+  'columnWidthUpdated',
+  'applyFilter',
+])
 
 const pageLengthCount = defineModel()
 const list = defineModel('list')
diff --git a/frontend/src/components/ListViews/EmailTemplatesListView.vue b/frontend/src/components/ListViews/EmailTemplatesListView.vue
index 6a988060..3508540f 100644
--- a/frontend/src/components/ListViews/EmailTemplatesListView.vue
+++ b/frontend/src/components/ListViews/EmailTemplatesListView.vue
@@ -15,10 +15,13 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
-        <ListRowItem :item="item">
+        <ListRowItem
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <!-- <template #prefix>
 
           </template> -->
@@ -130,6 +133,7 @@ const emit = defineEmits([
   'showEmailTemplate',
   'reload',
   'columnWidthUpdated',
+  'applyFilter',
 ])
 
 const pageLengthCount = defineModel()
diff --git a/frontend/src/components/ListViews/LeadsListView.vue b/frontend/src/components/ListViews/LeadsListView.vue
index d6dc29c9..d9ea3eec 100644
--- a/frontend/src/components/ListViews/LeadsListView.vue
+++ b/frontend/src/components/ListViews/LeadsListView.vue
@@ -16,13 +16,21 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
-        <div v-if="column.key === '_assign'" class="flex items-center">
+        <div
+          v-if="column.key === '_assign'"
+          class="flex items-center"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <MultipleAvatar :avatars="item" size="sm" />
         </div>
-        <ListRowItem v-else :item="item">
+        <ListRowItem
+          v-else
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <template #prefix>
             <div v-if="column.key === 'status'">
               <IndicatorIcon :class="item.color" />
@@ -173,7 +181,12 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['loadMore', 'updatePageCount', 'columnWidthUpdated'])
+const emit = defineEmits([
+  'loadMore',
+  'updatePageCount',
+  'columnWidthUpdated',
+  'applyFilter',
+])
 
 const pageLengthCount = defineModel()
 const list = defineModel('list')
diff --git a/frontend/src/components/ListViews/OrganizationsListView.vue b/frontend/src/components/ListViews/OrganizationsListView.vue
index d8e89442..863be606 100644
--- a/frontend/src/components/ListViews/OrganizationsListView.vue
+++ b/frontend/src/components/ListViews/OrganizationsListView.vue
@@ -18,10 +18,13 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
-        <ListRowItem :item="item">
+        <ListRowItem
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <template #prefix>
             <div v-if="column.key === 'organization_name'">
               <Avatar
@@ -123,6 +126,7 @@ const emit = defineEmits([
   'updatePageCount',
   'reload',
   'columnWidthUpdated',
+  'applyFilter',
 ])
 
 const pageLengthCount = defineModel()
diff --git a/frontend/src/components/ListViews/TasksListView.vue b/frontend/src/components/ListViews/TasksListView.vue
index c94ccd41..57e42ce2 100644
--- a/frontend/src/components/ListViews/TasksListView.vue
+++ b/frontend/src/components/ListViews/TasksListView.vue
@@ -15,7 +15,7 @@
         class="mx-5"
         v-for="row in rows"
         :key="row.name"
-        v-slot="{ column, item }"
+        v-slot="{ idx, column, item }"
         :row="row"
       >
         <Tooltip
@@ -30,7 +30,11 @@
             {{ dateFormat(item, 'D MMM, hh:mm a') }}
           </div>
         </Tooltip>
-        <ListRowItem v-else :item="item">
+        <ListRowItem
+          v-else
+          :item="item"
+          @click="(event) => emit('applyFilter', { event, idx, column, item })"
+        >
           <template #prefix>
             <div v-if="column.key === 'status'">
               <TaskStatusIcon :status="item" />
@@ -153,6 +157,7 @@ const emit = defineEmits([
   'showTask',
   'reload',
   'columnWidthUpdated',
+  'applyFilter',
 ])
 
 const pageLengthCount = defineModel()
diff --git a/frontend/src/pages/CallLogs.vue b/frontend/src/pages/CallLogs.vue
index a739a307..8185e67e 100644
--- a/frontend/src/pages/CallLogs.vue
+++ b/frontend/src/pages/CallLogs.vue
@@ -5,6 +5,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="callLogs"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -25,6 +26,7 @@
     @columnWidthUpdated="() => triggerResize++"
     @updatePageCount="(count) => (updatedPageCount = count)"
     @reload="callLogs.reload()"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div
     v-else-if="callLogs.data"
@@ -65,6 +67,7 @@ const callLogs = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 const rows = computed(() => {
   if (!callLogs.value?.data?.data) return []
diff --git a/frontend/src/pages/Contacts.vue b/frontend/src/pages/Contacts.vue
index 26201c9a..a8260c0a 100644
--- a/frontend/src/pages/Contacts.vue
+++ b/frontend/src/pages/Contacts.vue
@@ -10,6 +10,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="contacts"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -30,6 +31,7 @@
     @columnWidthUpdated="() => triggerResize++"
     @updatePageCount="(count) => (updatedPageCount = count)"
     @reload="contacts.reload()"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div
     v-else-if="contacts.data"
@@ -89,6 +91,7 @@ const contacts = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 const rows = computed(() => {
   if (!contacts.value?.data?.data) return []
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index d0d90a99..8f63f559 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -10,6 +10,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="deals"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -30,6 +31,7 @@
     @loadMore="() => loadMore++"
     @columnWidthUpdated="() => triggerResize++"
     @updatePageCount="(count) => (updatedPageCount = count)"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div v-else-if="deals.data" class="flex h-full items-center justify-center">
     <div
@@ -94,6 +96,7 @@ const deals = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 // Rows
 const rows = computed(() => {
diff --git a/frontend/src/pages/EmailTemplates.vue b/frontend/src/pages/EmailTemplates.vue
index 019b517f..cbb77a25 100644
--- a/frontend/src/pages/EmailTemplates.vue
+++ b/frontend/src/pages/EmailTemplates.vue
@@ -10,6 +10,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="emailTemplates"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -31,6 +32,7 @@
     @updatePageCount="(count) => (updatedPageCount = count)"
     @showEmailTemplate="showEmailTemplate"
     @reload="emailTemplates.reload()"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div
     v-else-if="emailTemplates.data"
@@ -69,6 +71,7 @@ const emailTemplates = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 const rows = computed(() => {
   if (!emailTemplates.value?.data?.data) return []
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 024fab16..b2777b25 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -10,6 +10,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="leads"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -31,6 +32,7 @@
     @loadMore="() => loadMore++"
     @columnWidthUpdated="() => triggerResize++"
     @updatePageCount="(count) => (updatedPageCount = count)"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div v-else-if="leads.data" class="flex h-full items-center justify-center">
     <div
@@ -89,6 +91,7 @@ const leads = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 // Rows
 const rows = computed(() => {
diff --git a/frontend/src/pages/Organizations.vue b/frontend/src/pages/Organizations.vue
index 4bcaf443..44fb483a 100644
--- a/frontend/src/pages/Organizations.vue
+++ b/frontend/src/pages/Organizations.vue
@@ -14,6 +14,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="organizations"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -34,6 +35,7 @@
     @columnWidthUpdated="() => triggerResize++"
     @updatePageCount="(count) => (updatedPageCount = count)"
     @reload="organizations.reload()"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div
     v-else-if="organizations.data"
@@ -95,6 +97,7 @@ const organizations = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 const rows = computed(() => {
   if (!organizations.value?.data?.data) return []
diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue
index bc3a601a..8c6cd405 100644
--- a/frontend/src/pages/Tasks.vue
+++ b/frontend/src/pages/Tasks.vue
@@ -10,6 +10,7 @@
     </template>
   </LayoutHeader>
   <ViewControls
+    ref="viewControls"
     v-model="tasks"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
@@ -31,6 +32,7 @@
     @updatePageCount="(count) => (updatedPageCount = count)"
     @showTask="showTask"
     @reload="tasks.reload()"
+    @applyFilter="(data) => viewControls.applyFilter(data)"
   />
   <div v-else-if="tasks.data" class="flex h-full items-center justify-center">
     <div
@@ -63,6 +65,7 @@ const tasks = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
+const viewControls = ref(null)
 
 const rows = computed(() => {
   if (!tasks.value?.data?.data) return []