From 3a90e2d13c52148bc39c2d13635845b0b38240a1 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:55:22 +0100
Subject: [PATCH] Tempo: Remove noop (#74207)

Remove noop
---
 .../features/explore/TraceView/TraceView.tsx   |  5 -----
 .../VirtualizedTraceView.test.tsx              |  1 -
 .../VirtualizedTraceView.tsx                   | 18 +-----------------
 .../TraceTimelineViewer/index.test.tsx         |  1 -
 .../components/TraceTimelineViewer/index.tsx   |  2 --
 5 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index fdba79cf86a..22bc6555ffd 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -48,10 +48,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
   `,
 });
 
-function noop(): {} {
-  return {};
-}
-
 type Props = {
   dataFrames: DataFrame[];
   splitOpenFn?: SplitOpen;
@@ -165,7 +161,6 @@ export function TraceView(props: Props) {
             updateViewRangeTime={updateViewRangeTime}
           />
           <TraceTimelineViewer
-            registerAccessors={noop}
             findMatchesIDs={spanFilterMatches}
             trace={traceProp}
             datasourceType={datasourceType}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
index 2e0010255e7..2ceddbfb0c6 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
@@ -37,7 +37,6 @@ let props = {
   detailTagsToggle: jest.fn(),
   detailToggle: jest.fn(),
   findMatchesIDs: null,
-  registerAccessors: jest.fn(),
   setSpanNameColumnWidth: jest.fn(),
   spanNameColumnWidth: 0.5,
   trace,
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
index 4bc7dca204d..a089ac8f201 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -22,7 +22,6 @@ import { GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { stylesFactory, withTheme2, ToolbarButton } from '@grafana/ui';
 
-import { Accessors } from '../ScrollManager';
 import { PEER_SERVICE } from '../constants/tag-keys';
 import { SpanBarOptions, SpanLinkFunc, TNil } from '../types';
 import TTraceTimeline from '../types/TTraceTimeline';
@@ -83,7 +82,6 @@ type TVirtualizedTraceViewOwnProps = {
   currentViewRangeTime: [number, number];
   timeZone: TimeZone;
   findMatchesIDs: Set<string> | TNil;
-  registerAccessors: (accesors: Accessors) => void;
   trace: Trace;
   spanBarOptions: SpanBarOptions | undefined;
   linksGetter: (span: TraceSpan, items: TraceKeyValuePair[], itemIndex: number) => TraceLink[];
@@ -219,17 +217,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   }
 
   componentDidUpdate(prevProps: Readonly<VirtualizedTraceViewProps>) {
-    const { registerAccessors } = prevProps;
-    const {
-      registerAccessors: nextRegisterAccessors,
-      headerHeight,
-      focusedSpanId,
-      focusedSpanIdForSearch,
-    } = this.props;
-
-    if (this.listView && registerAccessors !== nextRegisterAccessors) {
-      nextRegisterAccessors(this.getAccessors());
-    }
+    const { headerHeight, focusedSpanId, focusedSpanIdForSearch } = this.props;
 
     if (!this.hasScrolledToSpan) {
       this.scrollToSpan(headerHeight, focusedSpanId);
@@ -305,11 +293,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   };
 
   setListView = (listView: ListView | TNil) => {
-    const isChanged = this.listView !== listView;
     this.listView = listView;
-    if (listView && isChanged) {
-      this.props.registerAccessors(this.getAccessors());
-    }
   };
 
   // use long form syntax to avert flow error
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.test.tsx
index 0a7f4322438..f808228710b 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.test.tsx
@@ -49,7 +49,6 @@ describe('<TraceTimelineViewer>', () => {
     expandAll: jest.fn(),
     collapseAll: jest.fn(),
     expandOne: jest.fn(),
-    registerAccessors: jest.fn(),
     collapseOne: jest.fn(),
     theme: createTheme(),
     history: {
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
index cfcd661f908..fa9e36875d9 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
@@ -19,7 +19,6 @@ import { GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data';
 import { config, reportInteraction } from '@grafana/runtime';
 import { stylesFactory, withTheme2 } from '@grafana/ui';
 
-import { Accessors } from '../ScrollManager';
 import { autoColor } from '../Theme';
 import { merge as mergeShortcuts } from '../keyboard-shortcuts';
 import { SpanBarOptions } from '../settings/SpanBarSettings';
@@ -68,7 +67,6 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
 });
 
 export type TProps = {
-  registerAccessors: (accessors: Accessors) => void;
   findMatchesIDs: Set<string> | TNil;
   traceTimeline: TTraceTimeline;
   trace: Trace;