From ac4f8f4ef5e1895014f041c4ef7a5e7a075162ec Mon Sep 17 00:00:00 2001 From: patrykkopycinski Date: Wed, 4 Mar 2020 12:31:43 -0800 Subject: [PATCH] [SIEM] Fix rule delete/duplicate actions (#59306) --- .../rules/all/columns.test.tsx | 81 +++++++++++++++++++ .../detection_engine/rules/all/columns.tsx | 14 ++-- 2 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.test.tsx diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.test.tsx new file mode 100644 index 0000000000000..11becb14625a9 --- /dev/null +++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.test.tsx @@ -0,0 +1,81 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import uuid from 'uuid'; +import { createMemoryHistory } from 'history'; + +const history = createMemoryHistory(); + +import { mockRule } from './__mocks__/mock'; +import { getActions } from './columns'; + +jest.mock('./actions', () => ({ + duplicateRulesAction: jest.fn(), + deleteRulesAction: jest.fn(), +})); + +import { duplicateRulesAction, deleteRulesAction } from './actions'; + +describe('AllRulesTable Columns', () => { + describe('getActions', () => { + const rule = mockRule(uuid.v4()); + let results: string[] = []; + const dispatch = jest.fn(); + const dispatchToaster = jest.fn(); + const reFetchRules = jest.fn(); + + beforeEach(() => { + results = []; + + reFetchRules.mockImplementation(() => { + results.push('reFetchRules'); + Promise.resolve(); + }); + }); + + test('duplicate rule onClick should call refetch after the rule is duplicated', async () => { + (duplicateRulesAction as jest.Mock).mockImplementation( + () => + new Promise(resolve => + setTimeout(() => { + results.push('duplicateRulesAction'); + resolve(); + }, 500) + ) + ); + + const duplicateRulesActionObject = getActions( + dispatch, + dispatchToaster, + history, + reFetchRules + )[1]; + await duplicateRulesActionObject.onClick(rule); + expect(results).toEqual(['duplicateRulesAction', 'reFetchRules']); + }); + + test('delete rule onClick should call refetch after the rule is deleted', async () => { + (deleteRulesAction as jest.Mock).mockImplementation( + () => + new Promise(resolve => + setTimeout(() => { + results.push('deleteRulesAction'); + resolve(); + }, 500) + ) + ); + + const deleteRulesActionObject = getActions( + dispatch, + dispatchToaster, + history, + reFetchRules + )[3]; + await deleteRulesActionObject.onClick(rule); + expect(results).toEqual(['deleteRulesAction', 'reFetchRules']); + }); + }); +}); diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx index ff104f09d68ef..2214190de6a16 100644 --- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx +++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx @@ -34,7 +34,7 @@ import { } from './actions'; import { Action } from './reducer'; -const getActions = ( +export const getActions = ( dispatch: React.Dispatch, dispatchToaster: Dispatch, history: H.History, @@ -51,9 +51,9 @@ const getActions = ( description: i18n.DUPLICATE_RULE, icon: 'copy', name: i18n.DUPLICATE_RULE, - onClick: (rowItem: Rule) => { - duplicateRulesAction([rowItem], [rowItem.id], dispatch, dispatchToaster); - reFetchRules(true); + onClick: async (rowItem: Rule) => { + await duplicateRulesAction([rowItem], [rowItem.id], dispatch, dispatchToaster); + await reFetchRules(true); }, }, { @@ -67,9 +67,9 @@ const getActions = ( description: i18n.DELETE_RULE, icon: 'trash', name: i18n.DELETE_RULE, - onClick: (rowItem: Rule) => { - deleteRulesAction([rowItem.id], dispatch, dispatchToaster); - reFetchRules(true); + onClick: async (rowItem: Rule) => { + await deleteRulesAction([rowItem.id], dispatch, dispatchToaster); + await reFetchRules(true); }, }, ];