Merge branch 'master' into bugfix/CDNC-15454/fix-double-decode-issue-for-summary-page

Assem-Uber · web-flow · commit 7540ec967d1c · 2026-02-19T16:38:17.000+01:00
diff --git a/src/views/workflow-history-v2/__fixtures__/ungrouped-events-info.ts b/src/views/workflow-history-v2/__fixtures__/ungrouped-events-info.ts
@@ -1,7 +1,6 @@
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
-
 import compareUngroupedEvents from '../workflow-history-ungrouped-table/helpers/compare-ungrouped-events';
 import { type UngroupedEventInfo } from '../workflow-history-ungrouped-table/workflow-history-ungrouped-table.types';
+import { type HistoryEventsGroup } from '../workflow-history-v2.types';
 
 export function createUngroupedEventsInfo(
   eventGroupsById: Array<[string, HistoryEventsGroup]>
diff --git a/src/views/workflow-history-v2/__tests__/workflow-history-v2.test.tsx b/src/views/workflow-history-v2/__tests__/workflow-history-v2.test.tsx
@@ -16,10 +16,6 @@ import { type HistoryEvent } from '@/__generated__/proto-ts/uber/cadence/api/v1/
 import * as usePageFiltersModule from '@/components/page-filters/hooks/use-page-filters';
 import { type PageQueryParamValues } from '@/hooks/use-page-query-params/use-page-query-params.types';
 import { type GetWorkflowHistoryResponse } from '@/route-handlers/get-workflow-history/get-workflow-history.types';
-import {
-  type PendingActivityTaskStartEvent,
-  type PendingDecisionTaskStartEvent,
-} from '@/views/workflow-history/workflow-history.types';
 import { mockDescribeWorkflowResponse } from '@/views/workflow-page/__fixtures__/describe-workflow-response';
 import type workflowPageQueryParamsConfig from '@/views/workflow-page/config/workflow-page-query-params.config';
 
@@ -40,6 +36,10 @@ import {
 import { WorkflowHistoryContext } from '../../workflow-history/workflow-history-context-provider/workflow-history-context-provider';
 import { type Props as NavbarProps } from '../workflow-history-navigation-bar/workflow-history-navigation-bar.types';
 import WorkflowHistoryV2 from '../workflow-history-v2';
+import {
+  type PendingActivityTaskStartEvent,
+  type PendingDecisionTaskStartEvent,
+} from '../workflow-history-v2.types';
 
 jest.mock('@/hooks/use-page-query-params/use-page-query-params', () =>
   jest.fn(() => [{ historySelectedEventId: '1' }, jest.fn()])
diff --git a/src/views/workflow-history-v2/config/workflow-history-details-row-parsers.config.ts b/src/views/workflow-history-v2/config/workflow-history-details-row-parsers.config.ts
@@ -39,6 +39,15 @@ const workflowHistoryDetailsRowParsersConfig: Array<DetailsRowItemParser> = [
     icon: MdReplay,
     customTooltipContent: () => 'retries',
   },
+  {
+    name: 'Workflow links as having clickable content',
+    matcher: (name) =>
+      new RegExp(
+        '(parentWorkflowExecution|externalWorkflowExecution|workflowExecution|firstExecutionRunId|originalExecutionRunId|newExecutionRunId|continuedExecutionRunId|workflowId)$'
+      ).test(name),
+    icon: null,
+    hasClickableContent: true,
+  },
 ];
 
 export default workflowHistoryDetailsRowParsersConfig;
diff --git a/src/views/workflow-history-v2/config/workflow-history-filters.config.ts b/src/views/workflow-history-v2/config/workflow-history-filters.config.ts
@@ -11,7 +11,8 @@ import {
   type WorkflowHistoryEventFilteringType,
   type WorkflowHistoryFiltersTypeValue,
 } from '@/views/workflow-history/workflow-history-filters-type/workflow-history-filters-type.types';
-import { type WorkflowHistoryFilterConfig } from '@/views/workflow-history/workflow-history.types';
+
+import { type WorkflowHistoryFilterConfig } from '../workflow-history-v2.types';
 
 import workflowHistoryFiltersStatusOptionsConfig from './workflow-history-filters-status-options.config';
 import workflowHistoryFiltersTypeOptionsConfig from './workflow-history-filters-type-options.config';
diff --git a/src/views/workflow-history-v2/helpers/__tests__/generate-history-group-details.test.ts b/src/views/workflow-history-v2/helpers/__tests__/generate-history-group-details.test.ts
@@ -8,8 +8,8 @@ import {
 import { mockActivityEventGroup } from '@/views/workflow-history/__fixtures__/workflow-history-event-groups';
 import { pendingActivityTaskStartEvent } from '@/views/workflow-history/__fixtures__/workflow-history-pending-events';
 import isPendingHistoryEvent from '@/views/workflow-history/workflow-history-event-details/helpers/is-pending-history-event';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
+import { type HistoryEventsGroup } from '../../workflow-history-v2.types';
 import generateHistoryEventDetails from '../generate-history-event-details';
 import generateHistoryGroupDetails from '../generate-history-group-details';
 
diff --git a/src/views/workflow-history-v2/helpers/__tests__/get-navigation-bar-events-menu-items.test.ts b/src/views/workflow-history-v2/helpers/__tests__/get-navigation-bar-events-menu-items.test.ts
@@ -2,9 +2,11 @@ import {
   mockActivityEventGroup,
   mockDecisionEventGroup,
 } from '@/views/workflow-history/__fixtures__/workflow-history-event-groups';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
-import { type EventGroupEntry } from '../../workflow-history-v2.types';
+import {
+  type HistoryEventsGroup,
+  type EventGroupEntry,
+} from '../../workflow-history-v2.types';
 import getNavigationBarEventsMenuItems from '../get-navigation-bar-events-menu-items';
 
 jest.mock(
diff --git a/src/views/workflow-history-v2/helpers/generate-history-group-details.ts b/src/views/workflow-history-v2/helpers/generate-history-group-details.ts
@@ -1,10 +1,10 @@
 import formatPendingWorkflowHistoryEvent from '@/utils/data-formatters/format-pending-workflow-history-event';
 import formatWorkflowHistoryEvent from '@/utils/data-formatters/format-workflow-history-event';
 import isPendingHistoryEvent from '@/views/workflow-history/workflow-history-event-details/helpers/is-pending-history-event';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
 import generateHistoryEventDetails from '../helpers/generate-history-event-details';
 import { type EventDetailsTabContent } from '../workflow-history-group-details/workflow-history-group-details.types';
+import { type HistoryEventsGroup } from '../workflow-history-v2.types';
 
 export default function generateHistoryGroupDetails(
   eventGroup: HistoryEventsGroup
diff --git a/src/views/workflow-history-v2/helpers/get-navigation-bar-events-menu-items.ts b/src/views/workflow-history-v2/helpers/get-navigation-bar-events-menu-items.ts
@@ -1,8 +1,9 @@
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
-
 import getEventGroupFilteringType from '../workflow-history-event-group/helpers/get-event-group-filtering-type';
 import { type NavigationBarEventsMenuItem } from '../workflow-history-navigation-bar-events-menu/workflow-history-navigation-bar-events-menu.types';
-import { type EventGroupEntry } from '../workflow-history-v2.types';
+import {
+  type HistoryEventsGroup,
+  type EventGroupEntry,
+} from '../workflow-history-v2.types';
 
 export default function getNavigationBarEventsMenuItems(
   eventGroupsEntries: Array<EventGroupEntry>,
diff --git a/src/views/workflow-history-v2/hooks/__tests__/use-group-details-entries.test.tsx b/src/views/workflow-history-v2/hooks/__tests__/use-group-details-entries.test.tsx
@@ -1,10 +1,10 @@
 import { renderHook } from '@/test-utils/rtl';
 
 import { mockActivityEventGroup } from '@/views/workflow-history/__fixtures__/workflow-history-event-groups';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
-import type { EventDetailsTabContent } from '@/views/workflow-history-v2/workflow-history-group-details/workflow-history-group-details.types';
 
 import * as generateHistoryGroupDetailsModule from '../../helpers/generate-history-group-details';
+import type { EventDetailsTabContent } from '../../workflow-history-group-details/workflow-history-group-details.types';
+import { type HistoryEventsGroup } from '../../workflow-history-v2.types';
 import useGroupDetailsEntries from '../use-group-details-entries';
 
 jest.mock('../../helpers/generate-history-group-details');
diff --git a/src/views/workflow-history-v2/hooks/use-group-details-entries.ts b/src/views/workflow-history-v2/hooks/use-group-details-entries.ts
@@ -1,9 +1,8 @@
 import { useMemo } from 'react';
 
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
-
 import generateHistoryGroupDetails from '../helpers/generate-history-group-details';
 import getSummaryTabContentEntry from '../helpers/get-summary-tab-content-entry';
+import { type HistoryEventsGroup } from '../workflow-history-v2.types';
 
 export default function useGroupDetailsEntries(eventGroup: HistoryEventsGroup) {
   const { groupDetailsEntries, summaryDetailsEntries } = useMemo(
diff --git a/src/views/workflow-history-v2/workflow-history-details-row/__tests__/workflow-history-details-row.test.tsx b/src/views/workflow-history-v2/workflow-history-details-row/__tests__/workflow-history-details-row.test.tsx
@@ -30,6 +30,7 @@ jest.mock('../helpers/get-parsed-details-row-items', () =>
           ),
           invertTooltipColors: acc.length === 1, // Second item has inverted tooltip
           omitWrapping: acc.length === 2, // Third item omits wrapping
+          hasClickableContent: acc.length === 0, // First item has clickable content
         });
       }
       return acc;
@@ -114,22 +115,52 @@ describe(WorkflowHistoryDetailsRow.name, () => {
     expect(await screen.findByTestId('tooltip-field1')).toBeInTheDocument();
     expect(screen.getByText('field1')).toBeInTheDocument();
   });
+
+  it('should stop click event propagation when hasClickableContent is true', async () => {
+    const onParentClick = jest.fn();
+    const { user } = setup({
+      wrapper: ({ children }) => <div onClick={onParentClick}>{children}</div>,
+    });
+
+    // field1 has hasClickableContent: true
+    const field1 = screen.getByTestId('field-field1');
+    await user.click(field1);
+
+    expect(onParentClick).not.toHaveBeenCalled();
+  });
+
+  it('should allow click event propagation when hasClickableContent is false', async () => {
+    const onParentClick = jest.fn();
+    const { user } = setup({
+      wrapper: ({ children }) => <div onClick={onParentClick}>{children}</div>,
+    });
+
+    // field2 does not have hasClickableContent: true
+    const field2 = screen.getByTestId('field-field2');
+    await user.click(field2);
+
+    expect(onParentClick).toHaveBeenCalled();
+  });
 });
 
 function setup({
   detailsEntries = mockDetailsEntries,
   workflowPageParams = mockWorkflowPageParams,
+  wrapper,
 }: {
   detailsEntries?: EventDetailsEntries;
   workflowPageParams?: WorkflowPageParams;
+  wrapper?: React.ComponentType<{ children: React.ReactNode }>;
 } = {}) {
   const user = userEvent.setup();
 
   const renderResult = render(
     <WorkflowHistoryDetailsRow
       detailsEntries={detailsEntries}
       {...workflowPageParams}
-    />
+    />,
+    undefined,
+    { wrapper }
   );
 
   return { user, ...renderResult };
diff --git a/src/views/workflow-history-v2/workflow-history-details-row/helpers/__tests__/get-parsed-details-row-items.test.ts b/src/views/workflow-history-v2/workflow-history-details-row/helpers/__tests__/get-parsed-details-row-items.test.ts
@@ -1,6 +1,5 @@
-import { type EventDetailsEntries } from '@/views/workflow-history-v2/workflow-history-event-details/workflow-history-event-details.types';
-
 import * as workflowHistoryDetailsRowParsersConfigModule from '../../../config/workflow-history-details-row-parsers.config';
+import { type EventDetailsEntries } from '../../../workflow-history-event-details/workflow-history-event-details.types';
 import { type DetailsRowItemParser } from '../../workflow-history-details-row.types';
 import getParsedDetailsRowItems from '../get-parsed-details-row-items';
 
diff --git a/src/views/workflow-history-v2/workflow-history-details-row/helpers/get-parsed-details-row-items.ts b/src/views/workflow-history-v2/workflow-history-details-row/helpers/get-parsed-details-row-items.ts
@@ -51,6 +51,7 @@ export default function getParsedDetailsRowItems(
       renderTooltip: parserConfig?.customTooltipContent ?? (() => label),
       invertTooltipColors: parserConfig?.invertTooltipColors,
       omitWrapping: parserConfig?.omitWrapping,
+      hasClickableContent: parserConfig?.hasClickableContent,
     });
 
     return acc;
diff --git a/src/views/workflow-history-v2/workflow-history-details-row/workflow-history-details-row.tsx b/src/views/workflow-history-v2/workflow-history-details-row/workflow-history-details-row.tsx
@@ -58,6 +58,12 @@ export default function WorkflowHistoryDetailsRow({
             <styled.DetailsFieldContainer
               $isNegative={isNegative}
               $omitWrapping={item.omitWrapping ?? false}
+              {...(item.hasClickableContent
+                ? {
+                    onClick: (e: React.MouseEvent<HTMLDivElement>) =>
+                      e.stopPropagation(),
+                  }
+                : {})}
             >
               {item.icon && <item.icon size={12} />}
               <item.renderValue
diff --git a/src/views/workflow-history-v2/workflow-history-details-row/workflow-history-details-row.types.ts b/src/views/workflow-history-v2/workflow-history-details-row/workflow-history-details-row.types.ts
@@ -51,6 +51,8 @@ export type DetailsRowItemParser = {
   invertTooltipColors?: boolean;
   /** Optional flag to remove padding and background from the details row item */
   omitWrapping?: boolean;
+  /** Optional flag to stop click event propagation if the item has clickable content */
+  hasClickableContent?: boolean;
 };
 
 export type DetailsRowItem = {
@@ -65,6 +67,7 @@ export type DetailsRowItem = {
   renderTooltip: ComponentType<DetailsRowValueComponentProps>;
   invertTooltipColors?: boolean;
   omitWrapping?: boolean;
+  hasClickableContent?: boolean;
 };
 
 export type Props = {
diff --git a/src/views/workflow-history-v2/workflow-history-event-group-duration/workflow-history-event-group-duration.types.ts b/src/views/workflow-history-v2/workflow-history-event-group-duration/workflow-history-event-group-duration.types.ts
@@ -1,5 +1,6 @@
 import { type WorkflowExecutionCloseStatus } from '@/__generated__/proto-ts/uber/cadence/api/v1/WorkflowExecutionCloseStatus';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
+
+import { type HistoryEventsGroup } from '../workflow-history-v2.types';
 
 export type Props = {
   startTime: number | null | undefined;
diff --git a/src/views/workflow-history-v2/workflow-history-event-group/__tests__/workflow-history-event-group.test.tsx b/src/views/workflow-history-v2/workflow-history-event-group/__tests__/workflow-history-event-group.test.tsx
@@ -12,12 +12,12 @@ import {
 import type WorkflowHistoryEventStatusBadge from '@/views/workflow-history/workflow-history-event-status-badge/workflow-history-event-status-badge';
 import type WorkflowHistoryGroupLabel from '@/views/workflow-history/workflow-history-group-label/workflow-history-group-label';
 import type WorkflowHistoryTimelineResetButton from '@/views/workflow-history/workflow-history-timeline-reset-button/workflow-history-timeline-reset-button';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
 import * as generateHistoryGroupDetailsModule from '../../helpers/generate-history-group-details';
 import type { EventDetailsEntries } from '../../workflow-history-event-details/workflow-history-event-details.types';
 import type WorkflowHistoryGroupDetails from '../../workflow-history-group-details/workflow-history-group-details';
 import type { GroupDetailsEntries } from '../../workflow-history-group-details/workflow-history-group-details.types';
+import { type HistoryEventsGroup } from '../../workflow-history-v2.types';
 import WorkflowHistoryEventGroup from '../workflow-history-event-group';
 import type { Props } from '../workflow-history-event-group.types';
 
diff --git a/src/views/workflow-history-v2/workflow-history-event-group/helpers/get-event-group-filtering-type.ts b/src/views/workflow-history-v2/workflow-history-event-group/helpers/get-event-group-filtering-type.ts
@@ -1,6 +1,7 @@
 import workflowHistoryFiltersTypeConfig from '@/views/workflow-history/config/workflow-history-filters-type.config';
 import { type WorkflowHistoryEventFilteringType } from '@/views/workflow-history/workflow-history-filters-type/workflow-history-filters-type.types';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
+
+import { type HistoryEventsGroup } from '../../workflow-history-v2.types';
 
 // TODO @adhitya.mamallan - revisit this when we write the new grouping logic
 function getEventGroupFilteringType(
diff --git a/src/views/workflow-history-v2/workflow-history-event-group/workflow-history-event-group.types.ts b/src/views/workflow-history-v2/workflow-history-event-group/workflow-history-event-group.types.ts
@@ -1,7 +1,9 @@
 import { type WorkflowExecutionCloseStatus } from '@/__generated__/proto-ts/uber/cadence/api/v1/WorkflowExecutionCloseStatus';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
-import { type Props as WorkflowHistoryProps } from '../workflow-history-v2.types';
+import {
+  type HistoryEventsGroup,
+  type Props as WorkflowHistoryProps,
+} from '../workflow-history-v2.types';
 
 export type Props = {
   // Core data props
diff --git a/src/views/workflow-history-v2/workflow-history-filters-menu/workflow-history-filters-menu.tsx b/src/views/workflow-history-v2/workflow-history-filters-menu/workflow-history-filters-menu.tsx
@@ -2,9 +2,8 @@ import { Button } from 'baseui/button';
 import { Filter } from 'baseui/icon';
 import { MdReplay } from 'react-icons/md';
 
-import { type WorkflowHistoryFilterConfig } from '@/views/workflow-history/workflow-history.types';
-
 import workflowHistoryFiltersConfig from '../config/workflow-history-filters.config';
+import { type WorkflowHistoryFilterConfig } from '../workflow-history-v2.types';
 
 import { styled } from './workflow-history-filters-menu.styles';
 import { type Props } from './workflow-history-filters-menu.types';
diff --git a/src/views/workflow-history-v2/workflow-history-grouped-table/__tests__/workflow-history-grouped-table.test.tsx b/src/views/workflow-history-v2/workflow-history-grouped-table/__tests__/workflow-history-grouped-table.test.tsx
@@ -7,10 +7,10 @@ import { render, screen, userEvent } from '@/test-utils/rtl';
 import { type WorkflowExecutionCloseStatus } from '@/__generated__/proto-ts/uber/cadence/api/v1/WorkflowExecutionCloseStatus';
 import { RequestError } from '@/utils/request/request-error';
 import { mockActivityEventGroup } from '@/views/workflow-history/__fixtures__/workflow-history-event-groups';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 import { type WorkflowPageTabContentParams } from '@/views/workflow-page/workflow-page-tab-content/workflow-page-tab-content.types';
 
 import type WorkflowHistoryTableFooter from '../../workflow-history-table-footer/workflow-history-table-footer';
+import { type HistoryEventsGroup } from '../../workflow-history-v2.types';
 import WorkflowHistoryGroupedTable from '../workflow-history-grouped-table';
 
 jest.mock<typeof WorkflowHistoryTableFooter>(
diff --git a/src/views/workflow-history-v2/workflow-history-grouped-table/workflow-history-grouped-table.types.ts b/src/views/workflow-history-v2/workflow-history-grouped-table/workflow-history-grouped-table.types.ts
@@ -4,9 +4,11 @@ import { type VirtuosoHandle } from 'react-virtuoso';
 
 import { type WorkflowExecutionCloseStatus } from '@/__generated__/proto-ts/uber/cadence/api/v1/WorkflowExecutionCloseStatus';
 import { type RequestError } from '@/utils/request/request-error';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
-import { type Props as WorkflowHistoryV2Props } from '../workflow-history-v2.types';
+import {
+  type HistoryEventsGroup,
+  type Props as WorkflowHistoryV2Props,
+} from '../workflow-history-v2.types';
 
 export type Props = {
   eventGroupsById: Array<[string, HistoryEventsGroup]>;
diff --git a/src/views/workflow-history-v2/workflow-history-header/__tests__/workflow-history-header.test.tsx b/src/views/workflow-history-v2/workflow-history-header/__tests__/workflow-history-header.test.tsx
@@ -16,7 +16,7 @@ jest.mock(
 );
 
 jest.mock(
-  '@/views/workflow-history-v2/workflow-history-filters-menu/workflow-history-filters-menu',
+  '../../workflow-history-filters-menu/workflow-history-filters-menu',
   () =>
     jest.fn(() => (
       <div data-testid="workflow-history-filters-menu">Filters Menu</div>
diff --git a/src/views/workflow-history-v2/workflow-history-header/workflow-history-header.tsx b/src/views/workflow-history-v2/workflow-history-header/workflow-history-header.tsx
@@ -9,8 +9,8 @@ import { useInView } from 'react-intersection-observer';
 
 import PageSection from '@/components/page-section/page-section';
 import WorkflowHistoryExportJsonButton from '@/views/workflow-history/workflow-history-export-json-button/workflow-history-export-json-button';
-import WorkflowHistoryFiltersMenu from '@/views/workflow-history-v2/workflow-history-filters-menu/workflow-history-filters-menu';
 
+import WorkflowHistoryFiltersMenu from '../workflow-history-filters-menu/workflow-history-filters-menu';
 import WorkflowHistorySwitchToV1Button from '../workflow-history-switch-to-v1-button/workflow-history-switch-to-v1-button';
 import WorkflowHistoryTimeline from '../workflow-history-timeline/workflow-history-timeline';
 
diff --git a/src/views/workflow-history-v2/workflow-history-header/workflow-history-header.types.ts b/src/views/workflow-history-v2/workflow-history-header/workflow-history-header.types.ts
@@ -5,10 +5,12 @@ import {
   type PageQueryParamValues,
 } from '@/hooks/use-page-query-params/use-page-query-params.types';
 import { type Props as WorkflowHistoryExportJsonButtonProps } from '@/views/workflow-history/workflow-history-export-json-button/workflow-history-export-json-button.types';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
 import type workflowPageQueryParamsConfig from '../../workflow-page/config/workflow-page-query-params.config';
-import { type Props as WorkflowHistoryProps } from '../workflow-history-v2.types';
+import {
+  type HistoryEventsGroup,
+  type Props as WorkflowHistoryProps,
+} from '../workflow-history-v2.types';
 
 type WorkflowPageQueryParamsConfig = typeof workflowPageQueryParamsConfig;
 
diff --git a/src/views/workflow-history-v2/workflow-history-timeline-event-group/__tests__/workflow-history-timeline-event-group.test.tsx b/src/views/workflow-history-v2/workflow-history-timeline-event-group/__tests__/workflow-history-timeline-event-group.test.tsx
@@ -1,9 +1,9 @@
 import { render, screen } from '@/test-utils/rtl';
 
 import { mockActivityEventGroup } from '@/views/workflow-history/__fixtures__/workflow-history-event-groups';
-import type WorkflowHistoryGroupDetails from '@/views/workflow-history-v2/workflow-history-group-details/workflow-history-group-details';
 
 import * as generateHistoryGroupDetailsModule from '../../helpers/generate-history-group-details';
+import type WorkflowHistoryGroupDetails from '../../workflow-history-group-details/workflow-history-group-details';
 import WorkflowHistoryTimelineEventGroup from '../workflow-history-timeline-event-group';
 import { type Props } from '../workflow-history-timeline-event-group.types';
 
diff --git a/src/views/workflow-history-v2/workflow-history-timeline-event-group/workflow-history-timeline-event-group.types.ts b/src/views/workflow-history-v2/workflow-history-timeline-event-group/workflow-history-timeline-event-group.types.ts
@@ -1,6 +1,7 @@
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
-
-import { type Props as WorkflowHistoryProps } from '../workflow-history-v2.types';
+import {
+  type HistoryEventsGroup,
+  type Props as WorkflowHistoryProps,
+} from '../workflow-history-v2.types';
 
 export type Props = {
   eventGroup: HistoryEventsGroup;
diff --git a/src/views/workflow-history-v2/workflow-history-timeline/helpers/get-timeline-row-from-event-group.ts b/src/views/workflow-history-v2/workflow-history-timeline/helpers/get-timeline-row-from-event-group.ts
@@ -1,7 +1,7 @@
 import parseGrpcTimestamp from '@/utils/datetime/parse-grpc-timestamp';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
 import getEventGroupFilteringType from '../../workflow-history-event-group/helpers/get-event-group-filtering-type';
+import { type HistoryEventsGroup } from '../../workflow-history-v2.types';
 import { type TimelineRow } from '../workflow-history-timeline.types';
 
 export default function getTimelineRowFromEventGroup(
diff --git a/src/views/workflow-history-v2/workflow-history-timeline/workflow-history-timeline.types.ts b/src/views/workflow-history-v2/workflow-history-timeline/workflow-history-timeline.types.ts
@@ -1,9 +1,9 @@
 import { type VirtuosoHandle } from 'react-virtuoso';
 
 import { type WorkflowHistoryEventFilteringType } from '@/views/workflow-history/workflow-history-filters-type/workflow-history-filters-type.types';
-import { type HistoryEventsGroup } from '@/views/workflow-history/workflow-history.types';
 
 import {
+  type HistoryEventsGroup,
   type EventGroupEntry,
   type Props as WorkflowHistoryProps,
 } from '../workflow-history-v2.types';
diff --git a/src/views/workflow-history-v2/workflow-history-ungrouped-event/__tests__/workflow-history-ungrouped-event.test.tsx b/src/views/workflow-history-v2/workflow-history-ungrouped-event/__tests__/workflow-history-ungrouped-event.test.tsx
diff --git a/src/views/workflow-history-v2/workflow-history-ungrouped-table/helpers/__tests__/compare-ungrouped-events.test.ts b/src/views/workflow-history-v2/workflow-history-ungrouped-table/helpers/__tests__/compare-ungrouped-events.test.ts
diff --git a/src/views/workflow-history-v2/workflow-history-ungrouped-table/workflow-history-ungrouped-table.types.ts b/src/views/workflow-history-v2/workflow-history-ungrouped-table/workflow-history-ungrouped-table.types.ts
diff --git a/src/views/workflow-history-v2/workflow-history-v2.types.ts b/src/views/workflow-history-v2/workflow-history-v2.types.ts
