Add presentation and methodologies filters

codiumkg · May 26, 2024 · 4e6ac6c · 4e6ac6c
1 parent 37f97d3
commit 4e6ac6c
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 18 deletions.
diff --git a/src/interfaces/methodology.ts b/src/interfaces/methodology.ts
@@ -10,3 +10,7 @@ export interface IMethodologyCreate {
   filePath: string;
   topicId: number;
 }
+
+export interface IMethodologyFilters {
+  topicId?: number | null;
+}
diff --git a/src/interfaces/presentation.ts b/src/interfaces/presentation.ts
@@ -10,3 +10,7 @@ export interface IPresentationCreate {
   filePath: string;
   topicId: number;
 }
+
+export interface IPresentationFilters {
+  topicId?: number | null;
+}
diff --git a/src/pages/methodologies/MethodologiesPage.tsx b/src/pages/methodologies/MethodologiesPage.tsx
@@ -1,13 +1,17 @@
 import ResourceList from "@/components/shared/ResourceList/ResourceList";
 import MethodologiesTable from "./components/MethodologiesTable";
 import { useMethodologies } from "@/queries/methodologies";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 import { ROUTES } from "@/constants/routes";
 
 function MethodologiesPage() {
   const navigate = useNavigate();
 
-  const { methodologies, isMethodologiesLoading } = useMethodologies();
+  const [searchParams] = useSearchParams();
+
+  const { methodologies, isMethodologiesLoading } = useMethodologies({
+    topicId: Number(searchParams.get("topicId")),
+  });
 
   return (
     <ResourceList

diff --git a/src/pages/presentations/PresentationsPage.tsx b/src/pages/presentations/PresentationsPage.tsx
@@ -1,13 +1,17 @@
 import ResourceList from "@/components/shared/ResourceList/ResourceList";
 import PresentationsTable from "./components/PresentationsTable";
 import { usePresentations } from "@/queries/presentations";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 import { ROUTES } from "@/constants/routes";
 
 function PresentationsPage() {
   const navigate = useNavigate();
 
-  const { presentations, isPresentationsLoading } = usePresentations();
+  const [searchParams] = useSearchParams();
+
+  const { presentations, isPresentationsLoading } = usePresentations({
+    topicId: Number(searchParams.get("topicId")),
+  });
 
   return (
     <ResourceList

diff --git a/src/queries/methodologies.ts b/src/queries/methodologies.ts
@@ -1,5 +1,8 @@
 import { QUERY_KEYS } from "@/constants/queryKeys";
-import { IMethodologyCreate } from "@/interfaces/methodology";
+import {
+  IMethodologyCreate,
+  IMethodologyFilters,
+} from "@/interfaces/methodology";
 import {
   createMethodology,
   deleteMethodology,
@@ -9,10 +12,10 @@ import {
 } from "@/requests/methodologies";
 import { useMutation, useQuery } from "@tanstack/react-query";
 
-export const useMethodologies = () => {
+export const useMethodologies = (filters?: IMethodologyFilters) => {
   const { data, isLoading } = useQuery({
-    queryKey: [QUERY_KEYS.METHODOLOGIES],
-    queryFn: getMethodologies,
+    queryKey: [QUERY_KEYS.METHODOLOGIES, filters?.topicId],
+    queryFn: () => getMethodologies(filters),
   });
 
   return {

diff --git a/src/queries/presentations.ts b/src/queries/presentations.ts
@@ -1,5 +1,8 @@
 import { QUERY_KEYS } from "@/constants/queryKeys";
-import { IPresentationCreate } from "@/interfaces/presentation";
+import {
+  IPresentationCreate,
+  IPresentationFilters,
+} from "@/interfaces/presentation";
 import {
   createPresentation,
   deletePresentation,
@@ -9,10 +12,10 @@ import {
 } from "@/requests/presentations";
 import { useMutation, useQuery } from "@tanstack/react-query";
 
-export const usePresentations = () => {
+export const usePresentations = (filters?: IPresentationFilters) => {
   const { data, isLoading } = useQuery({
-    queryKey: [QUERY_KEYS.PRESENTATIONS],
-    queryFn: getPresentations,
+    queryKey: [QUERY_KEYS.PRESENTATIONS, filters?.topicId],
+    queryFn: () => getPresentations(filters),
   });
 
   return {

diff --git a/src/requests/methodologies.ts b/src/requests/methodologies.ts
@@ -1,9 +1,21 @@
 import { API_METHODOLOGIES } from "@/constants/apiConstants";
 import { request } from "./request";
-import { IMethodology, IMethodologyCreate } from "@/interfaces/methodology";
+import {
+  IMethodology,
+  IMethodologyCreate,
+  IMethodologyFilters,
+} from "@/interfaces/methodology";
 
-export async function getMethodologies(): Promise<IMethodology[]> {
-  return request.get(API_METHODOLOGIES).then(({ data }) => data);
+export async function getMethodologies(
+  filters?: IMethodologyFilters
+): Promise<IMethodology[]> {
+  return request
+    .get(API_METHODOLOGIES, {
+      params: {
+        ...(filters?.topicId && { topicId: filters.topicId }),
+      },
+    })
+    .then(({ data }) => data);
 }
 
 export async function getMethodologyDetails(id: number): Promise<IMethodology> {

diff --git a/src/requests/presentations.ts b/src/requests/presentations.ts
@@ -1,9 +1,21 @@
 import { API_PRESENTATIONS } from "@/constants/apiConstants";
 import { request } from "./request";
-import { IPresentation, IPresentationCreate } from "@/interfaces/presentation";
+import {
+  IPresentation,
+  IPresentationCreate,
+  IPresentationFilters,
+} from "@/interfaces/presentation";
 
-export async function getPresentations(): Promise<IPresentation[]> {
-  return request.get(API_PRESENTATIONS).then(({ data }) => data);
+export async function getPresentations(
+  filters?: IPresentationFilters
+): Promise<IPresentation[]> {
+  return request
+    .get(API_PRESENTATIONS, {
+      params: {
+        ...(filters?.topicId && { topicId: filters.topicId }),
+      },
+    })
+    .then(({ data }) => data);
 }
 
 export async function getPresentationDetails(