Merge pull request #72 from isd-sgcu/pun/feat/implement-filter

fix: admin/filter not working and when filter not found log error cannot map null values
isd-sgcu · Feb 20, 2024 · 3588464 · 3588464
2 parents 2e6d974 + b02e5ea
commit 3588464
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app/admin/pets/page.tsx b/src/app/admin/pets/page.tsx
@@ -16,8 +16,6 @@ import PetsPageFallback from "@/components/Fallback/PetsPageFallback";
 import { usePetsQuery } from "@/hooks/queries/usePetsQuery";
 import AdminLayout from "@/layouts/AdminLayout";
 const Pets = () => {
- const { data, isLoading } = usePetsQuery();
-
  const [isOpenFilterPanel, setIsOpenFilterPanel] = useState(false);
 
  const toggleIsOpenFilterPanel = useCallback(() => {
@@ -37,6 +35,8 @@ const Pets = () => {
  maxAge: 30,
  });
 
+ const { data, isLoading } = usePetsQuery(filters);
+
  return (
  <>
  <div className="flex justify-between px-6 lg:block lg:px-12">
@@ -79,7 +79,7 @@ const Pets = () => {
  <PetsPageFallback />
  ) : (
  <div className="flex flex-wrap items-center justify-center gap-6 lg:gap-9">
- {data?.pets.map((pet: Pet) => (
+ {data?.pets?.map((pet: Pet) => (
  <PetCard
  key={pet.id}
  id={pet.id}

diff --git a/src/app/pets/page.tsx b/src/app/pets/page.tsx
@@ -31,7 +31,7 @@ const Pets = () => {
  maxAge: 30,
  });
 
- const { data, isLoading } = usePetsQuery(filters) || {};
+ const { data, isLoading } = usePetsQuery(filters);
 
  return (
  <>
@@ -57,7 +57,7 @@ const Pets = () => {
  <PetsPageFallback />
  ) : (
  <div className="flex flex-wrap items-center justify-center gap-6 lg:gap-9">
- {data?.pets.map((pet: Pet) => (
+ {data?.pets?.map((pet: Pet) => (
  <PetCard
  key={pet.id}
  id={pet.id}