fix from server side

elastic · Oct 1, 2020 · 21fcf02 · 21fcf02
1 parent 4872f27
commit 21fcf02
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 37 deletions.
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/index.tsx
@@ -10,7 +10,6 @@ import {
   EuiModalBody,
   EuiModalHeader,
   EuiSpacer,
-  EuiCallOut,
 } from '@elastic/eui';
 import React, { useState } from 'react';
 import styled from 'styled-components';
@@ -21,18 +20,13 @@ import { AddNote } from './add_note';
 import { columns } from './columns';
 import { AssociateNote, GetNewNoteId, NotesCount, search, UpdateNote } from './helpers';
 import { TimelineStatusLiteral, TimelineStatus } from '../../../../common/types/timeline';
-import { Loader } from '../../../common/components/loader';
-import { useShallowEqualSelector } from '../../../common/hooks/use_selector';
-import { timelineSelectors } from '../../store/timeline';
-import { SAVE_NOTE_HINT } from './translations';
 
 interface Props {
   associateNote: AssociateNote;
   getNotesByIds: (noteIds: string[]) => Note[];
   getNewNoteId: GetNewNoteId;
   noteIds: string[];
   status: TimelineStatusLiteral;
-  timelineId: string;
   updateNote: UpdateNote;
 }
 
