cleanup

Author: patrykkopycinski

x-pack/plugins/security_solution/public/common/store/app/selectors.ts

@@ -10,6 +10,7 @@ import { createSelector } from 'reselect';
 import { Note } from '../../lib/note';
 import { ErrorModel, NotesById } from './model';
 import { State } from '../types';
+import { TimelineResultNote } from '../../../timelines/components/open_timeline/types';
 
 const selectNotesById = (state: State): NotesById => state.app.notesById;
 
@@ -25,16 +26,15 @@ export const getNotes = memoizeOne((notesById: NotesById, noteIds: string[]): No
   }, [])
 );
 
-export const selectNotesByTimelineSavedObjectId = (
-  state: State,
-  timelineSavedObjectId: string
-): Note[] =>
-  values(state.app.notesById).reduce((acc: Note[], note: Note) => {
-    if (note.timelineId === timelineSavedObjectId) {
-      return [...acc, note];
-    }
-    return acc;
-  }, []);
+export const getNotesAsCommentsList = (notesById: NotesById): TimelineResultNote[] =>
+  values(notesById).map((note) => ({
+    eventId: note.eventId,
+    savedObjectId: note.saveObjectId,
+    note: note.note,
+    noteId: note.id,
+    updated: (note.lastEdit ?? note.created).getTime(),
+    updatedBy: note.user,
+  }));
 
 export const selectNotesByIdSelector = createSelector(
   selectNotesById,
@@ -44,7 +44,7 @@ export const selectNotesByIdSelector = createSelector(
 export const notesByIdsSelector = () =>
   createSelector(selectNotesById, (notesById: NotesById) => notesById);
 
-export const selectNotesByTimelineSavedObjectIdSelector = () =>
-  createSelector(selectNotesByTimelineSavedObjectId, (notes: Note[]) => notes);
+export const selectNotesAsCommentsListSelector = () =>
+  createSelector(selectNotesById, getNotesAsCommentsList);
 
 export const errorsSelector = () => createSelector(getErrors, (errors) => errors);

x-pack/plugins/security_solution/public/timelines/components/notes/translations.ts

@@ -50,3 +50,7 @@ export const COPY_TO_CLIPBOARD = i18n.translate(
     defaultMessage: 'Copy to Clipboard',
   }
 );
+
+export const CREATED_BY = i18n.translate('xpack.securitySolution.notes.createdByLabel', {
+  defaultMessage: 'Created by',
+});

x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.tsx

@@ -40,7 +40,7 @@ const ToggleEventDetailsButtonComponent: React.FC<ToggleEventDetailsButtonProps>
           event: {
             eventId,
             // we don't store yet info about event index name in note
-            indexName: '*',
+            indexName: '',
             loading: false,
           },
         })

x-pack/plugins/security_solution/public/timelines/components/timeline/notes_tab_content/index.tsx

@@ -27,7 +27,7 @@ import { TimelineStatus } from '../../../../../common/types/timeline';
 import { appSelectors } from '../../../../common/store/app';
 import { timelineDefaults } from '../../../store/timeline/defaults';
 import { AddNote } from '../../notes/add_note';
-import { NOTES } from '../../notes/translations';
+import { CREATED_BY, NOTES } from '../../notes/translations';
 import { PARTICIPANTS } from '../../../../cases/translations';
 import { NotePreviews } from '../../open_timeline/note_previews';
 import { TimelineResultNote } from '../../open_timeline/types';
@@ -122,38 +122,22 @@ interface NotesTabContentProps {
 const NotesTabContentComponent: React.FC<NotesTabContentProps> = ({ timelineId }) => {
   const dispatch = useDispatch();
   const getTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
-  const {
-    createdBy,
-    expandedEvent,
-    savedObjectId,
-    status: timelineStatus,
-  } = useDeepEqualSelector((state) =>
+  const { createdBy, expandedEvent, status: timelineStatus } = useDeepEqualSelector((state) =>
     pick(
-      ['createdBy', 'expandedEvent', 'status', 'savedObjectId'],
+      ['createdBy', 'expandedEvent', 'status'],
       getTimeline(state, timelineId) ?? timelineDefaults
     )
   );
 
   const { browserFields, docValueFields } = useSourcererScope(SourcererScopeName.timeline);
 
-  const getNotesByTimelineSavedObjectId = useMemo(
-    () => appSelectors.selectNotesByTimelineSavedObjectIdSelector(),
+  const getNotesAsCommentsList = useMemo(
+    () => appSelectors.selectNotesAsCommentsListSelector(),
     []
   );
   const [newNote, setNewNote] = useState('');
   const isImmutable = timelineStatus === TimelineStatus.immutable;
-  const notes: TimelineResultNote[] = useDeepEqualSelector((state) => {
-    const notesByTimelineId = getNotesByTimelineSavedObjectId(state, savedObjectId);
-
-    return notesByTimelineId.map((note) => ({
-      eventId: note.eventId,
-      savedObjectId: note.saveObjectId,
-      note: note.note,
-      noteId: note.id,
-      updated: (note.lastEdit ?? note.created).getTime(),
-      updatedBy: note.user,
-    }));
-  });
+  const notes: TimelineResultNote[] = useDeepEqualSelector(getNotesAsCommentsList);
 
   const participants = useMemo(() => uniqBy('updatedBy', notes), [notes]);
 
@@ -181,7 +165,7 @@ const NotesTabContentComponent: React.FC<NotesTabContentProps> = ({ timelineId }
           <>
             <EuiSpacer size="m" />
             <EuiTitle size="xs">
-              <h4>{'Created by'}</h4>
+              <h4>{CREATED_BY}</h4>
             </EuiTitle>
             <EuiHorizontalRule margin="s" />
             <UsernameWithAvatar username={createdBy} />

x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/index.ts

@@ -27,7 +27,7 @@ export const timelineEventsDetails: SecuritySolutionTimelineFactory<TimelineEven
     response: IEsSearchResponse<unknown>
   ): Promise<TimelineEventsDetailsStrategyResponse> => {
     const { indexName, eventId, docValueFields = [] } = options;
-    const fieldsData = cloneDeep(response.rawResponse.hits.hits[0].fields ?? {});
+    const fieldsData = cloneDeep(response.rawResponse.hits.hits[0]?.fields ?? {});
     const hitsData = cloneDeep(response.rawResponse.hits.hits[0] ?? {});
     delete hitsData._source;
     delete hitsData.fields;