Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Security Solution] [Cases] Small UI bugfixes #96511

Merged
merged 5 commits into from
Apr 9, 2021
Merged

[Security Solution] [Cases] Small UI bugfixes #96511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2666f37
fix
stephmilovic Apr 7, 2021
7449b6d
fix jest
stephmilovic Apr 8, 2021
7ed2c3c
Merge branch 'master' into small_cases_bugs
stephmilovic Apr 8, 2021
a3e60d0
Merge branch 'master' into small_cases_bugs
kibanamachine Apr 8, 2021
057a6d5
Merge branch 'master' into small_cases_bugs
kibanamachine Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions x-pack/plugins/security_solution/public/cases/components/all_cases/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import {
EuiTableActionsColumnType,
EuiTableComputedColumnType,
EuiTableFieldDataColumnType,
EuiFlexGroup,
EuiFlexItem,
} from '@elastic/eui';
import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
import styled from 'styled-components';
Expand Down Expand Up @@ -73,12 +75,12 @@ export const getCasesColumns = (
return theCase.status !== CaseStatuses.closed ? (
caseDetailsLinkComponent
) : (
<>
{caseDetailsLinkComponent}
<Spacer>
<EuiFlexGroup direction="column" gutterSize="none">
<EuiFlexItem>{caseDetailsLinkComponent}</EuiFlexItem>
<EuiFlexItem>
<MediumShadeText>{i18n.CLOSED}</MediumShadeText>
</Spacer>
</>
</EuiFlexItem>
</EuiFlexGroup>
);
}
return getEmptyTagValue();
Expand Down Expand Up @@ -132,7 +134,6 @@ export const getCasesColumns = (
align: RIGHT_ALIGNMENT,
field: 'totalAlerts',
name: ALERTS,
sortable: true,
render: (totalAlerts: Case['totalAlerts']) =>
totalAlerts != null
? renderStringField(`${totalAlerts}`, `case-table-column-alertsCount`)
Expand All @@ -142,37 +143,36 @@ export const getCasesColumns = (
align: RIGHT_ALIGNMENT,
field: 'totalComment',
name: i18n.COMMENTS,
sortable: true,
render: (totalComment: Case['totalComment']) =>
totalComment != null
? renderStringField(`${totalComment}`, `case-table-column-commentCount`)
: getEmptyTagValue(),
},
filterStatus === CaseStatuses.open
filterStatus === CaseStatuses.closed
? {
field: 'createdAt',
name: i18n.OPENED_ON,
field: 'closedAt',
name: i18n.CLOSED_ON,
sortable: true,
render: (createdAt: Case['createdAt']) => {
if (createdAt != null) {
render: (closedAt: Case['closedAt']) => {
if (closedAt != null) {
return (
<span data-test-subj={`case-table-column-createdAt`}>
<FormattedRelativePreferenceDate value={createdAt} />
<span data-test-subj={`case-table-column-closedAt`}>
<FormattedRelativePreferenceDate value={closedAt} />
</span>
);
}
return getEmptyTagValue();
},
}
: {
field: 'closedAt',
name: i18n.CLOSED_ON,
field: 'createdAt',
name: i18n.OPENED_ON,
sortable: true,
render: (closedAt: Case['closedAt']) => {
if (closedAt != null) {
render: (createdAt: Case['createdAt']) => {
if (createdAt != null) {
return (
<span data-test-subj={`case-table-column-closedAt`}>
<FormattedRelativePreferenceDate value={closedAt} />
<span data-test-subj={`case-table-column-createdAt`}>
<FormattedRelativePreferenceDate value={createdAt} />
</span>
);
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ describe('AllCases', () => {
wrapper.find('button[data-test-subj="case-status-filter-in-progress"]').simulate('click');
await waitFor(() => {
expect(setQueryParams).toBeCalledWith({
sortField: 'updatedAt',
sortField: 'createdAt',
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ export const AllCases = React.memo<AllCasesProps>(
newFilterOptions.status &&
newFilterOptions.status === CaseStatuses['in-progress']
) {
setQueryParams({ sortField: SortFieldCase.updatedAt });
setQueryParams({ sortField: SortFieldCase.createdAt });
}
setFilters(newFilterOptions);
refreshCases(false);
Expand Down
5 changes: 5 additions & 0 deletions ...ns/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ describe('ConnectorsDropdown', () => {
"inputDisplay": <EuiFlexGroup
alignItems="center"
gutterSize="none"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand All @@ -65,6 +66,7 @@ describe('ConnectorsDropdown', () => {
"inputDisplay": <EuiFlexGroup
alignItems="center"
gutterSize="none"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand All @@ -87,6 +89,7 @@ describe('ConnectorsDropdown', () => {
"inputDisplay": <EuiFlexGroup
alignItems="center"
gutterSize="none"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand All @@ -109,6 +112,7 @@ describe('ConnectorsDropdown', () => {
"inputDisplay": <EuiFlexGroup
alignItems="center"
gutterSize="none"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand All @@ -131,6 +135,7 @@ describe('ConnectorsDropdown', () => {
"inputDisplay": <EuiFlexGroup
alignItems="center"
gutterSize="none"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand Down
4 changes: 2 additions & 2 deletions ...plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const EuiIconExtended = styled(EuiIcon)`
const noConnectorOption = {
value: 'none',
inputDisplay: (
<EuiFlexGroup gutterSize="none" alignItems="center">
<EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
<EuiFlexItem grow={false}>
<EuiIconExtended type="minusInCircle" size={ICON_SIZE} />
</EuiFlexItem>
Expand Down Expand Up @@ -77,7 +77,7 @@ const ConnectorsDropdownComponent: React.FC<Props> = ({
{
value: connector.id,
inputDisplay: (
<EuiFlexGroup gutterSize="none" alignItems="center">
<EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
<EuiFlexItem grow={false}>
<EuiIconExtended
type={connectorsConfiguration[connector.actionTypeId]?.logo ?? ''}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/cases/components/configure_cases/field_mapping.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const FieldMappingComponent: React.FC<FieldMappingProps> = ({
<EuiFlexGroup direction="column" gutterSize="none">
<EuiFlexItem>
{' '}
<EuiFlexGroup>
<EuiFlexGroup responsive={false}>
<EuiFlexItem>
<span className="euiFormLabel">{i18n.FIELD_MAPPING_FIRST_COL}</span>
</EuiFlexItem>
Expand Down
6 changes: 3 additions & 3 deletions ...ns/security_solution/public/cases/components/configure_cases/field_mapping_row_static.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const FieldMappingRowComponent: React.FC<RowProps> = ({
selectedActionType,
]);
return (
<EuiFlexGroup data-test-subj="static-mappings" alignItems="center">
<EuiFlexGroup data-test-subj="static-mappings" alignItems="center" responsive={false}>
<EuiFlexItem>
<EuiFlexGroup component="span" justifyContent="spaceBetween">
<EuiFlexGroup component="span" justifyContent="spaceBetween" responsive={false}>
<EuiFlexItem component="span" grow={false}>
<EuiCode data-test-subj="field-mapping-source">{securitySolutionField}</EuiCode>
</EuiFlexItem>
Expand All @@ -40,7 +40,7 @@ const FieldMappingRowComponent: React.FC<RowProps> = ({
</EuiFlexGroup>
</EuiFlexItem>
<EuiFlexItem>
<EuiFlexGroup component="span" justifyContent="spaceBetween">
<EuiFlexGroup component="span" justifyContent="spaceBetween" responsive={false}>
<EuiFlexItem component="span" grow={false}>
{isLoading ? (
<EuiLoadingSpinner size="m" />
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/security_solution/public/cases/containers/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ export interface AllCases extends CasesStatus {
export enum SortFieldCase {
createdAt = 'createdAt',
closedAt = 'closedAt',
updatedAt = 'updatedAt',
}

export interface ElasticUser {
Expand Down