From bd9228a820149e40164b190930b776b8f544163a Mon Sep 17 00:00:00 2001
From: suhail <suhailanzar00@gmail.com>
Date: Fri, 11 Apr 2025 14:27:30 +0530
Subject: [PATCH 1/4] fix: improve docs filtering and add clear option

---
 src/components/FilterDropdown.vue | 305 +++++++++++++++++++-----------
 1 file changed, 197 insertions(+), 108 deletions(-)

diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index 59068f9a..3652a6f9 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -1,9 +1,12 @@
 <template>
   <Popover
+    ref="filterPopover"
     v-if="fields.length"
     placement="bottom-end"
     @close="emitFilterChange"
+    :close-on-click-outside="true"
   >
+    :close-on-click-content="false" >
     <template #target="{ togglePopover }">
       <Button :icon="true" @click="togglePopover()">
         <span class="flex items-center">
@@ -24,96 +27,104 @@
       </Button>
     </template>
     <template #content>
-      <div>
-        <div class="p-2">
-          <template v-if="explicitFilters.length">
-            <div class="flex flex-col gap-2">
+      <div class="p-2">
+        <template v-if="explicitFilters.length">
+          <div class="flex flex-col gap-2">
+            <div
+              v-for="(filter, i) in explicitFilters"
+              :key="filter.fieldname + getRandomString()"
+              class="flex items-center justify-between text-base gap-2"
+            >
               <div
-                v-for="(filter, i) in explicitFilters"
-                :key="filter.fieldname + getRandomString()"
-                class="flex items-center justify-between text-base gap-2"
+                class="
+                  cursor-pointer
+                  w-4
+                  h-4
+                  flex
+                  items-center
+                  justify-center
+                  text-gray-600
+                  dark:text-gray-400
+                  hover:text-gray-800
+                  dark:hover:text-gray-300
+                  rounded-md
+                  group
+                "
               >
-                <div
-                  class="
-                    cursor-pointer
-                    w-4
-                    h-4
-                    flex
-                    items-center
-                    justify-center
-                    text-gray-600
-                    dark:text-gray-400
-                    hover:text-gray-800
-                    dark:hover:text-gray-300
-                    rounded-md
-                    group
-                  "
-                >
-                  <span class="hidden group-hover:inline-block">
-                    <feather-icon
-                      name="x"
-                      class="w-4 h-4 cursor-pointer"
-                      :button="true"
-                      @click="removeFilter(filter)"
-                    />
-                  </span>
-                  <span class="group-hover:hidden">
-                    {{ i + 1 }}
-                  </span>
-                </div>
-                <Select
-                  :border="true"
-                  size="small"
-                  class="w-24"
-                  :df="{
-                    label: t`Field`,
-                    placeholder: t`Field`,
-                    fieldname: 'fieldname',
-                    fieldtype: 'Select',
-                    options: fieldOptions,
-                  }"
-                  :value="filter.fieldname"
-                  :close-drop-down="false"
-                  @change="(value) => updateNewFilters(i, 'fieldname', value)"
-                />
-                <Select
-                  :border="true"
-                  size="small"
-                  class="w-24"
-                  :df="{
-                    label: t`Condition`,
-                    placeholder: t`Condition`,
-                    fieldname: 'condition',
-                    fieldtype: 'Select',
-                    options: conditions,
-                  }"
-                  :value="filter.condition"
-                  :close-drop-down="false"
-                  @change="(value) => updateNewFilters(i, 'condition', value)"
-                />
-                <Data
-                  :border="true"
-                  size="small"
-                  class="w-24"
-                  :df="{
-                    label: t`Value`,
-                    placeholder: t`Value`,
-                    fieldname: 'value',
-                    fieldtype: 'Data',
-                  }"
-                  :value="String(filter.value)"
-                  :close-drop-down="false"
-                  @change="(value) => updateNewFilters(i, 'value', value)"
-                />
+                <span class="hidden group-hover:inline-block">
+                  <feather-icon
+                    name="x"
+                    class="w-4 h-4 cursor-pointer"
+                    :button="true"
+                    @click="removeFilter(i)"
+                  />
+                </span>
+                <span class="group-hover:hidden">
+                  {{ i + 1 }}
+                </span>
               </div>
