api updates

Author: anastasiya1155

client/src/components/CodeBlock/CodeFull/CodeContainer.tsx

@@ -3,6 +3,7 @@ import React, {
   memo,
   SetStateAction,
   useCallback,
+  useContext,
   useMemo,
   useState,
 } from 'react';
@@ -12,6 +13,7 @@ import { Range, TokenInfoItem, TokenInfoWrapped } from '../../../types/results';
 import { getTokenInfo } from '../../../services/api';
 import { mapTokenInfoData } from '../../../mappers/results';
 import { MAX_LINES_BEFORE_VIRTUALIZE } from '../../../consts/code';
+import { SearchContext } from '../../../context/searchContext';
 import CodeContainerVirtualized from './CodeContainerVirtualized';
 import CodeContainerFull from './CodeContainerFull';
 import { Metadata, BlameLine } from './index';
@@ -55,6 +57,7 @@ const CodeContainer = ({
     byteRange: null,
     lineNumber: -1,
   });
+  const { selectedBranch } = useContext(SearchContext);
 
   const getHoverableContent = useCallback(
     (hoverableRange: Range, lineNumber?: number) => {
@@ -64,6 +67,7 @@ const CodeContainer = ({
           repoPath,
           hoverableRange.start,
           hoverableRange.end,
+          selectedBranch ? selectedBranch : undefined,
         ).then((data) => {
           setTokenInfo({
             ...mapTokenInfoData(data),
@@ -73,7 +77,7 @@ const CodeContainer = ({
         });
       }
     },
-    [relativePath],
+    [relativePath, selectedBranch],
   );
 
   const handleRefsDefsClick = useCallback(

client/src/components/PageTemplate/Subheader.tsx

@@ -97,7 +97,13 @@ const Subheader = () => {
         {allBranches.length > 1 && (
           <DropdownNormal
             items={[
-              { type: MenuItemType.DEFAULT, text: 'All branches' },
+              {
+                type: MenuItemType.DEFAULT,
+                text: 'All branches',
+                onClick: () => {
+                  setSelectedBranch(null);
+                },
+              },
             ].concat(
               allBranches.map((b) => ({
                 type: MenuItemType.DEFAULT,

client/src/pages/ResultFull/index.tsx

@@ -1,4 +1,10 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
 import * as Sentry from '@sentry/react';
 import FileIcon from '../../components/FileIcon';
 import Breadcrumbs from '../../components/Breadcrumbs';
@@ -19,6 +25,7 @@ import { FileTreeFileType } from '../../types';
 import { getFileName } from '../../utils/file';
 import FileMenu from '../../components/FileMenu';
 import SkeletonItem from '../../components/SkeletonItem';
+import { SearchContext } from '../../context/searchContext';
 
 type Props = {
   data: any;
@@ -40,6 +47,7 @@ const ResultFull = ({ data, isLoading }: Props) => {
   const [isShareOpen, setShareOpen] = useState(false);
   const { navigateFullResult, navigateRepoPath } = useAppNavigation();
   const [result, setResult] = useState<FullResult | null>(null);
+  const { selectedBranch } = useContext(SearchContext);
 
   useEffect(() => {
     if (!data || data?.data?.[0]?.kind !== 'file') {
@@ -66,13 +74,17 @@ const ResultFull = ({ data, isLoading }: Props) => {
       },
     });
     setResult(mappedResult);
-    getHoverables(item.data.relative_path, item.data.repo_ref).then((data) => {
+    getHoverables(
+      item.data.relative_path,
+      item.data.repo_ref,
+      selectedBranch ? selectedBranch : undefined,
+    ).then((data) => {
       setResult((prevState) => ({
         ...prevState!,
         hoverableRanges: mapRanges(data.ranges),
       }));
     });
-  }, [data, isLoading]);
+  }, [data, isLoading, selectedBranch]);
 
   const navigateTo = useCallback(
     (path: string, isFile: boolean) => {

client/src/pages/ResultModal/FileModalContainer.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { FullResult } from '../../types/results';
 import { useSearch } from '../../hooks/useSearch';
@@ -7,6 +7,7 @@ import { FullResultModeEnum } from '../../types/general';
 import { mapFileResult, mapRanges } from '../../mappers/results';
 import { getHoverables } from '../../services/api';
 import { buildRepoQuery } from '../../utils';
+import { SearchContext } from '../../context/searchContext';
 import ResultModal from './index';
 
 type Props = {
@@ -31,6 +32,7 @@ const FileModalContainer = ({
   const { searchQuery: fileModalSearchQuery, data: fileResultData } =
     useSearch<FileSearchResponse>();
   const navigateBrowser = useNavigate();
+  const { selectedBranch } = useContext(SearchContext);
 
   useEffect(() => {
     if (isOpen) {
@@ -52,14 +54,15 @@ const FileModalContainer = ({
       getHoverables(
         fileResultData.data[0].data.relative_path,
         fileResultData.data[0].data.repo_ref,
+        selectedBranch ? selectedBranch : undefined,
       ).then((data) => {
         setOpenResult((prevState) => ({
           ...prevState!,
           hoverableRanges: mapRanges(data.ranges),
         }));
       });
     }
-  }, [fileResultData]);
+  }, [fileResultData, selectedBranch]);
 
   const handleModeChange = useCallback((m: FullResultModeEnum) => {
     setMode(m);

client/src/pages/Results/index.tsx

@@ -49,7 +49,7 @@ const ResultsPage = ({ resultsData, loading }: Props) => {
   const [scrollToLine, setScrollToLine] = useState<string | undefined>(
     undefined,
   );
-  const { filters, setFilters, inputValue, globalRegex } =
+  const { filters, setFilters, inputValue, globalRegex, selectedBranch } =
     useContext(SearchContext);
   const { setSymbolsCollapsed } = useContext(UIContext);
   const { navigateSearch, navigateRepoPath } = useAppNavigation();
@@ -135,14 +135,15 @@ const ResultsPage = ({ resultsData, loading }: Props) => {
       getHoverables(
         fileResultData.data[0].data.relative_path,
         fileResultData.data[0].data.repo_ref,
+        selectedBranch ? selectedBranch : undefined,
       ).then((data) => {
         setOpenResult((prevState) => ({
           ...prevState!,
           hoverableRanges: mapRanges(data.ranges),
         }));
       });
     }
-  }, [fileResultData]);
+  }, [fileResultData, selectedBranch]);
 
   return (
     <>

client/src/services/api.ts

@@ -75,10 +75,11 @@ export const nlSearch = (
 export const getHoverables = async (
   path: string,
   repoId: string,
+  branch?: string,
 ): Promise<HoverablesResponse> => {
   try {
     const { data } = await http.get('/hoverable', {
-      params: { relative_path: path, repo_ref: repoId },
+      params: { relative_path: path, repo_ref: repoId, branch },
     });
     return data;
   } catch (e) {
@@ -91,6 +92,7 @@ export const getTokenInfo = async (
   repoRef: string,
   start: number,
   end: number,
+  branch?: string,
 ): Promise<TokenInfoResponse> => {
   return http
     .get('/token-info', {
@@ -99,6 +101,7 @@ export const getTokenInfo = async (
         repo_ref: repoRef,
         start,
         end,
+        branch,
       },
     })
     .then((r) => r.data);