From 5028909078bf3257141bf295b052ccd2a72688e6 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 17:41:45 +0530
Subject: [PATCH 1/2] fix: value is null causing issue while converting filter

---
 frontend/src/components/Filter.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/Filter.vue b/frontend/src/components/Filter.vue
index a67bf7c4..5a44c11c 100644
--- a/frontend/src/components/Filter.vue
+++ b/frontend/src/components/Filter.vue
@@ -67,7 +67,7 @@
               </div>
               <div id="value" class="w-full">
                 <component
-                  :is="getValSelect(f)"
+                  :is="getValueControl(f)"
                   v-model="f.value"
                   @change.stop="(v) => updateValue(v, f)"
                   :placeholder="__('John Doe')"
@@ -100,7 +100,7 @@
                 </div>
                 <div id="value" class="!min-w-[140px]">
                   <component
-                    :is="getValSelect(f)"
+                    :is="getValueControl(f)"
                     v-model="f.value"
                     @change="(v) => updateValue(v, f)"
                     :placeholder="__('John Doe')"
@@ -242,7 +242,7 @@ function convertFilters(data, allFilters) {
   let f = []
   for (let [key, value] of Object.entries(allFilters)) {
     let field = data.find((f) => f.fieldname === key)
-    if (typeof value !== 'object') {
+    if (typeof value !== 'object' || !value) {
       value = ['=', value]
       if (field?.fieldtype === 'Check') {
         value = ['equals', value[1] ? 'Yes' : 'No']
@@ -273,7 +273,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (fieldname === '_assign') {
@@ -298,7 +298,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('>'), value: '>' },
         { label: __('<='), value: '<=' },
         { label: __('>='), value: '>=' },
-      ]
+      ],
     )
   }
   if (typeSelect.includes(fieldtype)) {
@@ -309,7 +309,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (typeLink.includes(fieldtype)) {
@@ -322,7 +322,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (typeCheck.includes(fieldtype)) {
@@ -336,7 +336,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (typeDate.includes(fieldtype)) {
@@ -351,13 +351,13 @@ function getOperators(fieldtype, fieldname) {
         { label: __('<='), value: '<=' },
         { label: __('Between'), value: 'between' },
         { label: __('Timespan'), value: 'timespan' },
-      ]
+      ],
     )
   }
   return options
 }
 
-function getValSelect(f) {
+function getValueControl(f) {
   const { field, operator } = f
   const { fieldtype, options } = field
   if (operator == 'is') {

From aeb455894f642d13785dd58c8c6b566203a8144e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 17:42:12 +0530
Subject: [PATCH 2/2] build(deps): bump frappeui to 0.1.63

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

diff --git a/frappe-ui b/frappe-ui
index 0c0212cc..b5cc6c0c 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 0c0212cc5bbac151cffc6dc73dfbdf7b69d45ec2
+Subproject commit b5cc6c0cd36ee25e8e945e8c91d8b5c035fb5e44
diff --git a/frontend/package.json b/frontend/package.json
index 7a839c81..4f46436b 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.61",
+    "frappe-ui": "^0.1.63",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",