Merge branch 'master' into bulk-actions

elastic · Dec 19, 2019 · 01669a9 · 01669a9
2 parents e8f2ca7 + 26ddfb2
commit 01669a9
Show file tree

Hide file tree

Showing 48 changed files with 1,870 additions and 331 deletions.
diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -11,6 +11,7 @@ export const DEFAULT_DATE_FORMAT = 'dateFormat';
 export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz';
 export const DEFAULT_DARK_MODE = 'theme:darkMode';
 export const DEFAULT_INDEX_KEY = 'siem:defaultIndex';
+export const DEFAULT_NUMBER_FORMAT = 'format:number:defaultPattern';
 export const DEFAULT_TIME_RANGE = 'timepicker:timeDefaults';
 export const DEFAULT_REFRESH_RATE_INTERVAL = 'timepicker:refreshIntervalDefaults';
 export const DEFAULT_SIEM_TIME_RANGE = 'siem:timeDefaults';

diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx
@@ -64,7 +64,7 @@ export const AlertsTable = React.memo(
     const alertsFilter = useMemo(() => [...defaultAlertsFilters, ...pageFilters], [pageFilters]);
     return (
       <StatefulEventsViewer
-        defaultFilters={alertsFilter}
+        pageFilters={alertsFilter}
         defaultModel={alertsDefaultModel}
         end={endDate}
         id={ALERTS_TABLE_ID}
@@ -73,8 +73,6 @@ export const AlertsTable = React.memo(
           () => ({
             documentType: i18n.ALERTS_DOCUMENT_TYPE,
             footerText: i18n.TOTAL_COUNT_OF_ALERTS,
-            showCheckboxes: false,
-            showRowRenderers: false,
             title: i18n.ALERTS_TABLE_TITLE,
           }),
           []

diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/default_headers.ts b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/default_headers.ts
@@ -65,4 +65,5 @@ export const alertsHeaders: ColumnHeader[] = [
 export const alertsDefaultModel: SubsetTimelineModel = {
   ...timelineDefaults,
   columns: alertsHeaders,
+  showRowRenderers: false,
 };
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
@@ -5,8 +5,8 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import { getOr, isEmpty, isEqual } from 'lodash/fp';
-import React from 'react';
+import { getOr, isEmpty, isEqual, union } from 'lodash/fp';
+import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
@@ -46,6 +46,7 @@ interface Props {
   browserFields: BrowserFields;
   columns: ColumnHeader[];
   dataProviders: DataProvider[];
+  deletedEventIds: Readonly<string[]>;
   end: number;
   filters: esFilters.Filter[];
   headerFilterGroup?: React.ReactNode;
@@ -71,6 +72,7 @@ export const EventsViewer = React.memo<Props>(
     browserFields,
     columns,
     dataProviders,
+    deletedEventIds,
     end,
     filters,
     headerFilterGroup,
@@ -104,6 +106,14 @@ export const EventsViewer = React.memo<Props>(
       end,
       isEventViewer: true,
     });
+    const queryFields = useMemo(
+      () =>
+        union(
+          columnsHeader.map(c => c.id),
+          timelineTypeContext.queryFields ?? []
+        ),
+      [columnsHeader, timelineTypeContext.queryFields]
+    );
 
     return (
       <EuiPanel data-test-subj="events-viewer-panel" grow={false}>
@@ -119,7 +129,7 @@ export const EventsViewer = React.memo<Props>(
 
               {combinedQueries != null ? (
                 <TimelineQuery
-                  fields={columnsHeader.map(c => c.id)}
+                  fields={queryFields}
                   filterQuery={combinedQueries.filterQuery}
                   id={id}
                   indexPattern={indexPattern}
@@ -139,73 +149,81 @@ export const EventsViewer = React.memo<Props>(
                     pageInfo,
                     refetch,
                     totalCount = 0,
-                  }) => (
-                    <>
-                      <HeaderSection
-                        id={id}
-                        showInspect={showInspect}
-                        subtitle={
-                          utilityBar
-                            ? undefined
-                            : `${i18n.SHOWING}: ${totalCount.toLocaleString()} ${i18n.UNIT(
-                                totalCount
-                              )}`
-                        }
-                        title={timelineTypeContext?.title ?? i18n.EVENTS}
-                      >
-                        {headerFilterGroup}
-                      </HeaderSection>
+                  }) => {
+                    const totalCountMinusDeleted =
+                      totalCount > 0 ? totalCount - deletedEventIds.length : 0;
+
+                    // TODO: Reset eventDeletedIds/eventLoadingIds on refresh/loadmore (getUpdatedAt)
+                    return (
+                      <>
+                        <HeaderSection
+                          id={id}
+                          showInspect={showInspect}
+                          subtitle={
+                            utilityBar
+                              ? undefined
+                              : `${
+                                  i18n.SHOWING
+                                }: ${totalCountMinusDeleted.toLocaleString()} ${i18n.UNIT(
+                                  totalCountMinusDeleted
+                                )}`
+                          }
+                          title={timelineTypeContext?.title ?? i18n.EVENTS}
+                        >
+                          {headerFilterGroup}
+                        </HeaderSection>
 
-                      {utilityBar?.(totalCount)}
+                        {utilityBar?.(totalCountMinusDeleted)}
 
-                      <div
-                        data-test-subj={`events-container-loading-${loading}`}
-                        style={{ width: `${width}px` }}
-                      >
-                        <ManageTimelineContext
-                          loading={loading}
-                          width={width}
-                          type={timelineTypeContext}
+                        <div
+                          data-test-subj={`events-container-loading-${loading}`}
+                          style={{ width: `${width}px` }}
                         >
-                          <TimelineRefetch
-                            id={id}
-                            inputId="global"
-                            inspect={inspect}
+                          <ManageTimelineContext
                             loading={loading}
-                            refetch={refetch}
-                          />
+                            width={width}
+                            type={timelineTypeContext}
+                          >
+                            <TimelineRefetch
+                              id={id}
+                              inputId="global"
+                              inspect={inspect}
+                              loading={loading}
+                              refetch={refetch}
+                            />
 
-                          <StatefulBody
-                            browserFields={browserFields}
-                            data={events}
-                            id={id}
-                            isEventViewer={true}
-                            height={height}
-                            sort={sort}
-                            toggleColumn={toggleColumn}
-                          />
+                            <StatefulBody
+                              browserFields={browserFields}
+                              data={events.filter(e => !deletedEventIds.includes(e._id))}
+                              id={id}
+                              isEventViewer={true}
+                              height={height}
+                              sort={sort}
+                              toggleColumn={toggleColumn}
+                            />
 
-                          <Footer
-                            compact={isCompactFooter(width)}
-                            getUpdatedAt={getUpdatedAt}
-                            hasNextPage={getOr(false, 'hasNextPage', pageInfo)!}
-                            height={footerHeight}
-                            isEventViewer={true}
-                            isLive={isLive}
-                            isLoading={loading}
-                            itemsCount={events.length}
-                            itemsPerPage={itemsPerPage}
-                            itemsPerPageOptions={itemsPerPageOptions}
-                            onChangeItemsPerPage={onChangeItemsPerPage}
-                            onLoadMore={loadMore}
-                            nextCursor={getOr(null, 'endCursor.value', pageInfo)!}
-                            serverSideEventCount={totalCount}
-                            tieBreaker={getOr(null, 'endCursor.tiebreaker', pageInfo)}
-                          />
-                        </ManageTimelineContext>
-                      </div>
-                    </>
-                  )}
+                            <Footer
+                              compact={isCompactFooter(width)}
+                              getUpdatedAt={getUpdatedAt}
+                              hasNextPage={getOr(false, 'hasNextPage', pageInfo)!}
+                              height={footerHeight}
+                              isEventViewer={true}
+                              isLive={isLive}
+                              isLoading={loading}
+                              itemsCount={events.length}
+                              itemsPerPage={itemsPerPage}
+                              itemsPerPageOptions={itemsPerPageOptions}
+                              onChangeItemsPerPage={onChangeItemsPerPage}
+                              onLoadMore={loadMore}
+                              nextCursor={getOr(null, 'endCursor.value', pageInfo)!}
+                              serverSideEventCount={totalCountMinusDeleted}
+                              tieBreaker={getOr(null, 'endCursor.tiebreaker', pageInfo)}
+                            />
+                          </ManageTimelineContext>
+                        </div>
+                      </>
+                    );
+                  }}
                 </TimelineQuery>
               ) : null}
             </>
@@ -218,6 +236,7 @@ export const EventsViewer = React.memo<Props>(
     prevProps.browserFields === nextProps.browserFields &&
     prevProps.columns === nextProps.columns &&
     prevProps.dataProviders === nextProps.dataProviders &&
+    prevProps.deletedEventIds === nextProps.deletedEventIds &&
     prevProps.end === nextProps.end &&
     isEqual(prevProps.filters, nextProps.filters) &&
     prevProps.height === nextProps.height &&
@@ -230,6 +249,8 @@ export const EventsViewer = React.memo<Props>(
     isEqual(prevProps.query, nextProps.query) &&
     prevProps.showInspect === nextProps.showInspect &&
     prevProps.start === nextProps.start &&
-    prevProps.sort === nextProps.sort
+    prevProps.sort === nextProps.sort &&
+    isEqual(prevProps.timelineTypeContext, nextProps.timelineTypeContext) &&
+    prevProps.utilityBar === nextProps.utilityBar
 );
 EventsViewer.displayName = 'EventsViewer';