From 7830fbb75fa505dcc4fe047512aa1a806e735068 Mon Sep 17 00:00:00 2001
From: "unleash-bot[bot]" <194219037+unleash-bot[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:20:10 +0300
Subject: [PATCH] chore(AI): eventGrouping flag cleanup (#10428)

---
 frontend/src/component/events/EventCard/EventCard.tsx | 11 ++---------
 frontend/src/interfaces/uiConfig.ts                   |  1 -
 src/lib/types/experimental.ts                         |  5 -----
 src/server-dev.ts                                     |  1 -
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/frontend/src/component/events/EventCard/EventCard.tsx b/frontend/src/component/events/EventCard/EventCard.tsx
index 535492dd87..0a9b346ce4 100644
--- a/frontend/src/component/events/EventCard/EventCard.tsx
+++ b/frontend/src/component/events/EventCard/EventCard.tsx
@@ -5,7 +5,6 @@ import { formatDateYMDHMS } from 'utils/formatDate';
 import { Link } from 'react-router-dom';
 import { styled } from '@mui/material';
 import type { EventSchema } from 'openapi';
-import { useUiFlag } from 'hooks/useUiFlag';
 import { useLocation } from 'react-router-dom';
 
 interface IEventCardProps {
@@ -74,7 +73,6 @@ export const StyledCodeSection = styled('div')(({ theme }) => ({
 
 const EventCard = ({ entry }: IEventCardProps) => {
     const { locationSettings } = useLocationSettings();
-    const eventGroupingEnabled = useUiFlag('eventGrouping');
     const location = useLocation();
 
     const createdAtFormatted = formatDateYMDHMS(
@@ -94,9 +92,7 @@ const EventCard = ({ entry }: IEventCardProps) => {
                 <StyledDefinitionTerm>Event id:</StyledDefinitionTerm>
                 <dd>{entry.id}</dd>
                 <ConditionallyRender
-                    condition={
-                        eventGroupingEnabled && entry.groupId !== undefined
-                    }
+                    condition={entry.groupId !== undefined}
                     show={
                         <>
                             <StyledDefinitionTerm>
@@ -166,10 +162,7 @@ const EventCard = ({ entry }: IEventCardProps) => {
                     }
                 />
                 <ConditionallyRender
-                    condition={
-                        eventGroupingEnabled &&
-                        Boolean(entry.data?.changeRequestId)
-                    }
+                    condition={Boolean(entry.data?.changeRequestId)}
                     show={
                         <>
                             <StyledDefinitionTerm>
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
index 950e1bd9ce..4c83aa5108 100644
--- a/frontend/src/interfaces/uiConfig.ts
+++ b/frontend/src/interfaces/uiConfig.ts
@@ -91,7 +91,6 @@ export type UiFlags = {
     impactMetrics?: boolean;
     crDiffView?: boolean;
     changeRequestApproverEmails?: boolean;
-    eventGrouping?: boolean;
     timestampsInChangeRequestTimeline?: boolean;
     reportUnknownFlags?: boolean;
     lifecycleGraphs?: boolean;
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index aca80f59cd..a743b56cc9 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -61,7 +61,6 @@ export type IFlagKey =
     | 'crDiffView'
     | 'changeRequestApproverEmails'
     | 'paygTrialEvents'
-    | 'eventGrouping'
     | 'paygInstanceStatsEvents'
     | 'timestampsInChangeRequestTimeline'
     | 'lifecycleGraphs'
@@ -282,10 +281,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_IMPACT_METRICS,
         false,
     ),
-    eventGrouping: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_EVENT_GROUPING,
-        false,
-    ),
     paygTrialEvents: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_PAYG_TRIAL_EVENTS,
         false,
diff --git a/src/server-dev.ts b/src/server-dev.ts
index 374e2736d8..b6b2a125d4 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -57,7 +57,6 @@ process.nextTick(async () => {
                         improvedJsonDiff: true,
                         impactMetrics: true,
                         crDiffView: true,
-                        eventGrouping: true,
                         paygTrialEvents: true,
                         timestampsInChangeRequestTimeline: true,
                         lifecycleGraphs: true,