[Security Solution] Fixing ESQL Timeline tab content availability and…

… variables naming (elastic#168421) This PR revert the changes made [here](elastic#168144) and changing the variables naming in the code to avoid the future confusion --------- Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Michael Olorunnisola <[email protected]> Co-authored-by: Jatin Kathuria <[email protected]>
rshen91 · Oct 12, 2023 · 7f6b201 · 7f6b201
1 parent f5caf78
commit 7f6b201
Show file tree

Hide file tree

Showing 33 changed files with 73 additions and 85 deletions.
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -103,12 +103,6 @@ export const allowedExperimentalValues = Object.freeze({
    * Enables experimental Entity Analytics HTTP endpoints
    */
   riskScoringRoutesEnabled: true,
-  /*
-   *
-   * Enables Discover embedded within timeline
-   *
-   * */
-  discoverInTimeline: true,
 
   /**
    * disables ES|QL rules

diff --git a/x-pack/plugins/security_solution/common/types/timeline/index.ts b/x-pack/plugins/security_solution/common/types/timeline/index.ts
@@ -37,7 +37,7 @@ export enum TimelineTabs {
   eql = 'eql',
   session = 'session',
   securityAssistant = 'securityAssistant',
-  discover = 'discover',
+  esql = 'esql',
 }
 
 /*

diff --git a/x-pack/plugins/security_solution/public/actions/constants.ts b/x-pack/plugins/security_solution/public/actions/constants.ts
@@ -10,11 +10,11 @@ export enum SecurityCellActionsTrigger {
   ALERTS_COUNT = 'security-alertsCount-cellActions',
 }
 
-export enum DiscoverInTimelineTrigger {
+export enum EsqlInTimelineTrigger {
   HISTOGRAM_TRIGGER = 'security-discoverInTimeline-histogramTrigger',
 }
 
-export enum DiscoverInTimelineAction {
+export enum EsqlInTimelineAction {
   VIS_FILTER_ACTION = 'security-discoverInTimeline-visFilterAction',
 }
 

diff --git a/x-pack/plugins/security_solution/public/actions/discover_in_timeline/vis_apply_filter.ts b/x-pack/plugins/security_solution/public/actions/discover_in_timeline/vis_apply_filter.ts
@@ -9,7 +9,7 @@ import { createFilterAction } from '@kbn/unified-search-plugin/public';
 import type { History } from 'history';
 import type { SecurityAppStore } from '../../common/store';
 import type { StartServices } from '../../types';
-import { DiscoverInTimelineTrigger, DiscoverInTimelineAction } from '../constants';
+import { EsqlInTimelineTrigger, EsqlInTimelineAction } from '../constants';
 
 const createDiscoverHistogramCustomFilterAction = (
   store: SecurityAppStore,
@@ -20,8 +20,8 @@ const createDiscoverHistogramCustomFilterAction = (
     services.customDataService.query.filterManager,
     services.customDataService.query.timefilter.timefilter,
     services.theme,
-    DiscoverInTimelineAction.VIS_FILTER_ACTION,
-    DiscoverInTimelineAction.VIS_FILTER_ACTION
+    EsqlInTimelineAction.VIS_FILTER_ACTION,
+    EsqlInTimelineAction.VIS_FILTER_ACTION
   );
   services.uiActions.registerAction(histogramApplyFilter);
 
@@ -34,7 +34,7 @@ const createDiscoverHistogramCustomTrigger = (
   services: StartServices
 ) => {
   services.uiActions.registerTrigger({
-    id: DiscoverInTimelineTrigger.HISTOGRAM_TRIGGER,
+    id: EsqlInTimelineTrigger.HISTOGRAM_TRIGGER,
   });
 };
 
@@ -47,8 +47,5 @@ export const registerDiscoverHistogramActions = (
 
   const histogramApplyFilter = createDiscoverHistogramCustomFilterAction(store, history, services);
 
-  services.uiActions.attachAction(
-    DiscoverInTimelineTrigger.HISTOGRAM_TRIGGER,
-    histogramApplyFilter.id
-  );
+  services.uiActions.attachAction(EsqlInTimelineTrigger.HISTOGRAM_TRIGGER, histogramApplyFilter.id);
 };
diff --git a/x-pack/plugins/security_solution/public/actions/types.ts b/x-pack/plugins/security_solution/public/actions/types.ts
@@ -7,7 +7,7 @@
 
 import type { CellAction, CellActionExecutionContext, CellActionFactory } from '@kbn/cell-actions';
 import type { QueryOperator } from '../../common/types';
-export { DiscoverInTimelineAction, DiscoverInTimelineTrigger } from './constants';
+export { EsqlInTimelineTrigger, EsqlInTimelineAction } from './constants';
 export interface AndFilter {
   field: string;
   value: string | string[];

diff --git a/...y_solution/public/detections/containers/detection_engine/alerts/use_signal_index.test.tsx b/...y_solution/public/detections/containers/detection_engine/alerts/use_signal_index.test.tsx
@@ -15,7 +15,7 @@ import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 jest.mock('./api');
 jest.mock('../../../../common/hooks/use_app_toasts');
 jest.mock('../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
-jest.mock('../../../../timelines/components/timeline/discover_tab_content');
+jest.mock('../../../../timelines/components/timeline/esql_tab_content');
 
 describe('useSignalIndex', () => {
   let appToastsMock: jest.Mocked<ReturnType<typeof useAppToastsMock.create>>;

diff --git a/.../discover_tab_content/__mocks__/index.tsx → ...line/esql_tab_content/__mocks__/index.tsx b/.../discover_tab_content/__mocks__/index.tsx → ...line/esql_tab_content/__mocks__/index.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { MockDiscoverTabContent } from '../mocks/discover_tab_content';
+import { MockEsqlTabContent } from '../mocks/esql_tab_content';
 
-export const DiscoverTabContent = MockDiscoverTabContent;
+export const EsqlTabContent = MockEsqlTabContent;
 
 // eslint-disable-next-line import/no-default-export
-export default DiscoverTabContent;
+export default EsqlTabContent;
diff --git a/...r_tab_content/customizations/mock.data.ts → ...l_tab_content/customizations/mock.data.ts b/...r_tab_content/customizations/mock.data.ts → ...l_tab_content/customizations/mock.data.ts
diff --git a/...ions/use_histogram_customizations.test.ts → ...ions/use_histogram_customizations.test.ts b/...ions/use_histogram_customizations.test.ts → ...ions/use_histogram_customizations.test.ts
diff --git a/...izations/use_histogram_customizations.tsx → ...izations/use_histogram_customizations.tsx b/...izations/use_histogram_customizations.tsx → ...izations/use_histogram_customizations.tsx
@@ -14,7 +14,7 @@ import type { CustomizationCallback } from '@kbn/discover-plugin/public';
 import type { UnifiedHistogramContainerProps } from '@kbn/unified-histogram-plugin/public';
 import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { useCallback } from 'react';
-import { DiscoverInTimelineTrigger } from '../../../../../actions/constants';
+import { EsqlInTimelineTrigger } from '../../../../../actions/constants';
 import { useKibana } from '../../../../../common/lib/kibana';
 
 export type WithPreventableEvent<T> = T & {
@@ -67,9 +67,7 @@ export const useHistogramCustomization = () => {
       }
 
       if (filters && filters.length > 0) {
-        const applyFilterTrigger = uiActions.getTrigger(
-          DiscoverInTimelineTrigger.HISTOGRAM_TRIGGER
-        );
+        const applyFilterTrigger = uiActions.getTrigger(EsqlInTimelineTrigger.HISTOGRAM_TRIGGER);
 
         await applyFilterTrigger.exec({
           filters,

diff --git a/...zations/use_search_bar_customizations.tsx → ...zations/use_search_bar_customizations.tsx b/...zations/use_search_bar_customizations.tsx → ...zations/use_search_bar_customizations.tsx
@@ -6,18 +6,16 @@
  */
 
 import type { CustomizationCallback } from '@kbn/discover-plugin/public';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { useGetStatefulQueryBar } from '../use_get_stateful_query_bar';
 
 export const useSearchBarCustomizations = () => {
   const { CustomStatefulTopNavKqlQueryBar } = useGetStatefulQueryBar();
-  const isDiscoverInTimelineEnabled = useIsExperimentalFeatureEnabled('discoverInTimeline');
 
   const setSearchBarCustomizations: CustomizationCallback = ({ customizations }) => {
     customizations.set({
       id: 'search_bar',
       CustomSearchBar: CustomStatefulTopNavKqlQueryBar,
-      hideDataViewPicker: isDiscoverInTimelineEnabled,
+      hideDataViewPicker: true,
     });
   };
 

diff --git a/...ations/use_set_discover_customizations.ts → ...ations/use_set_discover_customizations.ts b/...ations/use_set_discover_customizations.ts → ...ations/use_set_discover_customizations.ts
diff --git a/...eline/discover_tab_content/index.test.tsx → .../timeline/esql_tab_content/index.test.tsx b/...eline/discover_tab_content/index.test.tsx → .../timeline/esql_tab_content/index.test.tsx
diff --git a/...s/timeline/discover_tab_content/index.tsx → ...nents/timeline/esql_tab_content/index.tsx b/...s/timeline/discover_tab_content/index.tsx → ...nents/timeline/esql_tab_content/index.tsx
diff --git a/...ab_content/mocks/discover_tab_content.tsx → ...ql_tab_content/mocks/esql_tab_content.tsx b/...ab_content/mocks/discover_tab_content.tsx → ...ql_tab_content/mocks/esql_tab_content.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { EmbeddedDiscoverContainer } from '../styles';
 
-export function MockDiscoverTabContent() {
+export function MockEsqlTabContent() {
   return (
     <EmbeddedDiscoverContainer data-test-subj="timeline-embedded-discover">
-      {'Mock Discover Tab Content'}
+      {'Mock ESQL Tab Content'}
     </EmbeddedDiscoverContainer>
   );
 }
diff --git a/...eline/discover_tab_content/mocks/index.ts → .../timeline/esql_tab_content/mocks/index.ts b/...eline/discover_tab_content/mocks/index.ts → .../timeline/esql_tab_content/mocks/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DiscoverInTimelineTrigger } from '../../../../../actions/constants';
-export { MockDiscoverTabContent } from './discover_tab_content';
+import { EsqlInTimelineTrigger } from '../../../../../actions/constants';
+export { MockEsqlTabContent } from './esql_tab_content';
 
 export const mockApplyFilterTrigger = {
   exec: jest.fn().mockResolvedValue(undefined),
@@ -16,7 +16,7 @@ export const mockPreventDefault = jest.fn();
 
 export const mockUIActionsGetTrigger = jest.fn().mockImplementation((triggerName: string) => {
   switch (triggerName) {
-    case DiscoverInTimelineTrigger.HISTOGRAM_TRIGGER:
+    case EsqlInTimelineTrigger.HISTOGRAM_TRIGGER:
       return mockApplyFilterTrigger;
     default:
       return undefined;

diff --git a/.../timeline/discover_tab_content/styles.tsx → ...ents/timeline/esql_tab_content/styles.tsx b/.../timeline/discover_tab_content/styles.tsx → ...ents/timeline/esql_tab_content/styles.tsx
diff --git a/...line/discover_tab_content/translations.ts → ...timeline/esql_tab_content/translations.ts b/...line/discover_tab_content/translations.ts → ...timeline/esql_tab_content/translations.ts
diff --git a/...iscover_tab_content/use_discover_state.ts → ...ne/esql_tab_content/use_discover_state.ts b/...iscover_tab_content/use_discover_state.ts → ...ne/esql_tab_content/use_discover_state.ts
diff --git a/...ntent/use_get_stateful_query_bar.test.tsx → ...ntent/use_get_stateful_query_bar.test.tsx b/...ntent/use_get_stateful_query_bar.test.tsx → ...ntent/use_get_stateful_query_bar.test.tsx
diff --git a/...ab_content/use_get_stateful_query_bar.tsx → ...ab_content/use_get_stateful_query_bar.tsx b/...ab_content/use_get_stateful_query_bar.tsx → ...ab_content/use_get_stateful_query_bar.tsx
diff --git a/.../discover_tab_content/utils/index.test.ts → ...line/esql_tab_content/utils/index.test.ts b/.../discover_tab_content/utils/index.test.ts → ...line/esql_tab_content/utils/index.test.ts
diff --git a/...eline/discover_tab_content/utils/index.ts → .../timeline/esql_tab_content/utils/index.ts b/...eline/discover_tab_content/utils/index.ts → .../timeline/esql_tab_content/utils/index.ts
diff --git a/.../discover_tab_content/utils/test_utils.ts → ...line/esql_tab_content/utils/test_utils.ts b/.../discover_tab_content/utils/test_utils.ts → ...line/esql_tab_content/utils/test_utils.ts
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
@@ -15,8 +15,8 @@ import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '../../../../common/lib/kibana';
 import { useAssistantTelemetry } from '../../../../assistant/use_assistant_telemetry';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { useConversationStore } from '../../../../assistant/use_conversation_store';
 import { useAssistantAvailability } from '../../../../assistant/use_assistant_availability';
 import type { SessionViewConfig } from '../../../../../common/types';
@@ -88,6 +88,7 @@ const GraphTab = tabWithSuspense(lazy(() => import('../graph_tab_content')));
 const NotesTab = tabWithSuspense(lazy(() => import('../notes_tab_content')));
 const PinnedTab = tabWithSuspense(lazy(() => import('../pinned_tab_content')));
 const SessionTab = tabWithSuspense(lazy(() => import('../session_tab_content')));
+const EsqlTab = tabWithSuspense(lazy(() => import('../esql_tab_content')));
 interface BasicTimelineTab {
   renderCellValue: (props: CellValueElementProps) => React.ReactNode;
   rowRenderers: RowRenderer[];
@@ -132,6 +133,7 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
     setConversationId,
     showTimeline,
   }) => {
+    const isEsqlSettingEnabled = useKibana().services.configSettings.ESQLEnabled;
     const { hasAssistantPrivilege } = useAssistantAvailability();
     const getTab = useCallback(
       (tab: TimelineTabs) => {
@@ -179,6 +181,14 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
             timelineId={timelineId}
           />
         </HideShowContainer>
+        {isEsqlSettingEnabled && (
+          <HideShowContainer
+            $isVisible={TimelineTabs.esql === activeTimelineTab}
+            data-test-subj={`timeline-tab-content-${TimelineTabs.esql}`}
+          >
+            <EsqlTab timelineId={timelineId} />
+          </HideShowContainer>
+        )}
         <HideShowContainer
           $isVisible={TimelineTabs.pinned === activeTimelineTab}
           data-test-subj={`timeline-tab-content-${TimelineTabs.pinned}`}
@@ -275,7 +285,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
   sessionViewConfig,
   timelineDescription,
 }) => {
-  const isDiscoverInTimelineEnabled = useIsExperimentalFeatureEnabled('discoverInTimeline');
+  const isEsqlSettingEnabled = useKibana().services.configSettings.ESQLEnabled;
   const { hasAssistantPrivilege } = useAssistantAvailability();
   const dispatch = useDispatch();
   const getActiveTab = useMemo(() => getActiveTabSelector(), []);
@@ -360,13 +370,13 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
     }
   }, [activeTab, conversationId, reportAssistantInvoked, setActiveTab]);
 
-  const setDiscoverAsActiveTab = useCallback(() => {
+  const setEsqlAsActiveTab = useCallback(() => {
     dispatch(
       initializeTimelineSettings({
         id: timelineId,
       })
     );
-    setActiveTab(TimelineTabs.discover);
+    setActiveTab(TimelineTabs.esql);
   }, [setActiveTab, dispatch, timelineId]);
 
   useEffect(() => {
@@ -389,13 +399,13 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
             <span>{i18n.QUERY_TAB}</span>
             {showTimeline && <TimelineEventsCountBadge />}
           </StyledEuiTab>
-          {isDiscoverInTimelineEnabled && (
+          {isEsqlSettingEnabled && (
             <StyledEuiTab
-              data-test-subj={`timelineTabs-${TimelineTabs.discover}`}
-              onClick={setDiscoverAsActiveTab}
-              isSelected={activeTab === TimelineTabs.discover}
+              data-test-subj={`timelineTabs-${TimelineTabs.esql}`}
+              onClick={setEsqlAsActiveTab}
+              isSelected={activeTab === TimelineTabs.esql}
               disabled={false}
-              key={TimelineTabs.discover}
+              key={TimelineTabs.esql}
             >
               <span>{i18n.DISCOVER_ESQL_IN_TIMELINE_TAB}</span>
               <StyledEuiBetaBadge

diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts
@@ -47,7 +47,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         `--xpack.securitySolution.enableExperimental=${JSON.stringify([
           'alertDetailsPageEnabled',
           'chartEmbeddablesEnabled',
-          'discoverInTimeline',
         ])}`,
         // mock cloud to enable the guided onboarding tour in e2e tests
         '--xpack.cloud.id=test',

diff --git a/...ons/timelines/discover/cell_actions.cy.ts → ...gations/timelines/esql/cell_actions.cy.ts b/...ons/timelines/discover/cell_actions.cy.ts → ...gations/timelines/esql/cell_actions.cy.ts
@@ -15,7 +15,7 @@ import { waitForDiscoverGridToLoad } from '../../../../tasks/discover';
 import { updateDateRangeInLocalDatePickers } from '../../../../tasks/date_picker';
 import { login } from '../../../../tasks/login';
 import { visitWithTimeRange } from '../../../../tasks/navigation';
-import { createNewTimeline, gotToDiscoverTab } from '../../../../tasks/timeline';
+import { createNewTimeline, gotToEsqlTab } from '../../../../tasks/timeline';
 import { ALERTS_URL } from '../../../../urls/navigation';
 
 const INITIAL_START_DATE = 'Jan 18, 2021 @ 20:33:29.186';
@@ -24,17 +24,16 @@ const TIMESTAMP_COLUMN_NAME = '@timestamp';
 
 // FLAKY: https://github.com/elastic/kibana/issues/165650
 describe.skip(
-  `Discover Datagrid Cell Actions`,
+  `ESQL Datagrid Cell Actions`,
   {
-    env: { ftrConfig: { enableExperimental: ['discoverInTimeline'] } },
     tags: ['@ess'],
   },
   () => {
     beforeEach(() => {
       login();
       visitWithTimeRange(ALERTS_URL);
       createNewTimeline();
-      gotToDiscoverTab();
+      gotToEsqlTab();
       updateDateRangeInLocalDatePickers(DISCOVER_CONTAINER, INITIAL_START_DATE, INITIAL_END_DATE);
       waitForDiscoverGridToLoad();
     });

diff --git a/...discover_timeline_state_integration.cy.ts → ...discover_timeline_state_integration.cy.ts b/...discover_timeline_state_integration.cy.ts → ...discover_timeline_state_integration.cy.ts
@@ -34,7 +34,7 @@ import {
   addDescriptionToTimeline,
   addNameToTimeline,
   createNewTimeline,
-  gotToDiscoverTab,
+  gotToEsqlTab,
   openTimelineById,
   openTimelineFromSettings,
   waitForTimelineChanges,
@@ -60,11 +60,9 @@ const TIMELINE_RESPONSE_SAVED_OBJECT_ID_PATH =
   'response.body.data.persistTimeline.timeline.savedObjectId';
 const esqlQuery = 'from auditbeat-* | where ecs.version == "8.0.0"';
 
-// TODO: reuse or remove this tests when ESQL tab will be added
-describe.skip(
+describe(
   'Discover Timeline State Integration',
   {
-    env: { ftrConfig: { enableExperimental: ['discoverInTimeline'] } },
     tags: ['@ess', '@brokenInServerless'],
     // ESQL and test involving STACK_MANAGEMENT_PAGE are broken in serverless
   },
@@ -109,14 +107,14 @@ describe.skip(
       login();
       visitWithTimeRange(ALERTS_URL);
       createNewTimeline();
-      gotToDiscoverTab();
+      gotToEsqlTab();
       updateDateRangeInLocalDatePickers(DISCOVER_CONTAINER, INITIAL_START_DATE, INITIAL_END_DATE);
     });
     context('save/restore', () => {
       it('should be able create an empty timeline with default discover state', () => {
         addNameToTimeline('Timerange timeline');
         createNewTimeline();
-        gotToDiscoverTab();
+        gotToEsqlTab();
         cy.get(GET_LOCAL_SHOW_DATES_BUTTON(DISCOVER_CONTAINER)).should(
           'contain.text',
           `Last 15 minutes`
@@ -143,7 +141,7 @@ describe.skip(
             openTimelineFromSettings();
             openTimelineById(timelineId);
             cy.get(LOADING_INDICATOR).should('not.exist');
-            gotToDiscoverTab();
+            gotToEsqlTab();
             verifyDiscoverEsqlQuery(esqlQuery);
             cy.get(GET_DISCOVER_DATA_GRID_CELL_HEADER(column1)).should('exist');
             cy.get(GET_DISCOVER_DATA_GRID_CELL_HEADER(column2)).should('exist');
@@ -193,7 +191,7 @@ describe.skip(
             openTimelineFromSettings();
             openTimelineById(timelineId);
             cy.get(LOADING_INDICATOR).should('not.exist');
-            gotToDiscoverTab();
+            gotToEsqlTab();
             cy.get(DISCOVER_DATA_VIEW_SWITCHER.BTN).should('not.exist');
           });
       });