+              <Select
+                :border="true"
+                size="small"
+                class="w-24"
+                :df="{
+                  label: t`Field`,
+                  placeholder: t`field`,
+                  fieldname: 'fieldname',
+                  fieldtype: 'Select',
+                  options: fieldOptions,
+                }"
+                :value="filter.fieldname"
+                :close-drop-down="false"
+                @mousedown.stop
+                @click.stop
+                @change="(value) => updateNewFilters(i, 'fieldname', value)"
+              />
+
+              <Select
+                :border="true"
+                size="small"
+                class="w-24"
+                :df="{
+                  label: t`Condition`,
+                  placeholder: t`Condition`,
+                  fieldname: 'condition',
+                  fieldtype: 'Select',
+                  options: conditions,
+                }"
+                :value="filter.condition"
+                :close-drop-down="false"
+                @mousedown.stop
+                @click.stop
+                @change="(value) => updateNewFilters(i, 'condition', value)"
+              />
+
+              <Data
+                :border="true"
+                size="small"
+                class="w-24"
+                :df="{
+                  label: t`Value`,
+                  placeholder: t`Value`,
+                  fieldname: 'value',
+                  fieldtype: 'Data',
+                }"
+                :value="String(filter.value)"
+                :close-drop-down="false"
+                @mousedown.stop
+                @click.stop
+                @change="(value) => updateNewFilters(i, 'value', value)"
+              />
             </div>
-          </template>
-          <template v-else>
-            <span class="text-base text-gray-600 dark:text-gray-500">{{
-              t`No filters selected`
-            }}</span>
-          </template>
-        </div>
+          </div>
+        </template>
+        <template v-else>
+          <span class="text-base text-gray-600 dark:text-gray-500">{{
+            t`No filters selected`
+          }}</span>
+        </template>
+      </div>
+      <div class="flex justify-between border-t dark:border-gray-800">
         <div
           class="
             text-base
@@ -128,11 +139,53 @@
             hover:bg-gray-100
             dark:hover:bg-gray-875
           "
-          @click="addNewFilter"
+          @click.stop="addNewFilter"
         >
           <feather-icon name="plus" class="w-4 h-4" />
           <span class="ms-2">{{ t`Add a filter` }}</span>
         </div>
+
+        <div class="flex">
+          <div
+            v-if="filters.length"
+            class="
+              text-base
+              p-2
+              flex
+              items-center
+              text-gray-600
+              dark:text-gray-500
+              cursor-pointer
+              hover:bg-gray-100
+              dark:hover:bg-gray-875
+            "
+            @click="clearAllFilters"
+          >
+            <feather-icon name="trash-2" class="w-4 h-4" />
+            <span class="ms-2">{{ t`Clear` }}</span>
+          </div>
+
+          <div
+            v-if="filters.length"
+            @click="applyFilters"
+            class="
+              text-base
+              border-t
+              dark:border-gray-800
+              p-2
+              flex
+              items-center
+              text-gray-600
+              dark:text-gray-500
+              cursor-pointer
+              hover:bg-gray-100
+              dark:hover:bg-gray-875
+            "
+          >
+            <feather-icon name="search" class="w-4 h-4" />
+            <span class="ml-2 text-sm">{{ t`Apply` }}</span>
+          </div>
+        </div>
       </div>
     </template>
   </Popover>
@@ -151,14 +204,14 @@ import Popover from './Popover.vue';
 import { QueryFilter } from 'utils/db/types';
 
 const conditions = [
-  { label: t`Is`, value: '=' },
-  { label: t`Is Not`, value: '!=' },
-  { label: t`Contains`, value: 'like' },
-  { label: t`Does Not Contain`, value: 'not like' },
-  { label: t`Greater Than`, value: '>' },
-  { label: t`Less Than`, value: '<' },
-  { label: t`Is Empty`, value: 'is null' },
-  { label: t`Is Not Empty`, value: 'is not null' },
+  { label: '=', value: '=' },
+  { label: '!=', value: '!=' },
+  { label: 'like', value: 'like' },
+  { label: 'not like', value: 'not like' },
+  { label: '>', value: '>' },
+  { label: '<', value: '<' },
+  { label: 'is null', value: 'is null' },
+  { label: 'is not null', value: 'is not null' },
 ] as const;
 
 type Condition = typeof conditions[number]['value'];
@@ -170,6 +223,13 @@ type Filter = {
   implicit: boolean;
 };
 
