Set method id to the search on Hotspot code lens navigation (#1354)

* Set method id to the search on Hotspot code lens navigation

* Clear recent activity data on backend change, fix navigation from code lens

Author: kshmidt-digma

dependencies.json

@@ -1,5 +1,5 @@
 {
-  "jetBrainsPluginVersion": "2.0.411",
+  "jetBrainsPluginVersion": "2.0.414",
   "visualStudioExtensionVersion": "1.2.11",
   "jaegerUIVersion": "1.29.1-digma.1.2.0",
   "jaegerVersion": "1.45.0"

src/components/Main/index.tsx

@@ -45,6 +45,10 @@ const getURLToNavigateOnCodeLensClick = (scope: Scope): string | undefined => {
     return;
   }
 
+  if (codeLens.lensTitle.toLocaleLowerCase().includes("error hotspot")) {
+    return `/${TAB_IDS.ERRORS}`;
+  }
+
   if (codeLens.importance <= 4) {
     return `/${TAB_IDS.ISSUES}`;
   }

src/components/RecentActivity/index.tsx

@@ -174,18 +174,6 @@ export const RecentActivity = () => {
     );
   }, [recentActivityData.environments]);
 
-  useEffect(() => {
-    if (!config.userInfo?.id && config.backendInfo?.centralize) {
-      void toggleRecentIndicator({
-        status: false
-      });
-    }
-  }, [
-    config.backendInfo?.centralize,
-    config.userInfo?.id,
-    toggleRecentIndicator
-  ]);
-
   useEffect(() => {
     const isAnyRecentActivity = environments.some(
       (environment) => environment.hasRecentActivity

src/components/RecentActivity/useRecentActivityData.ts

@@ -1,12 +1,18 @@
-import { useEffect, useState } from "react";
+import { useCallback, useContext, useEffect, useState } from "react";
+import { useRecentActivityDispatch } from "../../containers/RecentActivity/hooks";
+import { usePrevious } from "../../hooks/usePrevious";
 import {
+  digmaApi,
   useGetEnvironmentsQuery,
   useGetRecentActivityQuery
 } from "../../redux/services/digma";
+import { useToggleRecentIndicatorMutation } from "../../redux/services/plugin";
 import type {
   Environment,
   RecentActivityEntry
 } from "../../redux/services/types";
+import { areBackendInfosEqual } from "../../utils/areBackendInfosEqual";
+import { ConfigContext } from "../common/App/ConfigContext";
 
 const REFRESH_INTERVAL = 10 * 1000; // in milliseconds
 
@@ -18,6 +24,11 @@ interface RecentActivityData {
 }
 
 export const useRecentActivityData = (environmentId: string | undefined) => {
+  const { backendInfo, userInfo } = useContext(ConfigContext);
+  const previousBackendInfo = usePrevious(backendInfo);
+  const [toggleRecentIndicator] = useToggleRecentIndicatorMutation();
+  const dispatch = useRecentActivityDispatch();
+
   const [data, setData] = useState<RecentActivityData>({
     environments: undefined,
     entries: undefined,
@@ -27,7 +38,8 @@ export const useRecentActivityData = (environmentId: string | undefined) => {
 
   const { data: environments, isFetching: areEnvironmentsFetching } =
     useGetEnvironmentsQuery(undefined, {
-      pollingInterval: REFRESH_INTERVAL
+      pollingInterval: REFRESH_INTERVAL,
+      skip: !userInfo?.id && backendInfo?.centralize
     });
 
   const { data: recentActivityData, isFetching: isRecentActivityDataFetching } =
@@ -41,14 +53,43 @@ export const useRecentActivityData = (environmentId: string | undefined) => {
       }
     );
 
+  const clearData = useCallback(() => {
+    setData((prevData) => ({
+      ...prevData,
+      environments: undefined,
+      entries: undefined
+    }));
+    void toggleRecentIndicator({
+      status: false
+    });
+    dispatch(digmaApi.util.invalidateTags(["Environment", "RecentActivity"]));
+  }, [toggleRecentIndicator, dispatch]);
+
+  // Clear data on backend change
+  useEffect(() => {
+    if (
+      previousBackendInfo &&
+      backendInfo &&
+      !areBackendInfosEqual(previousBackendInfo, backendInfo)
+    ) {
+      clearData();
+    }
+  }, [previousBackendInfo, backendInfo, clearData]);
+
+  // Clear data on user change
+  useEffect(() => {
+    clearData();
+  }, [userInfo?.id, clearData]);
+
+  // Clear recent activity data on environment change
   useEffect(() => {
     if (environmentId) {
       setData((prevData) => ({
         ...prevData,
         entries: undefined
       }));
     }
-  }, [environmentId]);
+  }, [environmentId, dispatch]);
 
   useEffect(() => {
     setData((prevData) => ({

src/components/common/App/index.tsx

@@ -17,7 +17,10 @@ import { isNumber } from "../../../typeGuards/isNumber";
 import { isObject } from "../../../typeGuards/isObject";
 import { isString } from "../../../typeGuards/isString";
 import { sendErrorTrackingEvent } from "../../../utils/actions/sendErrorTrackingEvent";
-import { isScopeWithMetricsReportContext } from "../../Main/typeGuards";
+import {
+  isScopeWithCodeLensContext,
+  isScopeWithMetricsReportContext
+} from "../../Main/typeGuards";
 import { ErrorScreen } from "../ErrorScreen";
 import { ConfigContext } from "./ConfigContext";
 import { getStyledComponentsTheme } from "./getTheme";
@@ -29,6 +32,7 @@ import type {
   PersistedState,
   RunConfiguration,
   Scope,
+  ScopeWithCodeLensContext,
   UserInfo
 } from "./types";
 
@@ -102,7 +106,8 @@ export const App = ({ theme, children, id }: AppProps) => {
     setInsightsFilteredCriticalityLevels:
       setInsightsFilteredCriticalityLevelsInSpanScope,
     setInsightsFilteredCriticalityLevelsInGlobalScope,
-    setInsightsLastDays
+    setInsightsLastDays,
+    setGlobalErrorsSearch
   } = useStore.getState();
 
   const handleError = (error: Error, info: ErrorInfo) => {
@@ -309,11 +314,27 @@ export const App = ({ theme, children, id }: AppProps) => {
 
     const handleSetScope = (data: unknown) => {
       setConfig((config) => {
-        const scope = data as Scope;
+        let scope = data as Scope;
         const environment = scope.environmentId
           ? config.environments?.find((x) => x.id === scope.environmentId)
           : config.environment;
 
+        // Change scope to the global one if "Error Hotspot" code lens click is the trigger
+        if (
+          isScopeWithCodeLensContext(scope) &&
+          scope.context.payload.codeLens.lensTitle
+            .toLocaleLowerCase()
+            .includes("error hotspot")
+        ) {
+          const newScope: ScopeWithCodeLensContext = {
+            ...scope,
+            span: null
+          };
+          scope = newScope;
+
+          setGlobalErrorsSearch(newScope.context.payload.codeLens.codeMethod);
+        }
+
         setScope(scope);
         setEnvironment(environment ?? null);
 
@@ -642,7 +663,8 @@ export const App = ({ theme, children, id }: AppProps) => {
     setInsightsFilteredInsightTypesInGlobalScope,
     setInsightsFilteredCriticalityLevelsInSpanScope,
     setInsightsFilteredCriticalityLevelsInGlobalScope,
-    setInsightsLastDays
+    setInsightsLastDays,
+    setGlobalErrorsSearch
   ]);
 
   const styledComponentsTheme = getStyledComponentsTheme(

src/containers/RecentActivity/hooks.ts

@@ -0,0 +1,7 @@
+import { useDispatch, useSelector } from "react-redux";
+import type { RecentActivityDispatch, RecentActivityRootState } from "./store";
+
+export const useRecentActivityDispatch =
+  useDispatch.withTypes<RecentActivityDispatch>();
+export const useRecentActivitySelector =
+  useSelector.withTypes<RecentActivityRootState>();