Skip to content

Commit 0d480dc

Browse files
jonwalstedtjonwalstedt
committed
test(security_solution): fix failing tests
1 parent 3199862 commit 0d480dc

7 files changed

Lines changed: 39 additions & 16 deletions

File tree

‎x-pack/solutions/security/plugins/security_solution/public/agent_builder/hooks/use_bulk_add_to_chat_config.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,15 @@ export const useBulkAddToChatConfig = (pathway: BulkAlertPathway): BulkAddToChat
1515
const reportAddToChat = useReportAddToChat();
1616

1717
const convertAlertToAttachment = useCallback(
18-
(alertItems: TimelineItem[]) => [alertsToAttachmentGroup(alertItems)],
19-
[]
20-
);
21-
22-
const onAddedToChat = useCallback(
23-
(itemCount: number) => {
24-
reportAddToChat({ pathway, attachments: ['alert'], item_count: itemCount });
18+
(alertItems: TimelineItem[]) => {
19+
reportAddToChat({ pathway, attachments: ['alert'], item_count: alertItems.length });
20+
return [alertsToAttachmentGroup(alertItems)];
2521
},
2622
[pathway, reportAddToChat]
2723
);
2824

2925
return {
3026
convertAlertToAttachment,
3127
initialMessage: BULK_ALERTS_ATTACHMENT_PROMPT,
32-
onAddedToChat,
3328
};
3429
};

‎x-pack/solutions/security/plugins/security_solution/public/attack_discovery/pages/results/attack_discovery_panel/tabs/alerts_tab/ease/table.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
import { ActionsCell } from '../../../../../../../detections/components/alert_summary/table/actions_cell';
2929
import { useKibana } from '../../../../../../../common/lib/kibana';
3030
import { useBulkAddToChatConfig } from '../../../../../../../agent_builder/hooks/use_bulk_add_to_chat_config';
31+
import { useAgentBuilderAvailability } from '../../../../../../../agent_builder/hooks/use_agent_builder_availability';
3132
import { CellValue } from '../../../../../../../detections/components/alert_summary/table/render_cell';
3233
import { useAdditionalBulkActions } from '../../../../../../../detections/hooks/alert_summary/use_additional_bulk_actions';
3334

@@ -96,7 +97,9 @@ export const Table = memo(({ dataView, id, packages, query }: TableProps) => {
9697
]
9798
);
9899

100+
const { isAgentBuilderEnabled } = useAgentBuilderAvailability();
99101
const bulkAddToChatConfig = useBulkAddToChatConfig('bulk_alerts_attack_discovery');
102+
const maybeBulkAddToChatConfig = isAgentBuilderEnabled ? bulkAddToChatConfig : undefined;
100103

101104
const browserFields = useBrowserFields(PageScope.alerts, dataView);
102105

