Merge remote-tracking branch 'upstream/main' into fix-get-plugins-dis…

…t-from-repo-on-build
elastic · Nov 17, 2023 · 56736c5 · 56736c5
2 parents 16cfcb4 + 52fdd7f
commit 56736c5
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 17 deletions.
diff --git a/x-pack/plugins/security_solution/public/assistant/helpers.tsx b/x-pack/plugins/security_solution/public/assistant/helpers.tsx
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import { EuiIcon, EuiToolTip } from '@elastic/eui';
+import { EuiIcon } from '@elastic/eui';
 import { analyzeMarkdown } from '@kbn/elastic-assistant';
 import type { Conversation, CodeBlockDetails } from '@kbn/elastic-assistant';
 import React from 'react';
 
 import type { TimelineEventsDetailsItem } from '../../common/search_strategy';
 import type { Rule } from '../detection_engine/rule_management/logic';
 import { SendToTimelineButton } from './send_to_timeline';
-import { INVESTIGATE_IN_TIMELINE } from '../actions/add_to_timeline/constants';
 
 export const LOCAL_STORAGE_KEY = `securityAssistant`;
 
@@ -125,9 +124,7 @@ export const augmentMessageCodeBlocks = (
             ]}
             keepDataView={true}
           >
-            <EuiToolTip position="right" content={INVESTIGATE_IN_TIMELINE}>
-              <EuiIcon type="timeline" />
-            </EuiToolTip>
+            <EuiIcon type="timeline" />
           </SendToTimelineButton>
         ) : null,
       };

