From bd28bb837a930657d5bc3afa79c26fe0f534e147 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 2 Feb 2023 14:34:53 +0800
Subject: [PATCH] feat(nc-gui): display filter operator text conditionally

---
 .../smartsheet/toolbar/ColumnFilter.vue       |  4 +---
 packages/nc-gui/utils/filterUtils.ts          | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 54456dcf3c..58b90d1d2f 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -215,7 +215,6 @@ defineExpose({
                 {{ op.text }}
               </a-select-option>
             </a-select>
-
             <LazySmartsheetToolbarFieldListAutoCompleteDropdown
               :key="`${i}_6`"
               v-model="filter.fk_column_id"
@@ -225,7 +224,6 @@ defineExpose({
               @click.stop
               @change="selectFilterField(filter, i)"
             />
-
             <a-select
               v-model:value="filter.comparison_op"
               :dropdown-match-select-width="false"
@@ -238,7 +236,7 @@ defineExpose({
               dropdown-class-name="nc-dropdown-filter-comp-op"
               @change="filterUpdateCondition(filter, i)"
             >
-              <template v-for="compOp of comparisonOpList" :key="compOp.value">
+              <template v-for="compOp of comparisonOpList(getColumn(filter).uidt)" :key="compOp.value">
                 <a-select-option v-if="isComparisonOpAllowed(filter, compOp)" :value="compOp.value">
                   {{ compOp.text }}
                 </a-select-option>
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index 080d4a9c5e..f28a01c2d8 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -1,14 +1,24 @@
 import { UITypes } from 'nocodb-sdk'
 
-const numericUITypes = [UITypes.Duration, UITypes.Currency, UITypes.Percent, UITypes.Number, UITypes.Rating, UITypes.Rollup]
+const numericUITypes: UITypes[] = [
+  UITypes.Duration,
+  UITypes.Currency,
+  UITypes.Percent,
+  UITypes.Number,
+  UITypes.Decimal,
+  UITypes.Rating,
+  UITypes.Rollup,
+]
 
-export const comparisonOpList: {
+export const comparisonOpList = (
+  fieldUiType: UITypes,
+): {
   text: string
   value: string
   ignoreVal?: boolean
   includedTypes?: UITypes[]
   excludedTypes?: UITypes[]
-}[] = [
+}[] => [
   {
     text: 'is checked',
     value: 'checked',
@@ -22,12 +32,12 @@ export const comparisonOpList: {
     includedTypes: [UITypes.Checkbox],
   },
   {
-    text: 'is equal',
+    text: numericUITypes.includes(fieldUiType) ? '=' : 'is equal',
     value: 'eq',
     excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.Attachment],
   },
   {
-    text: 'is not equal',
+    text: numericUITypes.includes(fieldUiType) ? '!=' : 'is not equal',
     value: 'neq',
     excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.Attachment],
   },