Revert "ref(groupingInfo): Refactor grouping info to avoid storing redundant data (#101135)"

This reverts commit ff9e466.

Co-authored-by: shayna-ch <[email protected]>

Author: 2 people

static/app/components/events/groupingInfo/groupingInfo.tsx

@@ -39,8 +39,8 @@ export default function GroupingInfo({
       projectSlug,
     });
 
-  const variants = groupInfo?.variants
-    ? Object.values(groupInfo.variants).sort((a, b) => {
+  const variants = groupInfo
+    ? Object.values(groupInfo).sort((a, b) => {
         // Sort contributing variants before non-contributing ones
         if (a.contributes && !b.contributes) {
           return -1;

static/app/components/events/groupingInfo/groupingInfoSection.spec.tsx

@@ -67,59 +67,4 @@ describe('EventGroupingInfo', () => {
     // Should not make grouping-info request
     expect(groupingInfoRequest).not.toHaveBeenCalled();
   });
-
-  it('works with new groupingInfo format', async () => {
-    groupingInfoRequest = MockApiClient.addMockResponse({
-      url: `/projects/org-slug/project-slug/events/${event.id}/grouping-info/`,
-      body: {
-        grouping_config: 'default:XXXX',
-        variants: {
-          app: {
-            contributes: true,
-            description: 'variant description',
-            hash: '123',
-            hashMismatch: false,
-            key: 'key',
-            type: EventGroupVariantType.CHECKSUM,
-          },
-        },
-      },
-    });
-    render(<EventGroupingInfoSection {...defaultProps} />);
-
-    expect(await screen.findByText('variant description')).toBeInTheDocument();
-    expect(screen.getByText('123')).toBeInTheDocument();
-  });
-  it('gets performance new grouping info from group/event data', async () => {
-    groupingInfoRequest = MockApiClient.addMockResponse({
-      url: `/projects/org-slug/project-slug/events/${event.id}/grouping-info/`,
-      body: {
-        grouping_config: null,
-        variants: {
-          app: {
-            contributes: true,
-            description: 'variant description',
-            hash: '123',
-            hashMismatch: false,
-            key: 'key',
-            type: EventGroupVariantType.CHECKSUM,
-          },
-        },
-      },
-    });
-    const perfEvent = EventFixture({
-      type: 'transaction',
-      occurrence: {fingerprint: ['123'], evidenceData: {op: 'bad-op'}},
-    });
-    const perfGroup = GroupFixture({issueCategory: IssueCategory.PERFORMANCE});
-
-    render(
-      <EventGroupingInfoSection {...defaultProps} event={perfEvent} group={perfGroup} />
-    );
-
-    expect(await screen.findByText('performance problem')).toBeInTheDocument();
-    expect(screen.getByText('123')).toBeInTheDocument();
-    // Should not make grouping-info request
-    expect(groupingInfoRequest).not.toHaveBeenCalled();
-  });
 });

static/app/components/events/groupingInfo/groupingSummary.tsx

@@ -22,15 +22,22 @@ export function GroupInfoSummary({
     group,
     projectSlug,
   });
-  const groupedBy = groupInfo?.variants
-    ? Object.values(groupInfo.variants)
+  const groupedBy = groupInfo
+    ? Object.values(groupInfo)
         .filter(variant => variant.contributes && variant.description !== null)
         .map(variant => variant.description!)
         .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
         .join(', ')
     : t('nothing');
 
-  const groupingConfig = showGroupingConfig && groupInfo?.grouping_config;
+  const groupingConfig =
+    showGroupingConfig && groupInfo
+      ? (
+          Object.values(groupInfo).find(
+            variant => 'config' in variant && variant.config?.id
+          ) as any
+        )?.config?.id
+      : null;
 
   if (isPending && !hasPerformanceGrouping) {
     return (

static/app/components/events/groupingInfo/useEventGroupingInfo.tsx

@@ -8,37 +8,7 @@ import type {Group} from 'sentry/types/group';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 
-type EventGroupingInfoResponseOld = Record<string, EventGroupVariant>;
-type EventGroupingInfoResponse = {
-  grouping_config: string | null;
-  variants: Record<string, EventGroupVariant>;
-};
-
-// temporary function to convert the old response structure to the new one
-function eventGroupingInfoResponseOldToNew(
-  old: EventGroupingInfoResponseOld | null
-): EventGroupingInfoResponse | null {
-  const grouping_config = old
-    ? (
-        Object.values(old).find(
-          variant => 'config' in variant && variant.config?.id
-        ) as any
-      )?.config?.id
-    : null;
-  return old
-    ? {
-        grouping_config,
-        variants: old,
-      }
-    : null;
-}
-
-// temporary function to check if the respinse is old type
-function isOld(
-  data: EventGroupingInfoResponseOld | EventGroupingInfoResponse | null
-): data is EventGroupingInfoResponseOld {
-  return data ? !('grouping_config' in data) : false;
-}
+type EventGroupingInfoResponse = Record<string, EventGroupVariant>;
 
 function generatePerformanceGroupInfo({
   event,
@@ -57,24 +27,21 @@ function generatePerformanceGroupInfo({
 
   return group
     ? {
-        grouping_config: null,
-        variants: {
-          [group.issueType]: {
-            contributes: true,
-            description: t('performance problem'),
-            hash: event.occurrence?.fingerprint[0] || '',
-            hashMismatch: false,
-            hint: null,
-            key: group.issueType,
-            type: EventGroupVariantType.PERFORMANCE_PROBLEM,
-            evidence: {
-              op: evidenceData?.op,
-              parent_span_ids: evidenceData?.parentSpanIds,
-              cause_span_ids: evidenceData?.causeSpanIds,
-              offender_span_ids: evidenceData?.offenderSpanIds,
-              desc: t('performance problem'),
-              fingerprint: hash,
-            },
+        [group.issueType]: {
+          contributes: true,
+          description: t('performance problem'),
+          hash: event.occurrence?.fingerprint[0] || '',
+          hashMismatch: false,
+          hint: null,
+          key: group.issueType,
+          type: EventGroupVariantType.PERFORMANCE_PROBLEM,
+          evidence: {
+            op: evidenceData?.op,
+            parent_span_ids: evidenceData?.parentSpanIds,
+            cause_span_ids: evidenceData?.causeSpanIds,
+            offender_span_ids: evidenceData?.offenderSpanIds,
+            desc: t('performance problem'),
+            fingerprint: hash,
           },
         },
       }
@@ -94,26 +61,14 @@ export function useEventGroupingInfo({
 
   const hasPerformanceGrouping = event.occurrence && event.type === 'transaction';
 
-  const {data, isPending, isError, isSuccess} = useApiQuery<
-    EventGroupingInfoResponseOld | EventGroupingInfoResponse
-  >([`/projects/${organization.slug}/${projectSlug}/events/${event.id}/grouping-info/`], {
-    enabled: !hasPerformanceGrouping,
-    staleTime: Infinity,
-  });
+  const {data, isPending, isError, isSuccess} = useApiQuery<EventGroupingInfoResponse>(
+    [`/projects/${organization.slug}/${projectSlug}/events/${event.id}/grouping-info/`],
+    {enabled: !hasPerformanceGrouping, staleTime: Infinity}
+  );
 
-  const groupInfoRaw = hasPerformanceGrouping
+  const groupInfo = hasPerformanceGrouping
     ? generatePerformanceGroupInfo({group, event})
     : (data ?? null);
 
-  const groupInfo = isOld(groupInfoRaw)
-    ? eventGroupingInfoResponseOldToNew(groupInfoRaw)
-    : groupInfoRaw;
-
-  return {
-    groupInfo,
-    isPending,
-    isError,
-    isSuccess,
-    hasPerformanceGrouping,
-  };
+  return {groupInfo, isPending, isError, isSuccess, hasPerformanceGrouping};
 }