Skip to content

Commit

Permalink
[Security Solution][Case] Fix case status dropdown on modals (elastic…
Browse files Browse the repository at this point in the history
  • Loading branch information
cnasikas committed Dec 23, 2020
1 parent ce0c66a commit e452af9
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 18 deletions.
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 of 180px', () => {
const wrapper = mount(
<TestProviders>
<CasesTableFilters {...props} />
</TestProviders>
);

expect(wrapper.find('[data-test-subj="status-filter-wrapper"]').first()).toHaveStyleRule(
'flex-basis',
'180px',
{
modifier: '&&',
}
);
});
});
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

0 comments on commit e452af9

Please sign in to comment.