@@ -48,23 +42,18 @@ InMemoryTable.displayName = 'InMemoryTable';
 
 /** A view for entering and reviewing notes */
 export const Notes = React.memo<Props>(
-  ({ associateNote, getNotesByIds, getNewNoteId, noteIds, status, timelineId, updateNote }) => {
+  ({ associateNote, getNotesByIds, getNewNoteId, noteIds, status, updateNote }) => {
     const [newNote, setNewNote] = useState('');
     const isImmutable = status === TimelineStatus.immutable;
 
-    const currentTimeline = useShallowEqualSelector((state) =>
-      timelineSelectors.selectTimeline(state, timelineId)
-    );
-    const showAddNote = !isImmutable && currentTimeline.savedObjectId != null;
-
     return (
       <>
         <EuiModalHeader>
           <NotesCount noteIds={noteIds} />
         </EuiModalHeader>
 
         <EuiModalBody>
-          {showAddNote && (
+          {!isImmutable && (
             <AddNote
               associateNote={associateNote}
               getNewNoteId={getNewNoteId}
@@ -73,10 +62,6 @@ export const Notes = React.memo<Props>(
               updateNote={updateNote}
             />
           )}
-          {!showAddNote && currentTimeline.isSaving && (
-            <Loader data-test-subj="loading-spinner" size="xl" />
-          )}
-          {!showAddNote && !currentTimeline.isSaving && <EuiCallOut title={SAVE_NOTE_HINT} />}
           <EuiSpacer size="s" />
           <InMemoryTable
             data-test-subj="notes-table"

diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/notes/translations.ts
@@ -50,7 +50,3 @@ export const COPY_TO_CLIPBOARD = i18n.translate(
     defaultMessage: 'Copy to Clipboard',
   }
 );
-
-export const SAVE_NOTE_HINT = i18n.translate('xpack.securitySolution.notes.saveNoteCallOutTitle', {
-  defaultMessage: 'Add a title to current timeline before adding a note',
-});
diff --git a/...ecurity_solution/public/timelines/components/timeline/body/actions/add_note_icon_item.tsx b/...ecurity_solution/public/timelines/components/timeline/body/actions/add_note_icon_item.tsx
@@ -20,7 +20,6 @@ interface AddEventNoteActionProps {
   showNotes: boolean;
   status: TimelineStatus;
   timelineType: TimelineType;
-  timelineId: string;
   toggleShowNotes: () => void;
   updateNote: UpdateNote;
 }
@@ -32,7 +31,6 @@ const AddEventNoteActionComponent: React.FC<AddEventNoteActionProps> = ({
   showNotes,
   status,
   timelineType,
-  timelineId,
   toggleShowNotes,
   updateNote,
 }) => (
@@ -47,7 +45,6 @@ const AddEventNoteActionComponent: React.FC<AddEventNoteActionProps> = ({
       size="s"
       status={status}
       timelineType={timelineType}
-      timelineId={timelineId}
       toggleShowNotes={toggleShowNotes}
       toolTip={
         timelineType === TimelineType.template ? i18n.NOTES_DISABLE_TOOLTIP : i18n.NOTES_TOOLTIP

diff --git a/.../security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx b/.../security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
@@ -141,7 +141,6 @@ export const EventColumnView = React.memo<Props>(
                 updateNote={updateNote}
                 status={status}
                 timelineType={timelineType}
-                timelineId={timelineId}
               />,
               <PinEventAction
                 key="pin-event"

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
@@ -297,7 +297,6 @@ interface NotesButtonProps {
   toolTip?: string;
   updateNote: UpdateNote;
   timelineType: TimelineTypeLiteral;
-  timelineId: string;
 }
 
 const getNewNoteId = (): string => uuid.v4();
@@ -367,7 +366,6 @@ const NotesButtonComponent = React.memo<NotesButtonProps>(
     text,
     updateNote,
     timelineType,
-    timelineId,
   }) => (
     <ButtonContainer animate={animate} data-test-subj="timeline-notes-button-container">
       <>
@@ -388,7 +386,6 @@ const NotesButtonComponent = React.memo<NotesButtonProps>(
                 getNewNoteId={getNewNoteId}
                 getNotesByIds={getNotesByIds}
                 status={status}
-                timelineId={timelineId}
                 noteIds={noteIds}
                 updateNote={updateNote}
               />
@@ -411,7 +408,6 @@ export const NotesButton = React.memo<NotesButtonProps>(
     size,
     status,
     timelineType,
-    timelineId,
     toggleShowNotes,
     toolTip,
     text,
@@ -430,7 +426,6 @@ export const NotesButton = React.memo<NotesButtonProps>(
         text={text}
         updateNote={updateNote}
         timelineType={timelineType}
-        timelineId={timelineId}
       />
     ) : (
       <EuiToolTip content={toolTip || ''} data-test-subj="timeline-notes-tool-tip">
@@ -446,7 +441,6 @@ export const NotesButton = React.memo<NotesButtonProps>(
           text={text}
           updateNote={updateNote}
           timelineType={timelineType}
-          timelineId={timelineId}
         />
       </EuiToolTip>
     )

diff --git a/...ins/security_solution/public/timelines/components/timeline/properties/properties_left.tsx b/...ins/security_solution/public/timelines/components/timeline/properties/properties_left.tsx
@@ -137,7 +137,6 @@ export const PropertiesLeft = React.memo<Props>(
             toolTip={i18n.NOTES_TOOL_TIP}
             updateNote={updateNote}
             timelineType={timelineType}
-            timelineId={timelineId}
           />
         </EuiFlexItem>
       ) : null}

diff --git a/...ns/security_solution/public/timelines/components/timeline/properties/properties_right.tsx b/...ns/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
@@ -207,7 +207,6 @@ const PropertiesRightComponent: React.FC<PropertiesRightComponentProps> = ({
                     toggleShowNotes={onToggleShowNotes}
                     toolTip={i18n.NOTES_TOOL_TIP}
                     updateNote={updateNote}
-                    timelineId={timelineId}
                   />
                 </EuiFlexItem>
               ) : null}

diff --git a/x-pack/plugins/security_solution/server/lib/note/saved_object.ts b/x-pack/plugins/security_solution/server/lib/note/saved_object.ts
@@ -32,6 +32,7 @@ import { noteSavedObjectType } from './saved_object_mappings';
 import { pickSavedTimeline } from '../timeline/pick_saved_timeline';
 import { convertSavedObjectToSavedTimeline } from '../timeline/convert_saved_object_to_savedtimeline';
 import { timelineSavedObjectType } from '../timeline/saved_object_mappings';
+import { TimelineStatus } from '../../../common/types/timeline';
 
 export interface Note {
   deleteNote: (request: FrameworkRequest, noteIds: string[]) => Promise<void>;
@@ -148,10 +149,10 @@ export const persistNote = async (
         note.timelineId == null
           ? await (async () => {
               const timelineResult = convertSavedObjectToSavedTimeline(
-                await savedObjectsClient.create(
-                  timelineSavedObjectType,
-                  pickSavedTimeline(null, {}, request.user)
-                )
+                await savedObjectsClient.create(timelineSavedObjectType, {
+                  ...pickSavedTimeline(null, {}, request.user),
+                  status: TimelineStatus.draft,
+                })
               );
               note.timelineId = timelineResult.savedObjectId;
               return timelineResult.version;