Moving back to default signals index and clarified todos

elastic · Dec 17, 2019 · 98e61be · 98e61be
1 parent 86e6fb6
commit 98e61be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.tsx
@@ -232,7 +232,7 @@ export const EventsViewer = React.memo<Props>(
     prevProps.browserFields === nextProps.browserFields &&
     prevProps.columns === nextProps.columns &&
     prevProps.dataProviders === nextProps.dataProviders &&
-    isEqual(prevProps.deletedEventIds, nextProps.deletedEventIds) &&
+    prevProps.deletedEventIds === nextProps.deletedEventIds &&
     prevProps.end === nextProps.end &&
     isEqual(prevProps.filters, nextProps.filters) &&
     prevProps.height === nextProps.height &&

diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
@@ -107,6 +107,9 @@ export const Body = React.memo<BodyProps>(
       actionsColumnWidth
     );
 
+    const isSelectAllChecked =
+      data.length > 0 && data.length === Object.keys(selectedEventIds).length;
+
     return (
       <>
         <TimelineBody data-test-subj="timeline-body" bodyHeight={height}>
@@ -120,9 +123,7 @@ export const Body = React.memo<BodyProps>(
               browserFields={browserFields}
               columnHeaders={columnHeaders}
               isEventViewer={isEventViewer}
-              isSelectAllChecked={
-                data.length > 0 && data.length === Object.keys(selectedEventIds).length
-              }
+              isSelectAllChecked={isSelectAllChecked}
               onColumnRemoved={onColumnRemoved}
               onColumnResized={onColumnResized}
               onColumnSorted={onColumnSorted}

diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/stateful_body.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/stateful_body.tsx
@@ -6,7 +6,7 @@
 
 import { noop } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
-import React, { useCallback, useEffect, useRef } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -129,13 +129,6 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     updateNote,
     updateSort,
   }) => {
-    const isInitialRender = useRef(true);
-    useEffect(() => {
-      if (isInitialRender.current) {
-        isInitialRender.current = false;
-      }
-    });
-
     const timelineTypeContext = useTimelineTypeContext();
 
     const getNotesByIds = useCallback(
@@ -203,6 +196,7 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
       [id]
     );
 
+    // TODO: Rework selectAll dispatch via timelineTypeContext
     // Sync to timelineTypeContext.selectAll so parent components can select all events
     useEffect(() => {
       if (timelineTypeContext.selectAll) {

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/index.tsx
@@ -27,7 +27,7 @@ import {
   SignalsTableFilterGroup,
 } from './components/signals_filter_group/signals_filter_group';
 import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
+import { DEFAULT_KBN_VERSION, DEFAULT_SIGNALS_INDEX_KEY } from '../../../../common/constants';
 import { defaultHeaders } from '../../../components/timeline/body/column_headers/default_headers';
 import { ColumnHeader } from '../../../components/timeline/body/column_headers/column_header';
 import { esFilters } from '../../../../../../../../src/plugins/data/common/es_query';
@@ -142,6 +142,7 @@ export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
     );
 
     // Catches state change to selectAll->false upon user selection change
+    // TODO: Simplify as isSelectAllChecked in redux state
     useEffect(() => {
       if (Object.keys(selectedEventIds).length !== previousSelectedCount?.current && selectAll) {
         setShowClearSelectionAction(false);
@@ -175,6 +176,7 @@ export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
 
     const updateSignalsStatusCallback: UpdateSignalsStatus = useCallback(
       async ({ signalIds, status }: UpdateSignalsStatusProps) => {
+        // TODO: When select all on all pages send global query/filter/daterange
         await updateSignalStatusAction({
           signalIds: Object.keys(selectedEventIds),
           status,
@@ -238,7 +240,7 @@ export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
         <GlobalTime>
           {({ to, from }) => (
             <StatefulEventsViewer
-              defaultIndices={['.siem-signals-spong-default']} // TODO Get from new FrankInspired XavierHook
+              defaultIndices={[DEFAULT_SIGNALS_INDEX_KEY]} // TODO Get from new FrankInspired XavierHook
               defaultFilters={
                 filterGroup === FILTER_OPEN ? signalsOpenFilters : signalsClosedFilters
               }