From 6302ff4df4df02600534fcf68b6e86093373ce87 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 20 Feb 2023 10:35:57 +0100
Subject: [PATCH] fix(ui) - search filters update

---
 .../Filters/FilterSource/FilterSource.tsx     |  6 ----
 .../shared/SessionSearch/SessionSearch.tsx    | 28 ++++++++++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx b/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx
index eed1e6e1d..08c93d8df 100644
--- a/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx
+++ b/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx
@@ -1,7 +1,6 @@
 import { FilterType } from 'App/types/filter/filterType';
 import React, { useState, useEffect } from 'react';
 import stl from './FilterSource.module.css';
-import { debounce } from 'App/utils';
 import cn from 'classnames';
 
 interface Props {
@@ -11,16 +10,11 @@ interface Props {
 function FilterSource(props: Props) {
     const { filter } = props;
     const [value, setValue] = useState(filter.source[0] || '');
-    const debounceUpdate: any = React.useCallback(debounce(props.onUpdate, 1000), [props.onUpdate]);
 
     useEffect(() => {
         setValue(filter.source[0] || '');
     }, [filter]);
 
-    useEffect(() => {
-        debounceUpdate({ ...filter, source: [value] });
-    }, [value]);
-
     const write = ({ target: { value, name } }: any) => setValue(value);
 
     const renderFiled = () => {
diff --git a/frontend/app/components/shared/SessionSearch/SessionSearch.tsx b/frontend/app/components/shared/SessionSearch/SessionSearch.tsx
index 48856d929..84fb770a8 100644
--- a/frontend/app/components/shared/SessionSearch/SessionSearch.tsx
+++ b/frontend/app/components/shared/SessionSearch/SessionSearch.tsx
@@ -1,24 +1,32 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import FilterList from 'Shared/Filters/FilterList';
 import FilterSelection from 'Shared/Filters/FilterSelection';
 import SaveFilterButton from 'Shared/SaveFilterButton';
 import { connect } from 'react-redux';
 import { Button } from 'UI';
-import { edit, addFilter } from 'Duck/search';
+import { edit, addFilter, fetchSessions, updateFilter } from 'Duck/search';
 import SessionSearchQueryParamHandler from 'Shared/SessionSearchQueryParamHandler';
 
+import { debounce } from 'App/utils';
+
+let debounceFetch: any = () => {}
+
 interface Props {
   appliedFilter: any;
   edit: typeof edit;
   addFilter: typeof addFilter;
   saveRequestPayloads: boolean;
   metaLoading?: boolean
+  fetchSessions: typeof fetchSessions;
+  updateFilter: typeof updateFilter;
 }
 function SessionSearch(props: Props) {
   const { appliedFilter, saveRequestPayloads = false, metaLoading } = props;
   const hasEvents = appliedFilter.filters.filter((i: any) => i.isEvent).size > 0;
   const hasFilters = appliedFilter.filters.filter((i: any) => !i.isEvent).size > 0;
-
+  useEffect(() => {
+    debounceFetch = debounce(() => props.fetchSessions(), 500);
+  }, [])
 
   const onAddFilter = (filter: any) => {
     props.addFilter(filter);
@@ -33,10 +41,12 @@ function SessionSearch(props: Props) {
       }
     });
 
-    props.edit({
+    props.updateFilter({
       ...appliedFilter,
       filters: newFilters,
     });
+
+    debounceFetch()
   };
 
   const onRemoveFilter = (filterIndex: any) => {
@@ -44,15 +54,19 @@ function SessionSearch(props: Props) {
       return i !== filterIndex;
     });
 
-    props.edit({
+    props.updateFilter({
       filters: newFilters,
     });
+
+    debounceFetch()
   };
 
   const onChangeEventsOrder = (e: any, { value }: any) => {
-    props.edit({
+    props.updateFilter({
       eventsOrder: value,
     });
+
+    debounceFetch()
   };
 
   return !metaLoading && (
@@ -102,5 +116,5 @@ export default connect(
     appliedFilter: state.getIn(['search', 'instance']),
     metaLoading: state.getIn(['customFields', 'fetchRequestActive', 'loading'])
   }),
-  { edit, addFilter }
+  { edit, addFilter, fetchSessions, updateFilter }
 )(SessionSearch);