Fix conflicts and bugs

cnasikas · cnasikas · commit 85b9e5168dc4 · 2020-03-31T13:36:35.000+03:00
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/configure_cases/button.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/configure_cases/button.tsx
@@ -31,6 +31,7 @@ const ConfigureCaseButtonComponent: React.FC<ConfigureCaseButtonProps> = ({
         href={getConfigureCasesUrl(urlSearch)}
         iconType="controlsHorizontal"
         isDisabled={isDisabled}
+        aria-label={label}
       >
         {label}
       </EuiButton>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.tsx
@@ -66,7 +66,7 @@ export const TagList = React.memo(
             <EuiFlexItem grow={false}>
               <EuiButtonIcon
                 isDisabled={disabled}
-                aria-label={'tags'}
+                aria-label={i18n.EDIT_TAGS_ARIA}
                 iconType={'pencil'}
                 onClick={setIsEditTags.bind(null, true)}
               />
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_list/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_list/index.tsx
@@ -5,6 +5,8 @@
  */
 
 import React, { useCallback } from 'react';
+import { isEmpty } from 'lodash/fp';
+
 import {
   EuiButtonIcon,
   EuiText,
@@ -15,9 +17,10 @@ import {
   EuiLoadingSpinner,
   EuiToolTip,
 } from '@elastic/eui';
+
 import styled, { css } from 'styled-components';
-import { ElasticUser } from '../../../../containers/case/types';
 
+import { ElasticUser } from '../../../../containers/case/types';
 import * as i18n from './translations';
 
 interface UserListProps {
@@ -52,7 +55,7 @@ const renderUsers = (
             <MyAvatar name={fullName ? fullName : username ?? ''} />
           </EuiFlexItem>
           <EuiFlexItem>
-            <EuiToolTip position="top" content={<p>{fullName ?? username}</p>}>
+            <EuiToolTip position="top" content={<p>{fullName ? fullName : username ?? ''}</p>}>
               <p>
                 <strong>
                   <small data-test-subj="case-view-username">{username}</small>
@@ -67,8 +70,8 @@ const renderUsers = (
           data-test-subj="user-list-email-button"
           onClick={handleSendEmail.bind(null, email)}
           iconType="email"
-          aria-label="email"
-          isDisabled={email == null}
+          aria-label={i18n.SEND_EMAIL_ARIA(fullName ? fullName : username ?? '')}
+          isDisabled={isEmpty(email)}
         />
       </EuiFlexItem>
     </MyFlexGroup>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ const ConfigureCaseButtonComponent: React.FC<ConfigureCaseButtonProps> = ({`
`31`	`31`	`href={getConfigureCasesUrl(urlSearch)}`
`32`	`32`	`iconType="controlsHorizontal"`
`33`	`33`	`isDisabled={isDisabled}`
	`34`	`+ aria-label={label}`
`34`	`35`	`>`
`35`	`36`	`{label}`
`36`	`37`	`</EuiButton>`