-
Notifications
You must be signed in to change notification settings - Fork 8.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ResponseOps][Cases] Add assignee user actions #139392
Changes from 6 commits
6db3d1c
0198583
f4061a0
75168d2
0a0d0e0
22cd14e
039447c
9ca5a6a
a5c37d7
77491ff
ae3f44b
356a966
d4252a6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,8 +6,8 @@ | |
*/ | ||
|
||
import { EuiFlexGroup, EuiFlexItem, EuiLoadingContent } from '@elastic/eui'; | ||
import React, { useCallback, useMemo } from 'react'; | ||
import { isEqual } from 'lodash'; | ||
import React, { useCallback, useEffect, useMemo, useState } from 'react'; | ||
import { isEqual, uniq } from 'lodash'; | ||
import { useGetCurrentUserProfile } from '../../../containers/user_profiles/use_get_current_user_profile'; | ||
import { useBulkGetUserProfiles } from '../../../containers/user_profiles/use_bulk_get_user_profiles'; | ||
import { useGetConnectors } from '../../../containers/configure/use_connectors'; | ||
|
@@ -58,10 +58,19 @@ export const CaseViewActivity = ({ | |
[caseData.assignees] | ||
); | ||
|
||
const [uidsToRetrieve, setUidsToRetrieve] = useState<string[]>([]); | ||
|
||
const { data: userProfiles, isLoading: isLoadingUserProfiles } = useBulkGetUserProfiles({ | ||
uids: assignees, | ||
uids: uidsToRetrieve, | ||
}); | ||
|
||
useEffect(() => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is no need to use a
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ah ok, just to make sure I understand, let's say There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Exactly! Usually, you do need a |
||
if (userActionsData?.profileUids !== undefined) { | ||
const uids = uniq([...userActionsData.profileUids, ...assignees]); | ||
setUidsToRetrieve(uids); | ||
} | ||
}, [assignees, userActionsData?.profileUids]); | ||
|
||
const { data: currentUserProfile, isLoading: isLoadingCurrentUserProfile } = | ||
useGetCurrentUserProfile(); | ||
|
||
|
@@ -151,10 +160,12 @@ export const CaseViewActivity = ({ | |
{isLoadingUserActions && ( | ||
<EuiLoadingContent lines={8} data-test-subj="case-view-loading-content" /> | ||
)} | ||
{!isLoadingUserActions && userActionsData && ( | ||
{!isLoadingUserActions && userActionsData && userProfiles && ( | ||
<EuiFlexGroup direction="column" responsive={false} data-test-subj="case-view-activity"> | ||
<EuiFlexItem> | ||
<UserActions | ||
userProfiles={userProfiles} | ||
currentUserProfile={currentUserProfile} | ||
getRuleDetailsHref={ruleDetailsNavigation?.href} | ||
onRuleDetailsClick={ruleDetailsNavigation?.onClick} | ||
caseServices={userActionsData.caseServices} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,169 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import React from 'react'; | ||
import { EuiCommentList } from '@elastic/eui'; | ||
import { render, screen } from '@testing-library/react'; | ||
|
||
import { Actions } from '../../../common/api'; | ||
import { elasticUser, getUserAction } from '../../containers/mock'; | ||
import { TestProviders } from '../../common/mock'; | ||
import { createAssigneesUserActionBuilder } from './assignees'; | ||
import { getMockBuilderArgs } from './mock'; | ||
|
||
jest.mock('../../common/lib/kibana'); | ||
jest.mock('../../common/navigation/hooks'); | ||
|
||
describe('createAssigneesUserActionBuilder', () => { | ||
const builderArgs = getMockBuilderArgs(); | ||
|
||
beforeEach(() => { | ||
jest.clearAllMocks(); | ||
}); | ||
|
||
it('renders assigned users', () => { | ||
const userAction = getUserAction('assignees', Actions.add, { | ||
createdBy: { | ||
// damaged_raccoon uid | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😄 |
||
profileUid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0', | ||
}, | ||
}); | ||
const builder = createAssigneesUserActionBuilder({ | ||
...builderArgs, | ||
userAction, | ||
}); | ||
|
||
const createdUserAction = builder.build(); | ||
render( | ||
<TestProviders> | ||
<EuiCommentList comments={createdUserAction} /> | ||
</TestProviders> | ||
); | ||
|
||
expect(screen.getByText('assigned')).toBeInTheDocument(); | ||
expect(screen.getByText('themselves,')).toBeInTheDocument(); | ||
expect(screen.getByText('Physical Dinosaur')).toBeInTheDocument(); | ||
|
||
expect(screen.getByTestId('ua-assignee-physical_dinosaur')).toContainElement( | ||
screen.getByText('and') | ||
); | ||
}); | ||
|
||
it('renders unassigned users', () => { | ||
const userAction = getUserAction('assignees', Actions.delete, { | ||
createdBy: { | ||
// damaged_raccoon uid | ||
profileUid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0', | ||
}, | ||
}); | ||
const builder = createAssigneesUserActionBuilder({ | ||
...builderArgs, | ||
userAction, | ||
}); | ||
|
||
const createdUserAction = builder.build(); | ||
render( | ||
<TestProviders> | ||
<EuiCommentList comments={createdUserAction} /> | ||
</TestProviders> | ||
); | ||
|
||
expect(screen.getByText('unassigned')).toBeInTheDocument(); | ||
expect(screen.getByText('themselves,')).toBeInTheDocument(); | ||
expect(screen.getByText('Physical Dinosaur')).toBeInTheDocument(); | ||
|
||
expect(screen.getByTestId('ua-assignee-physical_dinosaur')).toContainElement( | ||
screen.getByText('and') | ||
); | ||
}); | ||
|
||
it('renders a single assigned user', () => { | ||
const userAction = getUserAction('assignees', Actions.add, { | ||
payload: { | ||
assignees: [ | ||
// only render the physical dinosaur | ||
{ uid: 'u_A_tM4n0wPkdiQ9smmd8o0Hr_h61XQfu8aRPh9GMoRoc_0' }, | ||
], | ||
}, | ||
}); | ||
const builder = createAssigneesUserActionBuilder({ | ||
...builderArgs, | ||
userAction, | ||
}); | ||
|
||
const createdUserAction = builder.build(); | ||
render( | ||
<TestProviders> | ||
<EuiCommentList comments={createdUserAction} /> | ||
</TestProviders> | ||
); | ||
|
||
expect(screen.getByText('Physical Dinosaur')).toBeInTheDocument(); | ||
expect(screen.queryByText('themselves,')).not.toBeInTheDocument(); | ||
expect(screen.queryByText('and')).not.toBeInTheDocument(); | ||
}); | ||
|
||
it('renders a single assigned user that is themselves using matching profile uids', () => { | ||
const userAction = getUserAction('assignees', Actions.add, { | ||
createdBy: { | ||
...elasticUser, | ||
profileUid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0', | ||
}, | ||
payload: { | ||
assignees: [ | ||
// only render the damaged raccoon which is the current user | ||
{ uid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0' }, | ||
], | ||
}, | ||
}); | ||
const builder = createAssigneesUserActionBuilder({ | ||
...builderArgs, | ||
userAction, | ||
}); | ||
|
||
const createdUserAction = builder.build(); | ||
render( | ||
<TestProviders> | ||
<EuiCommentList comments={createdUserAction} /> | ||
</TestProviders> | ||
); | ||
|
||
expect(screen.getByText('themselves')).toBeInTheDocument(); | ||
expect(screen.queryByText('Physical Dinosaur')).not.toBeInTheDocument(); | ||
expect(screen.queryByText('and')).not.toBeInTheDocument(); | ||
}); | ||
|
||
it('renders a single assigned user that is themselves using matching usernames', () => { | ||
const userAction = getUserAction('assignees', Actions.add, { | ||
createdBy: { | ||
...elasticUser, | ||
username: 'damaged_raccoon', | ||
}, | ||
payload: { | ||
assignees: [ | ||
// only render the damaged raccoon which is the current user | ||
{ uid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0' }, | ||
], | ||
}, | ||
}); | ||
const builder = createAssigneesUserActionBuilder({ | ||
...builderArgs, | ||
userAction, | ||
}); | ||
|
||
const createdUserAction = builder.build(); | ||
render( | ||
<TestProviders> | ||
<EuiCommentList comments={createdUserAction} /> | ||
</TestProviders> | ||
); | ||
|
||
expect(screen.getByText('themselves')).toBeInTheDocument(); | ||
expect(screen.queryByText('Physical Dinosaur')).not.toBeInTheDocument(); | ||
expect(screen.queryByText('and')).not.toBeInTheDocument(); | ||
}); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the difference between
rt.partial({ profile_uid: rt.string })
andprofile_uid: rt.union([rt.undefined, rt.null, rt.string])
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By using a
partial
we don't have to set theprofile_uid
wherever a user object is defined. That way we can avoid updating all the locations in the code where we create a user object. I believe we can also avoid writing a migration.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sense. Thanks!