@@ -138,7 +141,7 @@ export const Table = memo(({ dataView, id, packages, query }: TableProps) => {
138141
ruleTypeIds={RULE_TYPE_IDS}
139142
services={services}
140143
toolbarVisibility={TOOLBAR_VISIBILITY}
141-
bulkAddToChatConfig={bulkAddToChatConfig}
144+
bulkAddToChatConfig={maybeBulkAddToChatConfig}
142145
/>
143146
</EuiDataGridStyleWrapper>
144147
);

‎x-pack/solutions/security/plugins/security_solution/public/cases/components/ease/table.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import type {
1616
import React, { memo, useCallback, useMemo, useRef } from 'react';
1717
import { useKibana } from '../../../common/lib/kibana';
1818
import { useBulkAddToChatConfig } from '../../../agent_builder/hooks/use_bulk_add_to_chat_config';
19+
import { useAgentBuilderAvailability } from '../../../agent_builder/hooks/use_agent_builder_availability';
1920
import { ActionsCell } from '../../../detections/components/alert_summary/table/actions_cell';
2021
import { CellValue } from '../../../detections/components/alert_summary/table/render_cell';
2122
import { useBrowserFields } from '../../../data_view_manager/hooks/use_browser_fields';
@@ -103,7 +104,9 @@ export const Table = memo(({ dataView, id, onLoaded, packages, query }: TablePro
103104
]
104105
);
105106

107+
const { isAgentBuilderEnabled } = useAgentBuilderAvailability();
106108
const bulkAddToChatConfig = useBulkAddToChatConfig('bulk_alerts_cases');
109+
const maybeBulkAddToChatConfig = isAgentBuilderEnabled ? bulkAddToChatConfig : undefined;
107110

108111
const browserFields = useBrowserFields(PageScope.alerts, dataView);
109112

@@ -141,7 +144,7 @@ export const Table = memo(({ dataView, id, onLoaded, packages, query }: TablePro
141144
runtimeMappings={runtimeMappings}
142145
services={services}
143146
toolbarVisibility={TOOLBAR_VISIBILITY}
144-
bulkAddToChatConfig={bulkAddToChatConfig}
147+
bulkAddToChatConfig={maybeBulkAddToChatConfig}
145148
/>
146149
</EuiDataGridStyleWrapper>
147150
);

‎x-pack/solutions/security/plugins/security_solution/public/detections/components/alert_summary/table/table.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import { combineQueries } from '../../../../common/lib/kuery';
3838
import { useKibana } from '../../../../common/lib/kibana';
3939
import { CellValue } from './render_cell';
4040
import { useBulkAddToChatConfig } from '../../../../agent_builder/hooks/use_bulk_add_to_chat_config';
41+
import { useAgentBuilderAvailability } from '../../../../agent_builder/hooks/use_agent_builder_availability';
4142
import { buildTimeRangeFilter } from '../../alerts_table/helpers';
4243
import { useGlobalTime } from '../../../../common/containers/use_global_time';
4344

@@ -174,7 +175,9 @@ export const Table = memo(({ dataView, groupingFilters, packages }: TableProps)
174175
]
175176
);
176177

178+
const { isAgentBuilderEnabled } = useAgentBuilderAvailability();
177179
const bulkAddToChatConfig = useBulkAddToChatConfig('bulk_alerts_alert_summary');
180+
const maybeBulkAddToChatConfig = isAgentBuilderEnabled ? bulkAddToChatConfig : undefined;
178181

179182
const getGlobalFiltersSelector = useMemo(() => inputsSelectors.globalFiltersQuerySelector(), []);
180183
const globalFilters = useDeepEqualSelector(getGlobalFiltersSelector);
@@ -261,7 +264,7 @@ export const Table = memo(({ dataView, groupingFilters, packages }: TableProps)
261264
ruleTypeIds={RULE_TYPE_IDS}
262265
services={services}
263266
toolbarVisibility={TOOLBAR_VISIBILITY}
264-
bulkAddToChatConfig={bulkAddToChatConfig}
267+
bulkAddToChatConfig={maybeBulkAddToChatConfig}
265268
/>
266269
</EuiDataGridStyleWrapper>
267270
);

‎x-pack/solutions/security/plugins/security_solution/public/detections/components/alert_summary/table/table_bulk_add_to_chat.test.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ jest.mock('@kbn/response-ops-alerts-table', () => ({
2323
AlertsTable: jest.fn(() => null),
2424
}));
2525
jest.mock('../../../../agent_builder/hooks/use_report_add_to_chat');
26+
jest.mock('../../../../agent_builder/hooks/use_agent_builder_availability', () => ({
27+
useAgentBuilderAvailability: jest.fn(() => ({
28+
isAgentBuilderEnabled: true,
29+
hasAgentBuilderPrivilege: true,
30+
isAgentChatExperienceEnabled: true,
31+
hasValidAgentBuilderLicense: false,
32+
})),
33+
}));
2634
jest.mock('../../../../agent_builder/helpers', () => ({
2735
alertsToAttachmentGroup: jest.fn(() => []),
2836
}));
@@ -71,14 +79,14 @@ describe('Alert Summary Table — bulkAddToChatConfig', () => {
7179
expect(initialMessage).toBe(BULK_ALERTS_ATTACHMENT_PROMPT);
7280
});
7381

74-
it('calls reportAddToChat with bulk_alerts_alert_summary pathway and alert_count', () => {
82+
it('calls reportAddToChat with bulk_alerts_alert_summary pathway and item_count', () => {
7583
const { convertAlertToAttachment } = renderAndGetBulkConfig();
7684
const items = [makeItem('a'), makeItem('b'), makeItem('c')];
7785
convertAlertToAttachment(items);
7886
expect(mockReportAddToChat).toHaveBeenCalledWith({
7987
pathway: 'bulk_alerts_alert_summary',
8088
attachments: ['alert'],
81-
alert_count: 3,
89+
item_count: 3,
8290
});
8391
});
8492

‎x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/index.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { useGlobalTime } from '../../../common/containers/use_global_time';
3939
import { useLicense } from '../../../common/hooks/use_license';
4040
import { APP_ID, CASES_FEATURE_ID, VIEW_SELECTION } from '../../../../common/constants';
4141
import { useBulkAddToChatConfig } from '../../../agent_builder/hooks/use_bulk_add_to_chat_config';
42+
import { useAgentBuilderAvailability } from '../../../agent_builder/hooks/use_agent_builder_availability';
4243
import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants';
4344
import { defaultRowRenderers } from '../../../timelines/components/timeline/body/renderers';
4445
import { eventsDefaultModel } from '../../../common/components/events_viewer/default_model';
@@ -460,11 +461,13 @@ const AlertsTableComponent: FC<Omit<AlertTableProps, 'services' | 'isMutedAlerts
460461

461462
const onLoaded = useCallback(({ alerts }: { alerts: Alert[] }) => onLoad(alerts), [onLoad]);
462463

464+
const { isAgentBuilderEnabled } = useAgentBuilderAvailability();
463465
const pathway =
464466
tableType === TableId.alertsOnRuleDetailsPage
465467
? ('bulk_alerts_rule_details' as const)
466468
: ('bulk_alerts_alerts_page' as const);
467469
const bulkAddToChatConfig = useBulkAddToChatConfig(pathway);
470+
const maybeBulkAddToChatConfig = isAgentBuilderEnabled ? bulkAddToChatConfig : undefined;
468471

469472
/**
470473
* We want to hide additional controls (like grouping) if the table is being rendered
@@ -523,7 +526,7 @@ const AlertsTableComponent: FC<Omit<AlertTableProps, 'services' | 'isMutedAlerts
523526
showInspectButton
524527
showCsvExportButton
525528
services={services}
526-
bulkAddToChatConfig={bulkAddToChatConfig}
529+
bulkAddToChatConfig={maybeBulkAddToChatConfig}
527530
{...tablePropsOverrides}
528531
/>
529532
</AlertTableCellContextProvider>

‎x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/table_bulk_add_to_chat.test.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ jest.mock('@kbn/response-ops-alerts-table', () => ({
2020
AlertsTable: jest.fn(() => null),
2121
}));
2222
jest.mock('../../../agent_builder/hooks/use_report_add_to_chat');
23+
jest.mock('../../../agent_builder/hooks/use_agent_builder_availability', () => ({
24+
useAgentBuilderAvailability: jest.fn(() => ({
25+
isAgentBuilderEnabled: true,
26+
hasAgentBuilderPrivilege: true,
27+
isAgentChatExperienceEnabled: true,
28+
hasValidAgentBuilderLicense: false,
29+
})),
30+
}));
2331
jest.mock('../../../agent_builder/helpers', () => ({
2432
alertsToAttachmentGroup: jest.fn(),
2533
}));
@@ -153,7 +161,7 @@ describe('Alerts Page Table — bulkAddToChatConfig', () => {
153161
expect(mockReportAddToChat).toHaveBeenCalledWith({
154162
pathway: 'bulk_alerts_alerts_page',
155163
attachments: ['alert'],
156-
alert_count: 2,
164+
item_count: 2,
157165
});
158166
});
159167

@@ -164,7 +172,7 @@ describe('Alerts Page Table — bulkAddToChatConfig', () => {
164172
expect(mockReportAddToChat).toHaveBeenCalledWith({
165173
pathway: 'bulk_alerts_rule_details',
166174
attachments: ['alert'],
167-
alert_count: 1,
175+
item_count: 1,
168176
});
169177
});
170178

0 commit comments

Comments
 (0)