[9.0] Set from & to as optional args in @kbn/grouping (#213212) (#213265

) # Backport This will backport the following commits from `main` to `9.0`: - [Set from & to as optional args in @kbn/grouping (#213212)](#213212)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Alberto Blázquez <albertoblaz@users.noreply.github.com>
elastic · Mar 5, 2025 · ab49592 · ab49592
1 parent 9bb526a
commit ab49592
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 20 deletions.
diff --git a/src/platform/packages/shared/kbn-grouping/src/containers/query/index.test.ts b/src/platform/packages/shared/kbn-grouping/src/containers/query/index.test.ts
@@ -15,7 +15,10 @@ import { groupingBucket } from '../../mocks';
 
 const testProps: GroupingQueryArgs = {
   additionalFilters: [],
-  from: '2022-12-28T15:35:32.871Z',
+  timeRange: {
+    from: '2022-12-28T15:35:32.871Z',
+    to: '2023-02-23T06:59:59.999Z',
+  },
   groupByField: 'host.name',
   statsAggregations: [
     {
@@ -59,7 +62,6 @@ const testProps: GroupingQueryArgs = {
   runtimeMappings: {},
   uniqueValue: 'whatAGreatAndUniqueValue',
   size: 25,
-  to: '2023-02-23T06:59:59.999Z',
 };
 describe('group selector', () => {
   beforeEach(() => {

diff --git a/src/platform/packages/shared/kbn-grouping/src/containers/query/index.ts b/src/platform/packages/shared/kbn-grouping/src/containers/query/index.ts
@@ -38,16 +38,15 @@ export const MAX_QUERY_SIZE = 10000;
 
 export const getGroupingQuery = ({
   additionalFilters = [],
-  from,
   groupByField,
   pageNumber,
   rootAggregations,
   runtimeMappings,
   size = DEFAULT_GROUP_BY_FIELD_SIZE,
   sort,
   statsAggregations,
-  to,
   uniqueValue,
+  timeRange,
 }: GroupingQueryArgs): GroupingQuery => ({
   size: 0,
   runtime_mappings: {
@@ -104,14 +103,18 @@ export const getGroupingQuery = ({
     bool: {
       filter: [
         ...additionalFilters,
-        {
-          range: {
-            '@timestamp': {
-              gte: from,
-              lte: to,
-            },
-          },
-        },
+        ...(timeRange
+          ? [
+              {
+                range: {
+                  '@timestamp': {
+                    gte: timeRange.from,
+                    lte: timeRange.to,
+                  },
+                },
+              },
+            ]
+          : []),
       ],
     },
   },

diff --git a/src/platform/packages/shared/kbn-grouping/src/containers/query/types.ts b/src/platform/packages/shared/kbn-grouping/src/containers/query/types.ts
@@ -32,7 +32,6 @@ export type NamedAggregation = Record<string, estypes.AggregationsAggregationCon
 
 export interface GroupingQueryArgs {
   additionalFilters: BoolAgg[];
-  from: string;
   groupByField: string;
   rootAggregations?: NamedAggregation[];
   runtimeMappings?: RunTimeMappings;
@@ -42,7 +41,10 @@ export interface GroupingQueryArgs {
   size?: number;
   sort?: Array<{ [category: string]: { order: 'asc' | 'desc' } }>;
   statsAggregations?: NamedAggregation[];
-  to: string;
+  timeRange?: {
+    from: string;
+    to: string;
+  };
 }
 
 export interface MainAggregation extends NamedAggregation {

diff --git a/...rity_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx b/...rity_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
@@ -207,8 +207,10 @@ export const useLatestFindingsGrouping = ({
     additionalFilters: query ? [query, additionalFilters] : [additionalFilters],
     groupByField: currentSelectedGroup,
     uniqueValue,
-    from: `now-${CDR_3RD_PARTY_RETENTION_POLICY}`,
-    to: 'now',
+    timeRange: {
+      from: `now-${CDR_3RD_PARTY_RETENTION_POLICY}`,
+      to: 'now',
+    },
     pageNumber: activePageIndex * pageSize,
     size: pageSize,
     sort: [{ groupByField: { order: 'desc' } }, { complianceScore: { order: 'asc' } }],

diff --git a/...curity_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/...curity_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -180,8 +180,10 @@ export const useLatestVulnerabilitiesGrouping = ({
     additionalFilters: query ? [query, additionalFilters] : [additionalFilters],
     groupByField: currentSelectedGroup,
     uniqueValue,
-    from: `now-${CDR_3RD_PARTY_RETENTION_POLICY}`,
-    to: 'now',
+    timeRange: {
+      from: `now-${CDR_3RD_PARTY_RETENTION_POLICY}`,
+      to: 'now',
+    },
     pageNumber: activePageIndex * pageSize,
     size: pageSize,
     sort: [{ groupByField: { order: 'desc' } }],

diff --git a/...ity_solution/public/detections/components/alerts_table/grouping_settings/query_builder.ts b/...ity_solution/public/detections/components/alerts_table/grouping_settings/query_builder.ts
@@ -35,7 +35,10 @@ export const getAlertsGroupingQuery = ({
 }: AlertsGroupingQueryParams) =>
   getGroupingQuery({
     additionalFilters,
-    from,
+    timeRange: {
+      from,
+      to,
+    },
     groupByField: selectedGroup,
     statsAggregations: !isNoneGroup([selectedGroup])
       ? getAggregationsByGroupField(selectedGroup)
@@ -45,7 +48,6 @@ export const getAlertsGroupingQuery = ({
     uniqueValue,
     size: pageSize,
     sort: [{ unitsCount: { order: 'desc' } }],
-    to,
   });
 
 const getAggregationsByGroupField = (field: string): NamedAggregation[] => {