chore: update connector label as connector filter applied

juspay · Oct 9, 2024 · 8b04f85 · 8b04f85
1 parent 3b0954e
commit 8b04f85
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 28 deletions.
diff --git a/src/screens/Disputes/DisputesUtils.res b/src/screens/Disputes/DisputesUtils.res
@@ -145,6 +145,13 @@ let initialFixedFilter = () => [
   ),
 ]
 
+let getValueFromFilterType = (filter: filter) => {
+  switch filter {
+  | #connector_label => "merchant_connector_id"
+  | _ => (filter :> string)
+  }
+}
+
 let getConditionalFilter = (key, dict, filterValues) => {
   switch key->getFilterTypeFromString {
   | #connector_label =>
@@ -193,14 +200,20 @@ let itemToObjMapper = dict => {
   }
 }
 
-let initialFilters = (json, filtervalues) => {
+let initialFilters = (json, filtervalues, setfilterKeys, filterKeys) => {
   let connectorFilter = filtervalues->getArrayFromDict("connector", [])->getStrArrayFromJsonArray
 
   let filterDict = json->getDictFromJsonObject
   let arr = filterDict->Dict.keysToArray->Array.filter(item => item != "currency")
 
   if connectorFilter->Array.length !== 0 {
-    arr->Array.push("connector_label")
+    arr->Array.push((#connector_label: filter :> string))
+
+    if !(filterKeys->Array.includes(getValueFromFilterType(#connector_label))) {
+      filterKeys->Array.push(getValueFromFilterType(#connector_label))
+    }
+
+    setfilterKeys(_ => filterKeys)
   }
 
   let filterArr = filterDict->itemToObjMapper
@@ -222,15 +235,10 @@ let initialFilters = (json, filtervalues) => {
     | _ => values->FilterSelectBox.makeOptions
     }
 
-    let name = switch key->getFilterTypeFromString {
-    | #connector_label => "merchant_connector_id"
-    | _ => key
-    }
-
     {
       field: FormRenderer.makeFieldInfo(
         ~label=key,
-        ~name,
+        ~name=getValueFromFilterType(key->getFilterTypeFromString),
         ~customInput=InputFields.filterMultiSelectInput(
           ~options,
           ~buttonText=title,

diff --git a/src/screens/HSwitchRemoteFilter.res b/src/screens/HSwitchRemoteFilter.res
@@ -133,7 +133,7 @@ module RemoteTableFilters = {
     let getURL = useGetURL()
     let {userInfo: transactionEntity} = React.useContext(UserInfoProvider.defaultContext)
 
-    let {filterValue, updateExistingKeys, filterValueJson, reset} =
+    let {filterValue, updateExistingKeys, filterValueJson, reset, setfilterKeys, filterKeys} =
       FilterContext.filterContext->React.useContext
     let defaultFilters = {""->JSON.Encode.string}
     let showToast = ToastState.useShowToast()
@@ -233,7 +233,7 @@ module RemoteTableFilters = {
       ->Dict.fromArray
 
     let remoteFilters = React.useMemo(() => {
-      filterData->initialFilters(getAllFilter)
+      filterData->initialFilters(getAllFilter, setfilterKeys, filterKeys)
     }, [getAllFilter])
 
     let initialDisplayFilters =

diff --git a/src/screens/Order/OrderUIUtils.res b/src/screens/Order/OrderUIUtils.res
@@ -182,6 +182,13 @@ let filterByData = (txnArr, value) => {
   })
 }
 
+let getValueFromFilterType = (filter: filter) => {
+  switch filter {
+  | #connector_label => "merchant_connector_id"
+  | _ => (filter :> string)
+  }
+}
+
 let getConditionalFilter = (key, dict, filterValues) => {
   open LogicUtils
 
@@ -265,7 +272,7 @@ let itemToObjMapper = dict => {
   }
 }
 
-let initialFilters = (json, filtervalues) => {
+let initialFilters = (json, filtervalues, setfilterKeys, filterKeys) => {
   open LogicUtils
 
   let connectorFilter = filtervalues->getArrayFromDict("connector", [])->getStrArrayFromJsonArray
@@ -275,9 +282,15 @@ let initialFilters = (json, filtervalues) => {
   let arr = filterDict->Dict.keysToArray
 
   if connectorFilter->Array.length !== 0 {
-    arr->Array.push("connector_label")
+    arr->Array.push((#connector_label: filter :> string))
+
+    if !(filterKeys->Array.includes(getValueFromFilterType(#connector_label))) {
+      filterKeys->Array.push(getValueFromFilterType(#connector_label))
+    }
+
+    setfilterKeys(_ => filterKeys)
   }
-  arr->Array.push("payment_method_type")
+  arr->Array.push((#payment_method_type: filter :> string))
 
   arr->Array.map((key): EntityType.initialFilters<'t> => {
     let values = switch key->getFilterTypeFromString {
@@ -308,15 +321,10 @@ let initialFilters = (json, filtervalues) => {
     | _ => values->makeOptions
     }
 
-    let name = switch key->getFilterTypeFromString {
-    | #connector_label => "merchant_connector_id"
-    | _ => key
-    }
-
     {
       field: FormRenderer.makeFieldInfo(
         ~label=key,
-        ~name,
+        ~name=getValueFromFilterType(key->getFilterTypeFromString),
         ~customInput=InputFields.filterMultiSelectInput(
           ~options,
           ~buttonText=title,

diff --git a/src/screens/Payouts/PayoutsUtils.res b/src/screens/Payouts/PayoutsUtils.res
@@ -130,7 +130,7 @@ let getOptionsForPayoutFilters = (dict, filterValues) => {
   newArr
 }
 
-let initialFilters = (json, _) => {
+let initialFilters = (json, _, _, _) => {
   open LogicUtils
 
   let dropdownValue =

diff --git a/src/screens/Refunds/RefundUtils.res b/src/screens/Refunds/RefundUtils.res
@@ -137,6 +137,13 @@ let initialFixedFilter = () => [
   ),
 ]
 
+let getValueFromFilterType = (filter: filter) => {
+  switch filter {
+  | #connector_label => "merchant_connector_id"
+  | _ => (filter :> string)
+  }
+}
+
 let getConditionalFilter = (key, dict, filterValues) => {
   open LogicUtils
 
@@ -185,7 +192,7 @@ let itemToObjMapper = dict => {
   }
 }
 
-let initialFilters = (json, filtervalues) => {
+let initialFilters = (json, filtervalues, setfilterKeys, filterKeys) => {
   open LogicUtils
 
   let connectorFilter = filtervalues->getArrayFromDict("connector", [])->getStrArrayFromJsonArray
@@ -194,7 +201,13 @@ let initialFilters = (json, filtervalues) => {
   let arr = filterDict->Dict.keysToArray->Array.filterWithIndex((_item, index) => index <= 2)
 
   if connectorFilter->Array.length !== 0 {
-    arr->Array.push("connector_label")
+    arr->Array.push((#connector_label: filter :> string))
+
+    if !(filterKeys->Array.includes(getValueFromFilterType(#connector_label))) {
+      filterKeys->Array.push(getValueFromFilterType(#connector_label))
+    }
+
+    setfilterKeys(_ => filterKeys)
   }
 
   let filterArr = filterDict->itemToObjMapper
@@ -215,15 +228,10 @@ let initialFilters = (json, filtervalues) => {
     | _ => values->FilterSelectBox.makeOptions
     }
 
-    let name = switch key->getFilterTypeFromString {
-    | #connector_label => "merchant_connector_id"
-    | _ => key
-    }
-
     {
       field: FormRenderer.makeFieldInfo(
         ~label=key,
-        ~name,
+        ~name=getValueFromFilterType(key->getFilterTypeFromString),
         ~customInput=InputFields.filterMultiSelectInput(
           ~options,
           ~buttonText=title,