fix type + test

elastic · Feb 28, 2020 · b0635b3 · b0635b3
1 parent 4c7edfa
commit b0635b3
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 34 deletions.
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
@@ -93,22 +93,26 @@ describe('CaseView ', () => {
     );
     expect(
       wrapper
-        .find(`[data-test-subj="user-action-1"] [data-test-subj="user-action-avatar"]`)
+        .find(
+          `div[data-test-subj="user-action-${data.comments[0].commentId}-avatar"] [data-test-subj="user-action-avatar"]`
+        )
         .first()
         .prop('name')
     ).toEqual(data.comments[0].createdBy.fullName);
 
     expect(
       wrapper
-        .find(`[data-test-subj="user-action-1"] [data-test-subj="user-action-title"] strong`)
+        .find(
+          `div[data-test-subj="user-action-${data.comments[0].commentId}"] [data-test-subj="user-action-title"] strong`
+        )
         .first()
         .text()
     ).toEqual(data.comments[0].createdBy.username);
 
     expect(
       wrapper
         .find(
-          `[data-test-subj="user-action-1"] [data-test-subj="user-action-content"] [data-test-subj="markdown"]`
+          `div[data-test-subj="user-action-${data.comments[0].commentId}"] [data-test-subj="markdown"]`
         )
         .first()
         .prop('source')

diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
@@ -139,7 +139,7 @@ export const UserActionTree = React.memo(
             markdown={
               <UserActionMarkdown
                 id={comment.commentId}
-                content={data.description}
+                content={comment.comment}
                 isEditable={manageMarkdownEditIds.includes(comment.commentId)}
                 onChangeEditable={handleManageMarkdownEditId}
                 onSaveContent={handleSaveComment.bind(null, comment.commentId)}
@@ -150,13 +150,13 @@ export const UserActionTree = React.memo(
           />
         ))}
         <UserActionItem
-          createdAt={data.createdAt}
+          createdAt={new Date().toISOString()}
           id={NewId}
           isEditable={true}
           isLoading={isLoadingIds.includes(NewId)}
           fullName="to be determined"
           markdown={MarkdownNewComment}
-          onEdit={handleManageMarkdownEditId.bind(null, DescriptionId)}
+          onEdit={handleManageMarkdownEditId.bind(null, NewId)}
           userName="to be determined"
         />
       </UserAction>

diff --git a/.../legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_avatar.tsx b/.../legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_avatar.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiAvatar, EuiFlexItem } from '@elastic/eui';
+import { EuiAvatar } from '@elastic/eui';
 import React from 'react';
 
 interface UserActionAvatarProps {

diff --git a/...ck/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/...ck/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
@@ -34,29 +34,27 @@ export const UserActionItem = ({
   markdown,
   onEdit,
   userName,
-}: UserActionItemProps) => {
-  return (
-    <>
-      <EuiFlexItem grow={false}>
-        <UserActionAvatar name={fullName ?? userName} />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        {isEditable && markdown}
-        {!isEditable && (
-          <EuiPanel className="userAction__panel" paddingSize="none">
-            <UserActionTitle
-              createdAt={createdAt}
-              id={id}
-              isLoading={isLoading}
-              labelAction={labelAction ?? ''}
-              labelTitle={labelTitle ?? ''}
-              userName={userName}
-              onEdit={onEdit}
-            />
-            {markdown}
-          </EuiPanel>
-        )}
-      </EuiFlexItem>
-    </>
-  );
-};
+}: UserActionItemProps) => (
+  <>
+    <EuiFlexItem data-test-subj={`user-action-${id}-avatar`} grow={false}>
+      <UserActionAvatar name={fullName ?? userName} />
+    </EuiFlexItem>
+    <EuiFlexItem data-test-subj={`user-action-${id}`}>
+      {isEditable && markdown}
+      {!isEditable && (
+        <EuiPanel className="userAction__panel" paddingSize="none">
+          <UserActionTitle
+            createdAt={createdAt}
+            id={id}
+            isLoading={isLoading}
+            labelAction={labelAction ?? ''}
+            labelTitle={labelTitle ?? ''}
+            userName={userName}
+            onEdit={onEdit}
+          />
+          {markdown}
+        </EuiPanel>
+      )}
+    </EuiFlexItem>
+  </>
+);
diff --git a/...egacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx b/...egacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiButton } from '@elastic/eui';
-import React, { useCallback, useState, useEffect } from 'react';
+import React, { useCallback, useState } from 'react';
 import styled, { css } from 'styled-components';
 
 import { MarkdownEditor } from '../../../../components/markdown_editor';