fix(dashboard): passing filters to api route

- passing filters to api route that handles history charts data Part of #264
kernelci · Oct 25, 2024 · ca3e989 · ca3e989
1 parent 217ea20
commit ca3e989
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/dashboard/src/api/TreeDetails.tsx b/dashboard/src/api/TreeDetails.tsx
@@ -62,6 +62,7 @@ const fetchTreeDetailData = async (
   return res.data;
 };
 
+/** @deprecated */
 const mapFiltersToUrlSearchParams = (
   filter: TTreeDetailsFilter | Record<string, never>,
 ): URLSearchParams => {
@@ -256,15 +257,19 @@ const fetchTreeCommitHistory = async (
   origin: string,
   gitUrl: string,
   gitBranch: string,
+  filters: TTreeDetailsFilter,
 ): Promise<TTreeCommitHistoryResponse> => {
+  // TODO: remove deprecated function
+  const searchParam = mapFiltersToUrlSearchParams(filters);
+
+  searchParam.append('origin', origin);
+  searchParam.append('git_url', gitUrl);
+  searchParam.append('git_branch', gitBranch);
+
   const res = await http.get<TTreeCommitHistoryResponse>(
     `/api/tree/${commitHash}/commits`,
     {
-      params: {
-        origin,
-        git_url: gitUrl,
-        git_branch: gitBranch,
-      },
+      params: searchParam,
     },
   );
   return res.data;
@@ -276,19 +281,36 @@ export const useTreeCommitHistory = (
     origin,
     gitUrl,
     gitBranch,
+    filter,
   }: {
     commitHash: string;
     origin: string;
     gitUrl: string;
     gitBranch: string;
+    filter: TTreeDetailsFilter;
   },
   { enabled = true },
 ): UseQueryResult<TTreeCommitHistoryResponse> => {
+  const testFilter = getTargetFilter(filter, 'test');
+  const treeDetailsFilter = getTargetFilter(filter, 'treeDetails');
+
+  const filters = {
+    ...treeDetailsFilter,
+    ...testFilter,
+  };
+
   return useQuery({
-    queryKey: ['treeCommitHistory', commitHash, origin, gitUrl, gitBranch],
+    queryKey: [
+      'treeCommitHistory',
+      commitHash,
+      origin,
+      gitUrl,
+      gitBranch,
+      filters,
+    ],
     enabled,
     queryFn: () =>
-      fetchTreeCommitHistory(commitHash, origin, gitUrl, gitBranch),
+      fetchTreeCommitHistory(commitHash, origin, gitUrl, gitBranch, filters),
   });
 };
 

diff --git a/dashboard/src/pages/TreeDetails/Tabs/CommitNavigationGraph.tsx b/dashboard/src/pages/TreeDetails/Tabs/CommitNavigationGraph.tsx
@@ -14,6 +14,7 @@ import type { TLineChartProps } from '@/components/LineChart/LineChart';
 import QuerySwitcher from '@/components/QuerySwitcher/QuerySwitcher';
 import { MessagesKey } from '@/locales/messages';
 import { formatDate } from '@/utils/utils';
+import { mapFilterToReq } from '@/pages/TreeDetails/TreeDetailsFilter';
 
 const graphDisplaySize = 7;
 
@@ -22,6 +23,7 @@ const CommitNavigationGraph = (): JSX.Element => {
   const {
     origin,
     currentTreeDetailsTab,
+    diffFilter,
     treeInfo: { gitUrl, gitBranch, headCommitHash },
   } = useSearch({ from: '/tree/$treeId/' });
 
@@ -33,12 +35,15 @@ const CommitNavigationGraph = (): JSX.Element => {
     from: '/tree/$treeId',
   });
 
+  const reqFilter = mapFilterToReq(diffFilter);
+
   const { data, status } = useTreeCommitHistory(
     {
       gitBranch: gitBranch ?? '',
       gitUrl: gitUrl ?? '',
       commitHash: headCommitHash ?? '',
       origin: origin,
+      filter: reqFilter,
     },
     {
       enabled: !!gitBranch && !!gitUrl,