From a9b36fc7eadddc484c856a6bb66803bbc9cea40b Mon Sep 17 00:00:00 2001
From: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Date: Tue, 24 Oct 2023 13:04:03 -0700
Subject: [PATCH] Fix events home table and toast life time (#1170)

* Fix 2.11 UX issues

Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>

* Change toast time life

Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>

* update snapshots

Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>

---------

Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
---
 .../components/event_analytics/explorer/explorer.tsx |  4 ++--
 .../__snapshots__/saved_query_table.test.tsx.snap    |  8 ++++----
 .../event_analytics/home/saved_objects_table.tsx     |  2 +-
 public/components/event_analytics/index.tsx          | 12 ++++++++++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/public/components/event_analytics/explorer/explorer.tsx b/public/components/event_analytics/explorer/explorer.tsx
index 5053c38eb..f87ff5769 100644
--- a/public/components/event_analytics/explorer/explorer.tsx
+++ b/public/components/event_analytics/explorer/explorer.tsx
@@ -826,7 +826,7 @@ export const Explorer = ({
     setLiveTailName(name);
     setLiveTailTabId((curSelectedTabId.current as unknown) as string);
     setIsLiveTailOn(true);
-    setToast('Live tail On', 'success');
+    setToast('Live tail On', 'success', '', 'right', 2000);
     setIsLiveTailPopoverOpen(false);
     setLiveTimestamp(
       dateMath.parse(endingTime, { roundUp: true })?.utc().format(DATE_PICKER_FORMAT) || ''
@@ -851,7 +851,7 @@ export const Explorer = ({
     setIsLiveTailOn(false);
     setLiveHits(0);
     setIsLiveTailPopoverOpen(false);
-    if (isLiveTailOnRef.current) setToast('Live tail Off', 'danger');
+    if (isLiveTailOnRef.current) setToast('Live tail Off', 'danger', '', 'right', 2000);
   };
 
   useEffect(() => {
diff --git a/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap b/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap
index c8cb71327..5cd192bb4 100644
--- a/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap
+++ b/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap
@@ -144,7 +144,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
         "filters": Array [
           Object {
             "field": "type",
-            "multiSelect": false,
+            "multiSelect": "or",
             "name": "Type",
             "options": Array [
               Object {
@@ -186,7 +186,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
           Array [
             Object {
               "field": "type",
-              "multiSelect": false,
+              "multiSelect": "or",
               "name": "Type",
               "options": Array [
                 Object {
@@ -334,7 +334,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                     Array [
                       Object {
                         "field": "type",
-                        "multiSelect": false,
+                        "multiSelect": "or",
                         "name": "Type",
                         "options": Array [
                           Object {
@@ -386,7 +386,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                         config={
                           Object {
                             "field": "type",
-                            "multiSelect": false,
+                            "multiSelect": "or",
                             "name": "Type",
                             "options": Array [
                               Object {
diff --git a/public/components/event_analytics/home/saved_objects_table.tsx b/public/components/event_analytics/home/saved_objects_table.tsx
index fbf761d90..79c76c4ec 100644
--- a/public/components/event_analytics/home/saved_objects_table.tsx
+++ b/public/components/event_analytics/home/saved_objects_table.tsx
@@ -116,7 +116,7 @@ export function SavedQueryTable({
         type: 'field_value_selection',
         field: 'type',
         name: 'Type',
-        multiSelect: false,
+        multiSelect: 'or',
         options: FILTER_OPTIONS.map((i) => ({
           value: i,
           name: i,
diff --git a/public/components/event_analytics/index.tsx b/public/components/event_analytics/index.tsx
index 815876599..585bfead9 100644
--- a/public/components/event_analytics/index.tsx
+++ b/public/components/event_analytics/index.tsx
@@ -31,15 +31,23 @@ export const EventAnalytics = ({
   ...props
 }: EventAnalyticsProps) => {
   const [toasts, setToasts] = useState<Toast[]>([]);
+  const [toastLifeTime, setToastLifeTime] = useState(6000);
 
   const eventAnalyticsBreadcrumb = {
     text: 'Logs',
     href: '#/',
   };
 
-  const setToast = (title: string, color = 'success', text?: ReactChild, side?: string) => {
+  const setToast = (
+    title: string,
+    color = 'success',
+    text?: ReactChild,
+    side?: string,
+    toastLifeTimeMs?: number
+  ) => {
     if (!text) text = '';
     setToasts([...toasts, { id: new Date().toISOString(), title, text, color } as Toast]);
+    if (toastLifeTimeMs) setToastLifeTime(toastLifeTimeMs);
   };
 
   return (
@@ -49,7 +57,7 @@ export const EventAnalytics = ({
         dismissToast={(removedToast) => {
           setToasts(toasts.filter((toast) => toast.id !== removedToast.id));
         }}
-        toastLifeTimeMs={6000}
+        toastLifeTimeMs={toastLifeTime}
       />
       <HashRouter>
         <Switch>