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][Case] Fix case status dropdown on modals #86243

Merged
merged 3 commits into from
Dec 23, 2020
Merged

[Security Solution][Case] Fix case status dropdown on modals #86243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c35da40
Better layout
cnasikas Dec 17, 2020
7c9f3b3
Add tests
cnasikas Dec 22, 2020
36665a0
Improve message
cnasikas Dec 22, 2020
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
18 changes: 17 additions & 1 deletion x-pack/plugins/security_solution/public/cases/components/all_cases/table_filters.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import React from 'react';
import { mount } from 'enzyme';

import { CaseStatuses } from '../../../../../case/common/api';
import { CasesTableFilters } from './table_filters';
import { TestProviders } from '../../../common/mock';
import { useGetTags } from '../../containers/use_get_tags';
import { useGetReporters } from '../../containers/use_get_reporters';
import { DEFAULT_FILTER_OPTIONS } from '../../containers/use_get_cases';
import { CasesTableFilters } from './table_filters';

jest.mock('../../containers/use_get_reporters');
jest.mock('../../containers/use_get_tags');
Expand Down Expand Up @@ -151,4 +151,20 @@ describe('CasesTableFilters ', () => {
);
expect(onFilterChanged).toHaveBeenCalledWith({ reporters: [{ username: 'casetester' }] });
});

it('StatusFilterWrapper should have a fixed width', () => {
const wrapper = mount(
<TestProviders>
<CasesTableFilters {...props} />
</TestProviders>
);

expect(wrapper.find('[data-test-subj="status-filter-wrapper"]').first()).toHaveStyleRule(
cnasikas marked this conversation as resolved.
Show resolved Hide resolved
'flex-basis',
'180px',
{
modifier: '&&',
}
);
});
});
46 changes: 29 additions & 17 deletions x-pack/plugins/security_solution/public/cases/components/all_cases/table_filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import React, { useCallback, useEffect, useState, useMemo } from 'react';
import { isEqual } from 'lodash/fp';
import styled from 'styled-components';
import { EuiFlexGroup, EuiFlexItem, EuiFieldSearch, EuiFilterGroup } from '@elastic/eui';

import { CaseStatuses } from '../../../../../case/common/api';
Expand All @@ -25,6 +26,13 @@ interface CasesTableFiltersProps {
setFilterRefetch: (val: () => void) => void;
}

// Fix the width of the status dropdown to prevent hiding long text items
const StatusFilterWrapper = styled(EuiFlexItem)`
&& {
flex-basis: 180px;
}
`;

/**
* Collection of filters for filtering data within the CasesTable. Contains search bar,
* and tag selection
Expand Down Expand Up @@ -131,23 +139,27 @@ const CasesTableFiltersComponent = ({
);

return (
<EuiFlexGroup gutterSize="m" justifyContent="flexEnd">
<EuiFlexItem grow={8}>
<EuiFieldSearch
aria-label={i18n.SEARCH_CASES}
data-test-subj="search-cases"
fullWidth
incremental={false}
placeholder={i18n.SEARCH_PLACEHOLDER}
onSearch={handleOnSearch}
/>
</EuiFlexItem>
<EuiFlexItem grow={2}>
<StatusFilter
selectedStatus={initial.status}
onStatusChanged={onStatusChanged}
stats={stats}
/>
<EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
<EuiFlexItem>
<EuiFlexGroup gutterSize="s">
<EuiFlexItem>
<EuiFieldSearch
aria-label={i18n.SEARCH_CASES}
data-test-subj="search-cases"
fullWidth
incremental={false}
placeholder={i18n.SEARCH_PLACEHOLDER}
onSearch={handleOnSearch}
/>
</EuiFlexItem>
<StatusFilterWrapper grow={false} data-test-subj="status-filter-wrapper">
<StatusFilter
selectedStatus={initial.status}
onStatusChanged={onStatusChanged}
stats={stats}
/>
</StatusFilterWrapper>
</EuiFlexGroup>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFilterGroup>
Expand Down