From e3c95f63cf98e56d90435602f6590ff611a2b106 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 7 Jan 2024 13:59:01 +0530
Subject: [PATCH] fix: send default_filter separately

---
 crm/api/doc.py                           | 15 ++++++++++++++-
 frontend/src/components/ViewControls.vue |  8 +++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/crm/api/doc.py b/crm/api/doc.py
index 9795246c..f51c8984 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -56,9 +56,22 @@ def get_filterable_fields(doctype: str):
 
 
 @frappe.whitelist()
-def get_list_data(doctype: str, filters: dict, order_by: str, columns=None , rows=None, custom_view_name=None):
+def get_list_data(
+	doctype: str,
+	filters: dict,
+	order_by: str,
+	columns=None,
+	rows=None,
+	custom_view_name=None,
+	default_filters=None,
+):
 	custom_view = False
 	filters = frappe._dict(filters)
+
+	if default_filters:
+		default_filters = frappe.parse_json(default_filters)
+		filters.update(default_filters)
+
 	is_default = True
 	if columns or rows:
 		custom_view = True
diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 87b98901..b6aa728c 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -116,7 +116,7 @@ const currentView = computed(() => {
 const view = ref({
   name: '',
   label: '',
-  filters: props.filters,
+  filters: {},
   order_by: 'modified desc',
   columns: '',
   rows: '',
@@ -126,7 +126,7 @@ const view = ref({
 
 function getParams() {
   let _view = getView(route.query.view)
-  const filters = (_view?.filters && JSON.parse(_view.filters)) || props.filters
+  const filters = (_view?.filters && JSON.parse(_view.filters)) || {}
   const order_by = _view?.order_by || 'modified desc'
   const columns = _view?.columns || ''
   const rows = _view?.rows || ''
@@ -147,7 +147,7 @@ function getParams() {
     view.value = {
       name: '',
       label: '',
-      filters: props.filters,
+      filters: {},
       order_by: 'modified desc',
       columns: '',
       rows: '',
@@ -164,6 +164,7 @@ function getParams() {
     columns: columns,
     rows: rows,
     custom_view_name: _view?.name || '',
+    default_filters: props.filters,
   }
 }
 
@@ -181,6 +182,7 @@ list.value = createResource({
       columns: data.columns,
       rows: data.rows,
       custom_view_name: cv?.name || '',
+      default_filters: props.filters,
     }
   },
 })