Revert "Rename action from insertTimeline to attachTimeline"

This reverts commit 5e0db78.
elastic · Nov 30, 2020 · b49be2d · b49be2d
1 parent ff53a8a
commit b49be2d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 32 deletions.
diff --git a/x-pack/plugins/security_solution/public/cases/components/use_all_cases_modal/index.tsx b/x-pack/plugins/security_solution/public/cases/components/use_all_cases_modal/index.tsx
@@ -12,7 +12,7 @@ import { APP_ID } from '../../../../common/constants';
 import { SecurityPageName } from '../../../app/types';
 import { useKibana } from '../../../common/lib/kibana';
 import { getCaseDetailsUrl, getCreateCaseUrl } from '../../../common/components/link_to';
-import { setAttachTimeline } from '../../../timelines/store/timeline/actions';
+import { setInsertTimeline } from '../../../timelines/store/timeline/actions';
 import { timelineSelectors } from '../../../timelines/store/timeline';
 
 import { AllCasesModal } from './all_cases_modal';
@@ -51,7 +51,7 @@ export const useAllCasesModal = ({
       });
 
       dispatch(
-        setAttachTimeline({
+        setInsertTimeline({
           graphEventId: timeline.graphEventId ?? '',
           timelineId,
           timelineSavedObjectId: timeline.savedObjectId ?? '',

diff --git a/...ins/security_solution/public/cases/components/use_insert_timeline/use_insert_timeline.tsx b/...ins/security_solution/public/cases/components/use_insert_timeline/use_insert_timeline.tsx
@@ -12,10 +12,10 @@ import { getTimelineUrl, useFormatUrl } from '../../../common/components/link_to
 import { useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { timelineSelectors, timelineActions } from '../../../timelines/store/timeline';
 import { SecurityPageName } from '../../../app/types';
-import { setAttachTimeline } from '../../../timelines/store/timeline/actions';
+import { setInsertTimeline } from '../../../timelines/store/timeline/actions';
 
 interface UseInsertTimelineReturn {
-  handleOnTimelineAttached: (title: string, id: string | null, graphEventId?: string) => void;
+  handleOnTimelineChange: (title: string, id: string | null, graphEventId?: string) => void;
 }
 
 export const useInsertTimeline = (
@@ -25,9 +25,9 @@ export const useInsertTimeline = (
   const dispatch = useDispatch();
   const { formatUrl } = useFormatUrl(SecurityPageName.timelines);
 
-  const attachTimeline = useShallowEqualSelector(timelineSelectors.selectAttachTimeline);
+  const insertTimeline = useShallowEqualSelector(timelineSelectors.selectInsertTimeline);
 
-  const handleOnTimelineAttached = useCallback(
+  const handleOnTimelineChange = useCallback(
     (title: string, id: string | null, graphEventId?: string) => {
       const url = formatUrl(getTimelineUrl(id ?? '', graphEventId), {
         absolute: true,
@@ -46,18 +46,18 @@ export const useInsertTimeline = (
   );
 
   useEffect(() => {
-    if (attachTimeline != null && value != null) {
-      dispatch(timelineActions.showTimeline({ id: attachTimeline.timelineId, show: false }));
-      handleOnTimelineAttached(
-        attachTimeline.timelineTitle,
-        attachTimeline.timelineSavedObjectId,
-        attachTimeline.graphEventId
+    if (insertTimeline != null && value != null) {
+      dispatch(timelineActions.showTimeline({ id: insertTimeline.timelineId, show: false }));
+      handleOnTimelineChange(
+        insertTimeline.timelineTitle,
+        insertTimeline.timelineSavedObjectId,
+        insertTimeline.graphEventId
       );
-      dispatch(setAttachTimeline(null));
+      dispatch(setInsertTimeline(null));
     }
-  }, [attachTimeline, dispatch, handleOnTimelineAttached, value]);
+  }, [insertTimeline, dispatch, handleOnTimelineChange, value]);
 
   return {
-    handleOnTimelineAttached,
+    handleOnTimelineChange,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/common/mock/global_state.ts b/x-pack/plugins/security_solution/public/common/mock/global_state.ts
@@ -243,7 +243,7 @@ export const mockGlobalState: State = {
         status: TimelineStatus.active,
       },
     },
-    attachTimeline: null,
+    insertTimeline: null,
   },
   sourcerer: {
     ...initialSourcererState,

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -51,7 +51,7 @@ import {
   StyledStar,
 } from './styles';
 import * as i18n from './translations';
-import { setAttachTimeline, showTimeline, TimelineInput } from '../../../store/timeline/actions';
+import { setInsertTimeline, showTimeline, TimelineInput } from '../../../store/timeline/actions';
 import { useCreateTimelineButton } from './use_create_timeline';
 
 export const historyToolTip = 'The chronological history of actions related to this timeline';
@@ -111,7 +111,7 @@ export const StarIcon = React.memo<{
     // TODO: 2 error is: Elements with the 'button' interactive role must be focusable
     // TODO: Investigate this error
     // eslint-disable-next-line
-    <div role="button" onClick={handleClick}>
+  <div role="button" onClick={handleClick}>
       {isFavorite ? (
         <EuiToolTip data-test-subj="timeline-favorite-filled-star-tool-tip" content={i18n.FAVORITE}>
           <StyledStar data-test-subj="timeline-favorite-filled-star" type="starFilled" size="l" />
@@ -299,7 +299,7 @@ export const NewCase = React.memo<NewCaseProps>(
         path: getCreateCaseUrl(),
       }).then(() =>
         dispatch(
-          setAttachTimeline({
+          setInsertTimeline({
             graphEventId,
             timelineId,
             timelineSavedObjectId: savedObjectId,

diff --git a/.../plugins/security_solution/public/timelines/components/timeline/properties/index.test.tsx b/.../plugins/security_solution/public/timelines/components/timeline/properties/index.test.tsx
@@ -20,7 +20,7 @@ import '../../../../common/mock/match_media';
 import { createStore, State } from '../../../../common/store';
 import { useThrottledResizeObserver } from '../../../../common/components/utils';
 import { Properties, showDescriptionThreshold, showNotesThreshold } from '.';
-import { setAttachTimeline } from '../../../store/timeline/actions';
+import { setInsertTimeline } from '../../../store/timeline/actions';
 export { nextTick } from '@kbn/test/jest';
 import { waitFor } from '@testing-library/react';
 
@@ -375,7 +375,7 @@ describe('Properties', () => {
     await waitFor(() => {
       expect(mockNavigateToApp).toBeCalledWith('securitySolution:case', { path: '/create' });
       expect(mockDispatch).toBeCalledWith(
-        setAttachTimeline({
+        setInsertTimeline({
           timelineId: defaultProps.timelineId,
           timelineSavedObjectId: '1',
           timelineTitle: 'coolness',

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
@@ -23,7 +23,7 @@ import {
   TimelineTypeLiteral,
   RowRendererId,
 } from '../../../../common/types/timeline';
-import { AttachTimeline } from './types';
+import { InsertTimeline } from './types';
 
 const actionCreator = actionCreatorFactory('x-pack/security_solution/local/timeline');
 
@@ -116,7 +116,7 @@ export const addTimeline = actionCreator<{
   savedTimeline?: boolean;
 }>('ADD_TIMELINE');
 
-export const setAttachTimeline = actionCreator<AttachTimeline | null>('SET_ATTACH_TIMELINE');
+export const setInsertTimeline = actionCreator<InsertTimeline | null>('SET_INSERT_TIMELINE');
 
 export const startTimelineSaving = actionCreator<{
   id: string;

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.ts
@@ -26,7 +26,7 @@ import {
   setEventsLoading,
   setExcludedRowRendererIds,
   setFilters,
-  setAttachTimeline,
+  setInsertTimeline,
   setKqlFilterQueryDraft,
   setSavedQueryId,
   setSelected,
@@ -112,7 +112,7 @@ export const initialTimelineState: TimelineState = {
     newTimelineModel: null,
   },
   showCallOutUnauthorizedMsg: false,
-  attachTimeline: null,
+  insertTimeline: null,
 };
 
 /** The reducer for all timeline actions  */
@@ -505,9 +505,9 @@ export const timelineReducer = reducerWithInitialState(initialTimelineState)
       timelineById: state.timelineById,
     }),
   }))
-  .case(setAttachTimeline, (state, attachTimeline) => ({
+  .case(setInsertTimeline, (state, insertTimeline) => ({
     ...state,
-    attachTimeline,
+    insertTimeline,
   }))
   .case(updateIndexNames, (state, { id, indexNames }) => ({
     ...state,

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
@@ -10,7 +10,7 @@ import { isFromKueryExpressionValid } from '../../../common/lib/keury';
 import { State } from '../../../common/store/types';
 
 import { TimelineModel } from './model';
-import { AutoSavedWarningMsg, AttachTimeline, TimelineById } from './types';
+import { AutoSavedWarningMsg, InsertTimeline, TimelineById } from './types';
 
 const selectTimelineById = (state: State): TimelineById => state.timeline.timelineById;
 
@@ -22,8 +22,8 @@ const selectCallOutUnauthorizedMsg = (state: State): boolean =>
 export const selectTimeline = (state: State, timelineId: string): TimelineModel =>
   state.timeline.timelineById[timelineId];
 
-export const selectAttachTimeline = (state: State): AttachTimeline | null =>
-  state.timeline.attachTimeline;
+export const selectInsertTimeline = (state: State): InsertTimeline | null =>
+  state.timeline.insertTimeline;
 
 export const autoSaveMsgSelector = createSelector(selectAutoSaveMsg, (autoSaveMsg) => autoSaveMsg);
 

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
@@ -24,7 +24,7 @@ export interface TimelineById {
   [id: string]: TimelineModel;
 }
 
-export interface AttachTimeline {
+export interface InsertTimeline {
   graphEventId?: string;
   timelineId: string;
   timelineSavedObjectId: string | null;
@@ -38,7 +38,7 @@ export interface TimelineState {
   timelineById: TimelineById;
   autoSavedWarningMsg: AutoSavedWarningMsg;
   showCallOutUnauthorizedMsg: boolean;
-  attachTimeline: AttachTimeline | null;
+  insertTimeline: InsertTimeline | null;
 }
 
 export interface ActionTimeline extends Action<string> {