From ba26794d0720792bac48a1c682a4018b5dae6632 Mon Sep 17 00:00:00 2001 From: Nicholas Peretti Date: Thu, 31 Jul 2025 13:35:23 +0100 Subject: [PATCH] [Security solution][Alerts] Fix custom field grouping (#229956) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary Fixes #229844 ### 🛑 The problem As shown in #229844, the "custom field" grouping option was not properly working for users. Here's a video of the bug: https://github.com/user-attachments/assets/93da6835-8fba-4c1e-adcf-06c05080b5dc ### 💡 The solution As @christineweng suggested in the mentioned issue, the problem occurred because the code was not checking if the new data view was actually enabled via feature flag before using it. All we had to do was to add the feature flag check and everything is back to normal now. Here's a video of the UI after the fix: https://github.com/user-attachments/assets/14453957-0c00-430e-b572-cb2666ab774c (cherry picked from commit 22890e612f295301bd3808121b58031db36c21e6) --- .../components/alerts_table/additional_toolbar_controls.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/additional_toolbar_controls.tsx b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/additional_toolbar_controls.tsx index 84dc520ff369d..4afb3a2fb56cf 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/additional_toolbar_controls.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/additional_toolbar_controls.tsx @@ -30,6 +30,7 @@ import { useDataTableFilters } from '../../../common/hooks/use_data_table_filter import { useDeepEqualSelector, useShallowEqualSelector } from '../../../common/hooks/use_selector'; import { AdditionalFiltersAction } from './additional_filters_action'; import { useDataView } from '../../../data_view_manager/hooks/use_data_view'; +import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features'; const { changeViewMode } = dataTableActions; @@ -48,6 +49,7 @@ const AdditionalToolbarControlsComponent = ({ SourcererScopeName.detections ); + const isNewDataViewPickerEnabled = useIsExperimentalFeatureEnabled('newDataViewPickerEnabled'); const { dataView: experimentalDataView } = useDataView(SourcererScopeName.detections); const groupId = useMemo(() => groupIdSelector(), []); @@ -79,10 +81,10 @@ const AdditionalToolbarControlsComponent = ({ const fields = useMemo( () => - experimentalDataView + isNewDataViewPickerEnabled ? experimentalDataView.fields.map((field) => field.spec) : Object.values(oldSourcererDataView.fields || {}), - [experimentalDataView, oldSourcererDataView.fields] + [experimentalDataView.fields, isNewDataViewPickerEnabled, oldSourcererDataView.fields] ); const groupSelector = useGetGroupSelectorStateless({