diff --git a/x-pack/plugins/security_solution/public/assistant/send_to_timeline/index.tsx b/x-pack/plugins/security_solution/public/assistant/send_to_timeline/index.tsx
@@ -6,10 +6,11 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import { EuiButton, EuiButtonEmpty } from '@elastic/eui';
+import { EuiButton, EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
 import { useDispatch } from 'react-redux';
 
+import { useAssistantContext } from '@kbn/elastic-assistant';
 import { useDeepEqualSelector } from '../../common/hooks/use_selector';
 import { sourcererSelectors } from '../../common/store';
 import { sourcererActions } from '../../common/store/actions';
@@ -19,7 +20,10 @@ import type { TimeRange } from '../../common/store/inputs/model';
 import { SourcererScopeName } from '../../common/store/sourcerer/model';
 import { TimelineTabs, TimelineId } from '../../../common/types/timeline';
 import { TimelineType } from '../../../common/api/timeline';
-import { ACTION_INVESTIGATE_IN_TIMELINE } from '../../detections/components/alerts_table/translations';
+import {
+  ACTION_CANNOT_INVESTIGATE_IN_TIMELINE,
+  ACTION_INVESTIGATE_IN_TIMELINE,
+} from '../../detections/components/alerts_table/translations';
 import type { DataProvider } from '../../timelines/components/timeline/data_providers/data_provider';
 import { useCreateTimeline } from '../../timelines/components/timeline/properties/use_create_timeline';
 import {
@@ -31,6 +35,7 @@ import {
   updateEqlOptions,
 } from '../../timelines/store/timeline/actions';
 import { useDiscoverInTimelineContext } from '../../common/components/discover_in_timeline/use_discover_in_timeline_context';
+import { useShowTimeline } from '../../common/utils/timeline/use_show_timeline';
 
 export interface SendToTimelineButtonProps {
   asEmptyButton: boolean;
@@ -51,7 +56,8 @@ export const SendToTimelineButton: React.FunctionComponent<SendToTimelineButtonP
   ...rest
 }) => {
   const dispatch = useDispatch();
-
+  const { showAssistantOverlay } = useAssistantContext();
+  const [isTimelineBottomBarVisible] = useShowTimeline();
   const { discoverStateContainer } = useDiscoverInTimelineContext();
 
   const getDataViewsSelector = useMemo(
@@ -71,13 +77,15 @@ export const SendToTimelineButton: React.FunctionComponent<SendToTimelineButtonP
   });
 
   const configureAndOpenTimeline = useCallback(() => {
+    // Hide the assistant overlay so timeline can be seen (noop if using assistant in timeline)
+    showAssistantOverlay({ showOverlay: false });
+
     if (dataProviders || filters) {
       // If esql, don't reset filters or mess with dataview & time range
       if (dataProviders?.[0]?.queryType === 'esql' || dataProviders?.[0]?.queryType === 'sql') {
         discoverStateContainer.current?.appState.update({
           query: {
-            query: dataProviders[0].kqlQuery,
-            language: 'esql',
+            esql: dataProviders[0].kqlQuery,
           },
         });
 
@@ -200,6 +208,7 @@ export const SendToTimelineButton: React.FunctionComponent<SendToTimelineButtonP
       dispatch(inputsActions.removeLinkTo([InputsModelId.timeline, InputsModelId.global]));
     }
   }, [
+    showAssistantOverlay,
     dataProviders,
     filters,
     timeRange,
@@ -211,23 +220,35 @@ export const SendToTimelineButton: React.FunctionComponent<SendToTimelineButtonP
     signalIndexName,
   ]);
 
+  // As we work around timeline visibility issues, we will disable the button if timeline isn't available
+  const toolTipText = isTimelineBottomBarVisible
+    ? ACTION_INVESTIGATE_IN_TIMELINE
+    : ACTION_CANNOT_INVESTIGATE_IN_TIMELINE;
+  const isDisabled = !isTimelineBottomBarVisible;
+
   return asEmptyButton ? (
     <EuiButtonEmpty
-      aria-label={ACTION_INVESTIGATE_IN_TIMELINE}
+      aria-label={toolTipText}
       onClick={configureAndOpenTimeline}
+      isDisabled={isDisabled}
       color="text"
       flush="both"
       size="xs"
     >
-      {children}
+      <EuiToolTip position="right" content={toolTipText}>
+        <>{children}</>
+      </EuiToolTip>
     </EuiButtonEmpty>
   ) : (
     <EuiButton
-      aria-label={ACTION_INVESTIGATE_IN_TIMELINE}
+      aria-label={toolTipText}
+      isDisabled={isDisabled}
       onClick={configureAndOpenTimeline}
       {...rest}
     >
-      {children}
+      <EuiToolTip position="right" content={toolTipText}>
+        <>{children}</>
+      </EuiToolTip>
     </EuiButton>
   );
 };

diff --git a/...lution/public/common/components/discover_in_timeline/use_discover_in_timeline_actions.tsx b/...lution/public/common/components/discover_in_timeline/use_discover_in_timeline_actions.tsx
@@ -134,7 +134,7 @@ export const useDiscoverInTimelineActions = (
    * */
   const resetDiscoverAppState = useCallback(async () => {
     const defaultDiscoverAppState = await getDefaultDiscoverAppState();
-    discoverStateContainer.current?.appState.set(defaultDiscoverAppState);
+    discoverStateContainer.current?.appState.replaceUrlState(defaultDiscoverAppState);
     discoverStateContainer.current?.globalState.set({
       ...discoverStateContainer.current?.globalState.get(),
       time: defaultDiscoverTimeRange,

diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
@@ -137,6 +137,13 @@ export const ACTION_INVESTIGATE_IN_TIMELINE = i18n.translate(
   }
 );
 
+export const ACTION_CANNOT_INVESTIGATE_IN_TIMELINE = i18n.translate(
+  'xpack.securitySolution.detectionEngine.alerts.actions.cannotInvestigateInTimelineTitle',
+  {
+    defaultMessage: 'Please navigate to a page with timeline to investigate',
+  }
+);
+
 export const ACTION_INVESTIGATE_IN_TIMELINE_ARIA_LABEL = i18n.translate(
   'xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineAriaLabel',
   {

diff --git a/...plugins/security_solution/public/timelines/components/timeline/esql_tab_content/index.tsx b/...plugins/security_solution/public/timelines/components/timeline/esql_tab_content/index.tsx
@@ -238,8 +238,25 @@ export const DiscoverTabContent: FC<DiscoverTabContentProps> = ({ timelineId })
       const finalAppState =
         savedSearchAppState?.appState ?? discoverAppState ?? defaultDiscoverAppState;
 
-      stateContainer.appState.set(finalAppState);
-      await stateContainer.appState.replaceUrlState(finalAppState);
+      const urlAppState = stateContainer.appState.isEmptyURL()
+        ? undefined
+        : stateContainer.appState.getState();
+
+      const hasESQLURlState = urlAppState?.query && 'esql' in urlAppState.query;
+
+      /*
+       * Url state should NOT apply if there is already a saved search being loaded
+       * */
+      const shouldApplyESQLUrlState = !savedSearchAppState?.appState && hasESQLURlState;
+
+      if (!shouldApplyESQLUrlState) {
+        /*
+         * If url state applies, it should be a no-op and there is no need to update the state container.
+         * Discover should automatically pick up url state
+         * */
+        stateContainer.appState.set(finalAppState);
+        await stateContainer.appState.replaceUrlState(finalAppState);
+      }
 
       const unsubscribeState = stateContainer.appState.state$.subscribe({
         next: setDiscoverAppState,