;
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index 0d552d3af6eea..d56168f3f3479 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -128,6 +128,7 @@ export interface FilterOptions {
status: CaseStatusWithAllStatus;
tags: string[];
reporters: User[];
+ owner: string[];
onlyCollectionType?: boolean;
}
diff --git a/x-pack/plugins/cases/public/common/test_utils.ts b/x-pack/plugins/cases/public/common/test_utils.ts
index 2bd8f6c25368b..0ebff7693eed8 100644
--- a/x-pack/plugins/cases/public/common/test_utils.ts
+++ b/x-pack/plugins/cases/public/common/test_utils.ts
@@ -20,3 +20,8 @@ export async function waitForComponentToPaint(wrapper: ReactWrapper
,
wrapper.update();
});
}
+
+export const waitForComponentToUpdate = async () =>
+ act(async () => {
+ return Promise.resolve();
+ });
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
index 6a5106087ec81..7950f962a9cc1 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
@@ -8,8 +8,9 @@
import React from 'react';
import { mount } from 'enzyme';
import moment from 'moment-timezone';
-import { act, waitFor } from '@testing-library/react';
+import { act, render, waitFor, screen } from '@testing-library/react';
import { renderHook } from '@testing-library/react-hooks';
+import userEvent from '@testing-library/user-event';
import '../../common/mock/match_media';
import { TestProviders } from '../../common/mock';
@@ -36,6 +37,7 @@ import { CasesColumns, GetCasesColumn, useCasesColumns } from './columns';
import { triggersActionsUiMock } from '../../../../triggers_actions_ui/public/mocks';
import { registerConnectorsToMockActionRegistry } from '../../common/mock/register_connectors';
import { createStartServicesMock } from '../../common/lib/kibana/kibana_react.mock';
+import { waitForComponentToUpdate } from '../../common/test_utils';
jest.mock('../../containers/use_bulk_update_case');
jest.mock('../../containers/use_delete_cases');
@@ -45,6 +47,9 @@ jest.mock('../../containers/use_get_action_license');
jest.mock('../../containers/configure/use_connectors');
jest.mock('../../common/lib/kibana');
jest.mock('../../common/navigation/hooks');
+jest.mock('../app/use_available_owners', () => ({
+ useAvailableCasesOwners: () => ['securitySolution', 'observability'],
+}));
const useDeleteCasesMock = useDeleteCases as jest.Mock;
const useGetCasesMock = useGetCases as jest.Mock;
@@ -777,4 +782,99 @@ describe('AllCasesListGeneric', () => {
expect(doRefresh).toHaveBeenCalled();
});
+
+ it('shows Solution column if there are no set owners', async () => {
+ const doRefresh = jest.fn();
+
+ const wrapper = mount(
+
+
+
+ );
+
+ const solutionHeader = wrapper.find({ children: 'Solution' });
+ expect(solutionHeader.exists()).toBeTruthy();
+ });
+
+ it('hides Solution column if there is a set owner', async () => {
+ const doRefresh = jest.fn();
+
+ const wrapper = mount(
+
+
+
+ );
+
+ const solutionHeader = wrapper.find({ children: 'Solution' });
+ expect(solutionHeader.exists()).toBeFalsy();
+ });
+
+ it('should deselect cases when refreshing', async () => {
+ useGetCasesMock.mockReturnValue({
+ ...defaultGetCases,
+ selectedCases: [],
+ });
+
+ render(
+
+
+
+ );
+
+ userEvent.click(screen.getByTestId('checkboxSelectAll'));
+ const checkboxes = await screen.findAllByRole('checkbox');
+
+ for (const checkbox of checkboxes) {
+ expect(checkbox).toBeChecked();
+ }
+
+ userEvent.click(screen.getByText('Refresh'));
+ for (const checkbox of checkboxes) {
+ expect(checkbox).not.toBeChecked();
+ }
+
+ waitForComponentToUpdate();
+ });
+
+ it('should deselect cases when changing filters', async () => {
+ useGetCasesMock.mockReturnValue({
+ ...defaultGetCases,
+ selectedCases: [],
+ });
+
+ const { rerender } = render(
+
+
+
+ );
+
+ /** Something really weird is going on and we have to rerender
+ * to get the correct html output. Not sure why.
+ *
+ * If you run the test alone the rerender is not needed.
+ * If you run the test along with the above test
+ * then you need the rerender
+ */
+ rerender(
+
+
+
+ );
+
+ userEvent.click(screen.getByTestId('checkboxSelectAll'));
+ const checkboxes = await screen.findAllByRole('checkbox');
+
+ for (const checkbox of checkboxes) {
+ expect(checkbox).toBeChecked();
+ }
+
+ userEvent.click(screen.getByTestId('case-status-filter'));
+ userEvent.click(screen.getByTestId('case-status-filter-closed'));
+
+ for (const checkbox of checkboxes) {
+ expect(checkbox).not.toBeChecked();
+ }
+
+ waitForComponentToUpdate();
+ });
});
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx
index b3631155f1b6e..bf88c5a7906bf 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx
@@ -23,6 +23,7 @@ import { SELECTABLE_MESSAGE_COLLECTIONS } from '../../common/translations';
import { useGetCases } from '../../containers/use_get_cases';
import { usePostComment } from '../../containers/use_post_comment';
+import { useAvailableCasesOwners } from '../app/use_available_owners';
import { useCasesColumns } from './columns';
import { getExpandedRowMap } from './expanded_row';
import { CasesTableFilters } from './table_filters';
@@ -66,10 +67,15 @@ export const AllCasesList = React.memo(
updateCase,
doRefresh,
}) => {
- const { userCanCrud } = useCasesContext();
+ const { owner, userCanCrud } = useCasesContext();
+ const hasOwner = !!owner.length;
+ const availableSolutions = useAvailableCasesOwners();
+
const firstAvailableStatus = head(difference(caseStatuses, hiddenStatuses));
- const initialFilterOptions =
- !isEmpty(hiddenStatuses) && firstAvailableStatus ? { status: firstAvailableStatus } : {};
+ const initialFilterOptions = {
+ ...(!isEmpty(hiddenStatuses) && firstAvailableStatus && { status: firstAvailableStatus }),
+ owner: hasOwner ? owner : availableSolutions,
+ };
const {
data,
@@ -97,23 +103,30 @@ export const AllCasesList = React.memo(
const filterRefetch = useRef<() => void>();
const tableRef = useRef();
+ const [isLoading, handleIsLoading] = useState(false);
+
const setFilterRefetch = useCallback(
(refetchFilter: () => void) => {
filterRefetch.current = refetchFilter;
},
[filterRefetch]
);
- const [isLoading, handleIsLoading] = useState(false);
+
+ const deselectCases = useCallback(() => {
+ setSelectedCases([]);
+ tableRef.current?.setSelection([]);
+ }, [setSelectedCases]);
+
const refreshCases = useCallback(
(dataRefresh = true) => {
+ deselectCases();
if (dataRefresh) refetchCases();
if (doRefresh) doRefresh();
- setSelectedCases([]);
if (filterRefetch.current != null) {
filterRefetch.current();
}
},
- [doRefresh, filterRefetch, refetchCases, setSelectedCases]
+ [deselectCases, doRefresh, refetchCases]
);
const tableOnChangeCallback = useCallback(
@@ -152,12 +165,11 @@ export const AllCasesList = React.memo(
setQueryParams({ sortField: SortFieldCase.createdAt });
}
- setSelectedCases([]);
- tableRef.current?.setSelection([]);
+ deselectCases();
setFilters(newFilterOptions);
refreshCases(false);
},
- [setSelectedCases, setFilters, refreshCases, setQueryParams]
+ [deselectCases, setFilters, refreshCases, setQueryParams]
);
const showActions = userCanCrud && !isSelectorView;
@@ -175,6 +187,7 @@ export const AllCasesList = React.memo(
alertData,
postComment,
updateCase,
+ showSolutionColumn: !hasOwner && availableSolutions.length > 1,
});
const itemIdToExpandedRowMap = useMemo(
@@ -229,11 +242,13 @@ export const AllCasesList = React.memo