+type PopoverRef = {
+  close?: () => void;
+  hide?: () => void;
+  togglePopover?: (state: boolean) => void;
+  $el?: HTMLElement;
+};
+
 export default defineComponent({
   name: 'FilterDropdown',
   components: {
@@ -213,7 +273,7 @@ export default defineComponent({
     },
     fieldOptions(): { label: string; value: string }[] {
       return this.fields.map((df) => ({
-        label: df.label,
+        label: df.fieldname,
         value: df.fieldname,
       }));
     },
@@ -253,20 +313,40 @@ export default defineComponent({
       value: Filter['value'],
       implicit?: boolean
     ): void {
-      this.filters.push({ fieldname, condition, value, implicit: !!implicit });
-      this.newFilters.push({
-        fieldname,
-        condition,
-        value,
-        implicit: !!implicit,
-      });
+      const newFilter = { fieldname, condition, value, implicit: !!implicit };
+      this.filters.push(newFilter);
+      this.newFilters.push(newFilter);
     },
-    removeFilter(filter: Filter): void {
-      this.filters = this.filters.filter((f) => f !== filter);
+
+    applyFilters() {
+      this.emitFilterChange();
+      const popover = this.$refs.filterPopover as PopoverRef;
+      if (popover?.close) popover.close();
+      else if (popover?.hide) popover.hide();
+      else if (popover?.togglePopover) popover.togglePopover(false);
+      else if (popover?.$el) popover.$el.click();
     },
-    updateNewFilters(index: number, key: keyof Filter, value: Filter['value']) {
+
+    removeFilter(index: number): void {
+      this.filters.splice(index, 1);
+      this.newFilters.splice(index, 1);
+    },
+
+    clearAllFilters(): void {
+      this.filters = [];
+      this.newFilters = [];
+
+      this.$emit('change', {});
+    },
+
+    updateNewFilters<K extends keyof Filter>(
+      index: number,
+      key: K,
+      value: Filter[K]
+    ) {
       this.newFilters![index][key] = value;
     },
+
     setFilter(filters: QueryFilter, implicit?: boolean): void {
       this.filters = [];
       this.newFilters = [];
@@ -289,25 +369,34 @@ export default defineComponent({
 
       this.emitFilterChange();
     },
+
     emitFilterChange(): void {
       const filters: Record<string, [Condition, Filter['value']]> = {};
+
+      // Build filters from newFilters (source of truth)
       for (const { condition, value, fieldname } of this.newFilters) {
         if (value === '' && condition) {
           continue;
         }
 
-        filters[fieldname] = [condition, value];
+        if (fieldname === 'numberSeries') {
+          filters['name'] = [condition, value];
+        } else {
+          filters[fieldname] = [condition, value];
+        }
       }
 
       this.$emit('change', filters);
+      this.filters = [...this.newFilters];
+
       if (this.newFilters.length) {
         this.filters = this.filters.filter(
           (filter) => filter.condition && filter.value && filter.fieldname
         );
-
         this.filters.push(this.newFilters[this.newFilters.length - 1]);
       }
 
+      // Deduplicate filters
       this.filters = Array.from(
         new Map(
           this.filters.map((filter) => [

From 9fad31a8356289f2dfce7a990bdc93fbad661725 Mon Sep 17 00:00:00 2001
From: suhailanzar <suhailanzar00@gmail.com>
Date: Wed, 23 Apr 2025 14:49:47 +0530
Subject: [PATCH 2/4] fix: improve docs filtering & Added status wise Filtering

---
 models/baseModels/Payment/Payment.ts |  6 ++--
 models/helpers.ts                    | 10 +++++++
 src/components/FilterDropdown.vue    | 43 ++++++++++++++++++++++------
 src/pages/ListView/List.vue          | 39 +++++++++++++++++++++++--
 src/pages/ListView/ListCell.vue      | 19 ++++++++++++
 5 files changed, 101 insertions(+), 16 deletions(-)

diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 58dfe212..9ec02108 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -666,11 +666,9 @@ export class Payment extends Transactional {
     },
     referenceType: {
       formula: () => {
-        if (this.referenceType) {
-          return;
-        }
-        return this.for![0].referenceType;
+        return this.referenceType || undefined;
       },
+      dependsOn: ['for'],
     },
     taxes: { formula: async () => await this.getTaxSummary() },
   };
diff --git a/models/helpers.ts b/models/helpers.ts
index 22f22944..f6f4c814 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -319,6 +319,11 @@ export function getTransactionStatusColumn(): ColumnConfig {
 
       return {
         template: `<Badge class="text-xs" color="${color}">${label}</Badge>`,
+        metadata: {
+          status,
+          color,
+          label,
+        },
       };
     },
   };
@@ -681,6 +686,11 @@ export function getDocStatusListColumn(): ColumnConfig {
 
       return {
         template: `<Badge class="text-xs" color="${color}">${label}</Badge>`,
+        metadata: {
+          status,
+          color,
+          label,
+        },
       };
     },
   };
diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index 3652a6f9..c4e2faae 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -5,8 +5,8 @@
     placement="bottom-end"
     @close="emitFilterChange"
     :close-on-click-outside="true"
+    :close-on-click-content="false"
   >
-    :close-on-click-content="false" >
     <template #target="{ togglePopover }">
       <Button :icon="true" @click="togglePopover()">
         <span class="flex items-center">
@@ -75,7 +75,6 @@
                   options: fieldOptions,
                 }"
                 :value="filter.fieldname"
-                :close-drop-down="false"
                 @mousedown.stop
                 @click.stop
                 @change="(value) => updateNewFilters(i, 'fieldname', value)"
@@ -191,7 +190,6 @@
   </Popover>
 </template>
 <script lang="ts">
-import { t } from 'fyo';
 import { Field, FieldTypeEnum } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 import { getRandomString } from 'utils';
@@ -247,6 +245,9 @@ export default defineComponent({
       newFilters: [] as Filter[],
     };
   },
+  created() {
+    this.addNewFilter();
+  },
   computed: {
     fields(): Field[] {
       const excludedFieldsTypes: string[] = [
@@ -254,8 +255,13 @@ export default defineComponent({
         FieldTypeEnum.Attachment,
         FieldTypeEnum.AttachImage,
       ];
+
+      const listViewSettings =
+        fyo.models[this.schemaName]?.getListViewSettings?.(fyo);
+      const statusField = listViewSettings?.columns?.[1] as any;
+
       const fields = fyo.schemaMap[this.schemaName]?.fields ?? [];
-      return fields.filter((f) => {
+      const filteredFields = fields.filter((f) => {
         if (f.filter) {
           return true;
         }
@@ -270,6 +276,25 @@ export default defineComponent({
 
         return true;
       });
+
+      if (statusField && statusField.fieldname) {
+        const statusFieldExists = filteredFields.some(
+          (field) => field.fieldname === statusField.fieldname
+        );
+
+        if (!statusFieldExists) {
+          const originalStatusField = fields.find(
+            (field) => field.fieldname === statusField.fieldname
+          );
+          if (originalStatusField) {
+            filteredFields.unshift(originalStatusField);
+          } else {
+            filteredFields.unshift(statusField);
+          }
+        }
+      }
+
+      return filteredFields;
     },
     fieldOptions(): { label: string; value: string }[] {
       return this.fields.map((df) => ({
@@ -294,9 +319,7 @@ export default defineComponent({
       return this.t`${this.activeFilterCount} filters applied`;
     },
   },
-  created() {
-    this.addNewFilter();
-  },
+
   methods: {
     getRandomString,
     addNewFilter(): void {
@@ -373,8 +396,11 @@ export default defineComponent({
     emitFilterChange(): void {
       const filters: Record<string, [Condition, Filter['value']]> = {};
 
-      // Build filters from newFilters (source of truth)
       for (const { condition, value, fieldname } of this.newFilters) {
+        console.log('condition is:', condition);
+        console.log('value is:', value);
+        console.log('fieldname is:', fieldname);
+
         if (value === '' && condition) {
           continue;
         }
@@ -396,7 +422,6 @@ export default defineComponent({
         this.filters.push(this.newFilters[this.newFilters.length - 1]);
       }
 
-      // Deduplicate filters
       this.filters = Array.from(
         new Map(
           this.filters.map((filter) => [
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index eb99c83f..f3c33a61 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -71,6 +71,7 @@
               }"
               :row="(row as RenderData)"
               :column="column"
+              @status-found="handleStatusFound"
             />
           </Row>
         </div>
@@ -144,6 +145,7 @@ export default defineComponent({
       data: [] as RenderData[],
       pageStart: 0,
       pageEnd: 0,
+      statusMap: {} as Record<string, string>,
     };
   },
   computed: {
@@ -186,6 +188,9 @@ export default defineComponent({
     this.setUpdateListeners();
   },
   methods: {
+    handleStatusFound({ rowId, status }: { rowId: string; status: string }) {
+      this.statusMap[rowId] = status;
+    },
     isNumeric,
     setPageIndices({ start, end }: { start: number; end: number }) {
       this.pageStart = start;
@@ -213,10 +218,24 @@ export default defineComponent({
       if (!filters) {
         filters = { ...this.filters };
       }
-
-      // Unproxy the filters
       filters = cloneDeep(filters);
 
+      let statusFilter: [string, string] | undefined;
+
+      if ('status' in filters) {
+        statusFilter = filters['status'] as [string, string];
+      }
+
+      if ('referenceType' in filters) {
+        statusFilter = filters['referenceType'] as [string, string];
+      }
+
+      const isStatusFilter =
+        Array.isArray(statusFilter) && statusFilter[0] === 'like';
+      if (isStatusFilter) {
+        delete filters['status']; // remove status from query filters
+      }
+
       const orderBy = ['created'];
       if (fyo.db.fieldMap[this.schemaName]['date']) {
         orderBy.unshift('date');
@@ -228,7 +247,21 @@ export default defineComponent({
         orderBy,
       });
 
-      this.data = tableData.map((d) => ({
+      let filteredData = tableData;
+
+      if (isStatusFilter && statusFilter?.[1]) {
+        const lowercaseStatus = String(statusFilter[1]).toLowerCase();
+
+        const matchedNames = Object.entries(this.statusMap)
+          .filter((entry) => entry[1].toLowerCase() === lowercaseStatus)
+          .map((entry) => entry[0]);
+
+        filteredData = tableData.filter((row) =>
+          matchedNames.includes(String(row.name))
+        );
+      }
+
+      this.data = filteredData.map((d) => ({
         ...d,
         schema: fyo.schemaMap[this.schemaName],
       })) as RenderData[];
diff --git a/src/pages/ListView/ListCell.vue b/src/pages/ListView/ListCell.vue
index b1ef6697..98d1968a 100644
--- a/src/pages/ListView/ListCell.vue
+++ b/src/pages/ListView/ListCell.vue
@@ -27,6 +27,7 @@ export default defineComponent({
     row: { type: Object as PropType<RenderData>, required: true },
     column: { type: Object as PropType<Column>, required: true },
   },
+  emits: ['status-found'],
   computed: {
     columnValue(): string {
       const column = this.column;
@@ -51,5 +52,23 @@ export default defineComponent({
       return isNumeric(this.column.fieldtype) ? 'justify-end' : '';
     },
   },
+  mounted() {
+    const { render } = this.column as ColumnConfig;
+    if (render) {
+      const result = render(this.row) as {
+        template: string;
+        metadata?: { status: string; color: string; label: string };
+      };
+
+      if (result?.metadata) {
+        this.$emit('status-found', {
+          rowId: this.row.name || this.row.id,
+          fieldname: this.column.fieldname,
+          status: result.metadata.status,
+          label: result.metadata.label,
+        });
+      }
+    }
+  },
 });
 </script>

From cc4db64abf17eb1fcb7ebef7091c28437358e1a6 Mon Sep 17 00:00:00 2001
From: suhailanzar <suhailanzar00@gmail.com>
Date: Mon, 12 May 2025 11:53:12 +0530
Subject: [PATCH 3/4] fix: resolved the conditions label

---
 src/components/FilterDropdown.vue | 295 +++++++++++++++---------------
 1 file changed, 147 insertions(+), 148 deletions(-)

diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index c4e2faae..bff9132f 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -27,146 +27,105 @@
       </Button>
     </template>
     <template #content>
-      <div class="p-2">
-        <template v-if="explicitFilters.length">
-          <div class="flex flex-col gap-2">
-            <div
-              v-for="(filter, i) in explicitFilters"
-              :key="filter.fieldname + getRandomString()"
-              class="flex items-center justify-between text-base gap-2"
-            >
+      <div>
+        <div class="p-2">
+          <template v-if="explicitFilters.length">
+            <div class="flex flex-col gap-2">
               <div
-                class="
-                  cursor-pointer
-                  w-4
-                  h-4
-                  flex
-                  items-center
-                  justify-center
-                  text-gray-600
-                  dark:text-gray-400
-                  hover:text-gray-800
-                  dark:hover:text-gray-300
-                  rounded-md
-                  group
-                "
+                v-for="(filter, i) in explicitFilters"
+                :key="filter.fieldname + getRandomString()"
+                class="flex items-center justify-between text-base gap-2"
               >
-                <span class="hidden group-hover:inline-block">
-                  <feather-icon
-                    name="x"
-                    class="w-4 h-4 cursor-pointer"
-                    :button="true"
-                    @click="removeFilter(i)"
-                  />
-                </span>
-                <span class="group-hover:hidden">
-                  {{ i + 1 }}
-                </span>
+                <div
+                  class="
+                    cursor-pointer
+                    w-4
+                    h-4
+                    flex
+                    items-center
+                    justify-center
+                    text-gray-600
+                    dark:text-gray-400
+                    hover:text-gray-800
+                    dark:hover:text-gray-300
+                    rounded-md
+                    group
+                  "
+                >
+                  <span class="hidden group-hover:inline-block">
+                    <feather-icon
+                      name="x"
+                      class="w-4 h-4 cursor-pointer"
+                      :button="true"
+                      @click="removeFilter(i)"
+                    />
+                  </span>
+                  <span class="group-hover:hidden">
+                    {{ i + 1 }}
+                  </span>
+                </div>
+                <Select
+                  :border="true"
+                  size="small"
+                  class="w-24"
+                  :df="{
+                    label: t`Field`,
+                    placeholder: t`field`,
+                    fieldname: 'fieldname',
+                    fieldtype: 'Select',
+                    options: fieldOptions,
+                  }"
+                  :value="filter.fieldname"
+                  @mousedown.stop
+                  @click.stop
+                  @change="(value) => updateNewFilters(i, 'fieldname', value)"
+                />
+
+                <Select
+                  :border="true"
+                  size="small"
+                  class="w-24"
+                  :df="{
+                    label: t`Condition`,
+                    placeholder: t`Condition`,
+                    fieldname: 'condition',
+                    fieldtype: 'Select',
+                    options: conditions,
+                  }"
+                  :value="filter.condition"
+                  :close-drop-down="false"
+                  @mousedown.stop
+                  @click.stop
+                  @change="(value) => updateNewFilters(i, 'condition', value)"
+                />
+
+                <Data
+                  :border="true"
+                  size="small"
+                  class="w-24"
+                  :df="{
+                    label: t`Value`,
+                    placeholder: t`Value`,
+                    fieldname: 'value',
+                    fieldtype: 'Data',
+                  }"
+                  :value="String(filter.value)"
+                  :close-drop-down="false"
+                  @mousedown.stop
+                  @click.stop
+                  @change="(value) => updateNewFilters(i, 'value', value)"
+                />
               </div>
-              <Select
-                :border="true"
-                size="small"
-                class="w-24"
-                :df="{
-                  label: t`Field`,
-                  placeholder: t`field`,
-                  fieldname: 'fieldname',
-                  fieldtype: 'Select',
-                  options: fieldOptions,
-                }"
-                :value="filter.fieldname"
-                @mousedown.stop
-                @click.stop
-                @change="(value) => updateNewFilters(i, 'fieldname', value)"
-              />
-
-              <Select
-                :border="true"
-                size="small"
-                class="w-24"
-                :df="{
-                  label: t`Condition`,
-                  placeholder: t`Condition`,
-                  fieldname: 'condition',
-                  fieldtype: 'Select',
-                  options: conditions,
-                }"
-                :value="filter.condition"
-                :close-drop-down="false"
-                @mousedown.stop
-                @click.stop
-                @change="(value) => updateNewFilters(i, 'condition', value)"
-              />
-
-              <Data
-                :border="true"
-                size="small"
-                class="w-24"
-                :df="{
-                  label: t`Value`,
-                  placeholder: t`Value`,
-                  fieldname: 'value',
-                  fieldtype: 'Data',
-                }"
-                :value="String(filter.value)"
-                :close-drop-down="false"
-                @mousedown.stop
-                @click.stop
-                @change="(value) => updateNewFilters(i, 'value', value)"
-              />
             </div>
-          </div>
-        </template>
-        <template v-else>
-          <span class="text-base text-gray-600 dark:text-gray-500">{{
-            t`No filters selected`
-          }}</span>
-        </template>
-      </div>
-      <div class="flex justify-between border-t dark:border-gray-800">
-        <div
-          class="
-            text-base
-            border-t
-            dark:border-gray-800
-            p-2
-            flex
-            items-center
-            text-gray-600
-            dark:text-gray-500
-            cursor-pointer
-            hover:bg-gray-100
-            dark:hover:bg-gray-875
-          "
-          @click.stop="addNewFilter"
-        >
-          <feather-icon name="plus" class="w-4 h-4" />
-          <span class="ms-2">{{ t`Add a filter` }}</span>
+          </template>
+          <template v-else>
+            <span class="text-base text-gray-600 dark:text-gray-500">{{
+              t`No filters selected`
+            }}</span>
+          </template>
         </div>
-
-        <div class="flex">
+        <div class="flex justify-between border-t dark:border-gray-800">
           <div
-            v-if="filters.length"
-            class="
-              text-base
-              p-2
-              flex
-              items-center
-              text-gray-600
-              dark:text-gray-500
-              cursor-pointer
-              hover:bg-gray-100
-              dark:hover:bg-gray-875
-            "
-            @click="clearAllFilters"
-          >
-            <feather-icon name="trash-2" class="w-4 h-4" />
-            <span class="ms-2">{{ t`Clear` }}</span>
-          </div>
-
-          <div
-            v-if="filters.length"
-            @click="applyFilters"
             class="
               text-base
               border-t
@@ -180,9 +139,52 @@
               hover:bg-gray-100
               dark:hover:bg-gray-875
             "
+            @click.stop="addNewFilter"
           >
-            <feather-icon name="search" class="w-4 h-4" />
-            <span class="ml-2 text-sm">{{ t`Apply` }}</span>
+            <feather-icon name="plus" class="w-4 h-4" />
+            <span class="ms-2">{{ t`Add a filter` }}</span>
+          </div>
+
+          <div class="flex">
+            <div
+              v-if="filters.length"
+              class="
+                text-base
+                p-2
+                flex
+                items-center
+                text-gray-600
+                dark:text-gray-500
+                cursor-pointer
+                hover:bg-gray-100
+                dark:hover:bg-gray-875
+              "
+              @click="clearAllFilters"
+            >
+              <feather-icon name="trash-2" class="w-4 h-4" />
+              <span class="ms-2">{{ t`Clear` }}</span>
+            </div>
+
+            <div
+              v-if="filters.length"
+              @click="applyFilters"
+              class="
+                text-base
+                border-t
+                dark:border-gray-800
+                p-2
+                flex
+                items-center
+                text-gray-600
+                dark:text-gray-500
+                cursor-pointer
+                hover:bg-gray-100
+                dark:hover:bg-gray-875
+              "
+            >
+              <feather-icon name="search" class="w-4 h-4" />
+              <span class="ml-2 text-sm">{{ t`Apply` }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -200,16 +202,17 @@ import Select from './Controls/Select.vue';
 import Icon from './Icon.vue';
 import Popover from './Popover.vue';
 import { QueryFilter } from 'utils/db/types';
+import { t } from 'fyo';
 
 const conditions = [
-  { label: '=', value: '=' },
-  { label: '!=', value: '!=' },
-  { label: 'like', value: 'like' },
-  { label: 'not like', value: 'not like' },
-  { label: '>', value: '>' },
-  { label: '<', value: '<' },
-  { label: 'is null', value: 'is null' },
-  { label: 'is not null', value: 'is not null' },
+  { label: t`Is`, value: '=' },
+  { label: t`Is Not`, value: '!=' },
+  { label: t`Contains`, value: 'like' },
+  { label: t`Does Not Contain`, value: 'not like' },
+  { label: t`Greater Than`, value: '>' },
+  { label: t`Less Than`, value: '<' },
+  { label: t`Is Empty`, value: 'is null' },
+  { label: t`Is Not Empty`, value: 'is not null' },
 ] as const;
 
 type Condition = typeof conditions[number]['value'];
@@ -397,10 +400,6 @@ export default defineComponent({
       const filters: Record<string, [Condition, Filter['value']]> = {};
 
       for (const { condition, value, fieldname } of this.newFilters) {
-        console.log('condition is:', condition);
-        console.log('value is:', value);
-        console.log('fieldname is:', fieldname);
-
         if (value === '' && condition) {
           continue;
         }

From f11e4c81405cb3f25f20424570b83d4aed205751 Mon Sep 17 00:00:00 2001
From: suhailanzar <suhailanzar00@gmail.com>
Date: Fri, 27 Jun 2025 10:58:21 +0530
Subject: [PATCH 4/4] fix: update condition handlings in Filter

---
 src/components/FilterDropdown.vue | 62 +++++++++++++++++++------------
 src/pages/ListView/List.vue       | 14 ++-----
 src/pages/ListView/ListView.vue   |  4 --
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index bff9132f..9a8c6ff6 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -90,7 +90,7 @@
                     placeholder: t`Condition`,
                     fieldname: 'condition',
                     fieldtype: 'Select',
-                    options: conditions,
+                    options: conditionsForDropdown,
                   }"
                   :value="filter.condition"
                   :close-drop-down="false"
@@ -215,7 +215,7 @@ const conditions = [
   { label: t`Is Not Empty`, value: 'is not null' },
 ] as const;
 
-type Condition = typeof conditions[number]['value'];
+type Condition = typeof conditions[number]['label'];
 
 type Filter = {
   fieldname: string;
@@ -224,13 +224,6 @@ type Filter = {
   implicit: boolean;
 };
 
-type PopoverRef = {
-  close?: () => void;
-  hide?: () => void;
-  togglePopover?: (state: boolean) => void;
-  $el?: HTMLElement;
-};
-
 export default defineComponent({
   name: 'FilterDropdown',
   components: {
@@ -248,9 +241,6 @@ export default defineComponent({
       newFilters: [] as Filter[],
     };
   },
-  created() {
-    this.addNewFilter();
-  },
   computed: {
     fields(): Field[] {
       const excludedFieldsTypes: string[] = [
@@ -308,6 +298,12 @@ export default defineComponent({
     conditions(): { label: string; value: string }[] {
       return [...conditions];
     },
+    conditionsForDropdown(): { label: string; value: string }[] {
+      return conditions.map((c) => ({
+        label: c.label,
+        value: c.label,
+      }));
+    },
     explicitFilters(): Filter[] {
       return this.filters.filter((f) => !f.implicit);
     },
@@ -325,6 +321,16 @@ export default defineComponent({
 
   methods: {
     getRandomString,
+    getConditionLabel(value: string): string {
+      const condition = conditions.find((c) => c.value === value);
+      return condition ? condition.label : value;
+    },
+
+    getConditionValue(label: string): string {
+      const condition = conditions.find((c) => c.label === label);
+      return condition ? condition.value : label;
+    },
+
     addNewFilter(): void {
       const df = this.fields[0];
       if (!df) {
@@ -335,22 +341,23 @@ export default defineComponent({
     },
     addFilter(
       fieldname: string,
-      condition: Condition,
+      condition: string,
       value: Filter['value'],
       implicit?: boolean
     ): void {
-      const newFilter = { fieldname, condition, value, implicit: !!implicit };
+      const displayCondition = this.getConditionLabel(condition);
+      const newFilter = {
+        fieldname,
+        condition: displayCondition,
+        value,
+        implicit: !!implicit,
+      };
       this.filters.push(newFilter);
       this.newFilters.push(newFilter);
     },
 
     applyFilters() {
       this.emitFilterChange();
-      const popover = this.$refs.filterPopover as PopoverRef;
-      if (popover?.close) popover.close();
-      else if (popover?.hide) popover.hide();
-      else if (popover?.togglePopover) popover.togglePopover(false);
-      else if (popover?.$el) popover.$el.click();
     },
 
     removeFilter(index: number): void {
@@ -370,7 +377,14 @@ export default defineComponent({
       key: K,
       value: Filter[K]
     ) {
-      this.newFilters![index][key] = value;
+      if (key === 'condition') {
+        const displayCondition = this.getConditionLabel(value as string);
+        this.newFilters![index][key] = displayCondition as Filter[K];
+        this.filters[index][key] = displayCondition as Filter[K];
+      } else {
+        this.newFilters![index][key] = value;
+        this.filters[index][key] = value;
+      }
     },
 
     setFilter(filters: QueryFilter, implicit?: boolean): void {
@@ -400,14 +414,16 @@ export default defineComponent({
       const filters: Record<string, [Condition, Filter['value']]> = {};
 
       for (const { condition, value, fieldname } of this.newFilters) {
-        if (value === '' && condition) {
+        if (value === '' || value === null || value === undefined) {
           continue;
         }
 
+        const sqlCondition = this.getConditionValue(condition);
+
         if (fieldname === 'numberSeries') {
-          filters['name'] = [condition, value];
+          filters['name'] = [sqlCondition, value];
         } else {
-          filters[fieldname] = [condition, value];
+          filters[fieldname] = [sqlCondition, value];
         }
       }
 
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index f3c33a61..4cda3434 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -116,7 +116,7 @@ import Row from 'src/components/Row.vue';
 import { fyo } from 'src/initFyo';
 import { isNumeric } from 'src/utils';
 import { QueryFilter } from 'utils/db/types';
-import { PropType, defineComponent } from 'vue';
+import { PropType, defineComponent, toRaw } from 'vue';
 import ListCell from './ListCell.vue';
 
 export default defineComponent({
@@ -215,10 +215,8 @@ export default defineComponent({
       fyo.doc.observer.on(`rename:${this.schemaName}`, listener);
     },
     async updateData(filters?: Record<string, unknown>) {
-      if (!filters) {
-        filters = { ...this.filters };
-      }
-      filters = cloneDeep(filters);
+      const baseFilters = cloneDeep(toRaw(this.filters));
+      filters = cloneDeep({ ...baseFilters, ...filters });
 
       let statusFilter: [string, string] | undefined;
 
@@ -226,14 +224,10 @@ export default defineComponent({
         statusFilter = filters['status'] as [string, string];
       }
 
-      if ('referenceType' in filters) {
-        statusFilter = filters['referenceType'] as [string, string];
-      }
-
       const isStatusFilter =
         Array.isArray(statusFilter) && statusFilter[0] === 'like';
       if (isStatusFilter) {
-        delete filters['status']; // remove status from query filters
+        delete filters['status'];
       }
 
       const orderBy = ['created'];
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 11ce0010..b1870d97 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -115,10 +115,6 @@ export default defineComponent({
     },
   },
   activated() {
-    if (typeof this.filters === 'object') {
-      this.filterDropdown?.setFilter(this.filters, true);
-    }
-
     this.listConfig = getListConfig(this.schemaName);
     docsPathRef.value =
       docsPathMap[this.schemaName] ?? docsPathMap.Entries ?? '';