Merge branch 'template-timeline' of github.com:angorayc/kibana into template-timeline

Author: XavierM

x-pack/plugins/siem/public/components/open_timeline/index.test.tsx

@@ -9,7 +9,6 @@ import { mount } from 'enzyme';
 import { MockedProvider } from 'react-apollo/test-utils';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
-import { getOr } from 'lodash/fp';
 
 import { wait } from '../../lib/helpers';
 import { TestProviderWithoutDragAndDrop, apolloClient } from '../../mock/test_providers';

x-pack/plugins/siem/public/components/open_timeline/index.tsx

@@ -12,7 +12,6 @@ import { Dispatch } from 'redux';
 import { defaultHeaders } from '../../components/timeline/body/column_headers/default_headers';
 import { deleteTimelineMutation } from '../../containers/timeline/delete/persist.gql_query';
 import { AllTimelinesVariables, useGetAllTimeline } from '../../containers/timeline/all';
-import { allTimelinesQuery } from '../../containers/timeline/all/index.gql_query';
 import { DeleteTimelineMutation, SortFieldTimeline, Direction } from '../../graphql/types';
 import { State, timelineSelectors } from '../../store';
 import { ColumnHeaderOptions, TimelineModel } from '../../store/timeline/model';
@@ -161,8 +160,8 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     );
 
     /** Invoked when the user clicks the action to delete the selected timelines */
-    const onDeleteSelected: OnDeleteSelected = useCallback(() => {
-      deleteTimelines(getSelectedTimelineIds(selectedItems));
+    const onDeleteSelected: OnDeleteSelected = useCallback(async () => {
+      await deleteTimelines(getSelectedTimelineIds(selectedItems));
 
       // NOTE: we clear the selection state below, but if the server fails to
       // delete a timeline, it will remain selected in the table:

x-pack/plugins/siem/public/components/open_timeline/types.ts

@@ -9,7 +9,7 @@ import { AllTimelinesVariables } from '../../containers/timeline/all';
 import { TimelineModel } from '../../store/timeline/model';
 import { NoteResult } from '../../graphql/types';
 import { Refetch } from '../../store/inputs/model';
-import { TimelineTypes } from '../../../../../../plugins/siem/common/types/timeline';
+import { TimelineType } from '../../../common/types/timeline';
 
 /** The users who added a timeline to favorites */
 export interface FavoriteTimelineResult {
@@ -49,7 +49,7 @@ export interface OpenTimelineResult {
   savedObjectId?: string | null;
   title?: string | null;
   templateTimelineId?: string | null;
-  type?: TimelineTypes.template | TimelineTypes.default;
+  type?: TimelineType.template | TimelineType.default;
   updated?: number | null;
   updatedBy?: string | null;
 }

x-pack/plugins/siem/public/components/recent_timelines/index.tsx

@@ -62,7 +62,7 @@ const StatefulRecentTimelinesComponent = React.memo<Props>(
       [filterBy]
     );
 
-    const { fetchAllTimeline, timelines, loading } = useGetAllTimeline();
+    const { fetchAllTimeline, timelines, totalCount, loading } = useGetAllTimeline();
 
     useEffect(() => {
       fetchAllTimeline({
@@ -76,8 +76,10 @@ const StatefulRecentTimelinesComponent = React.memo<Props>(
           sortOrder: Direction.desc,
         },
         onlyUserFavorite: filterBy === 'favorites',
+        timelines,
+        totalCount,
       });
-    }, [filterBy]);
+    }, [filterBy, timelines, totalCount]);
 
     return (
       <>