From 782d6b313e2c47ec00c9217106eb1bdc2fdbcdff Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 8 Feb 2022 16:59:57 +0100
Subject: [PATCH] feat(ui) - custom metrics - series name on delete

---
 .../CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx      | 4 ++++
 .../app/components/shared/Filters/FilterList/FilterList.tsx   | 2 +-
 frontend/app/duck/customMetrics.js                            | 4 ++--
 frontend/app/types/customMetric.js                            | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx b/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
index 9ad4281c0..cba21a33b 100644
--- a/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
+++ b/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
@@ -24,6 +24,10 @@ function SeriesName(props: Props) {
       ref.current.focus()
     }
   }, [editing])
+
+  useEffect(() => {
+    setName(props.name)
+  }, [props.name])
   
   // const { name } = props;
   return (
diff --git a/frontend/app/components/shared/Filters/FilterList/FilterList.tsx b/frontend/app/components/shared/Filters/FilterList/FilterList.tsx
index 981917042..e8472ca51 100644
--- a/frontend/app/components/shared/Filters/FilterList/FilterList.tsx
+++ b/frontend/app/components/shared/Filters/FilterList/FilterList.tsx
@@ -47,9 +47,9 @@ function FilterList(props: Props) {
                 onSelect={props.onChangeEventsOrder}
                 value={{ value: filter.eventsOrder }}
                 list={ [
+                  { name: 'THEN', value: 'then' },
                   { name: 'AND', value: 'and' },
                   { name: 'OR', value: 'or' },
-                  { name: 'THEN', value: 'then' },
                 ]}
               />
             </div>
diff --git a/frontend/app/duck/customMetrics.js b/frontend/app/duck/customMetrics.js
index c50d72d68..f27429130 100644
--- a/frontend/app/duck/customMetrics.js
+++ b/frontend/app/duck/customMetrics.js
@@ -44,7 +44,7 @@ const defaultInstance = CustomMetric({
   series: List([
     {
       name: 'Series 1',
-      filter: new Filter({ filters: List(), eventsOrder: 'and' }),
+      filter: new Filter({ filters: List(), eventsOrder: 'then' }),
     },
   ])
 })
@@ -159,7 +159,7 @@ export const addSeries = (series = null) => (dispatch, getState) => {
   const seriesIndex = instance.series.size;
   const newSeries = series || {
     name: `Series ${seriesIndex + 1}`,
-    filter: new Filter({ filters: [], eventsOrder: 'and' }),
+    filter: new Filter({ filters: [], eventsOrder: 'then' }),
   };
 
   dispatch({
diff --git a/frontend/app/types/customMetric.js b/frontend/app/types/customMetric.js
index 0218b8f93..94d6cd5c1 100644
--- a/frontend/app/types/customMetric.js
+++ b/frontend/app/types/customMetric.js
@@ -2,7 +2,7 @@ import Record from 'Types/Record';
 import { List } from 'immutable';
 import Filter from 'Types/filter';
 import { validateName } from 'App/validate';
-import Period, { LAST_24_HOURS, LAST_30_MINUTES, YESTERDAY, LAST_7_DAYS } from 'Types/app/period';
+import { LAST_7_DAYS } from 'Types/app/period';
 import { filterMap } from 'Duck/search';
 
 export const FilterSeries = Record({