From e0357cf47ece5a608d5beadbe162a69f77d6fd73 Mon Sep 17 00:00:00 2001 From: MinJ <ussr1285@ajou.ac.kr> Date: Sun, 8 Dec 2024 00:54:10 +0900 Subject: [PATCH] merge --- src/components/CombinationGrid/CombinationGrid.jsx | 2 ++ src/pages/SearchCombinationPage/SearchCombinationPage.jsx | 1 + src/pages/SearchCombinationPage/components/CombinationBox.jsx | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/CombinationGrid/CombinationGrid.jsx b/src/components/CombinationGrid/CombinationGrid.jsx index fd1c9d7..d70c067 100644 --- a/src/components/CombinationGrid/CombinationGrid.jsx +++ b/src/components/CombinationGrid/CombinationGrid.jsx @@ -2,6 +2,8 @@ import React from "react"; import "./CombinationGrid.css"; const CombinationGrid = ({ combination }) => { + // console.log(combination); + if (!Array.isArray(combination)) { return null; // combinations가 배열이 아닐 경우 아무것도 렌더링하지 않음 } diff --git a/src/pages/SearchCombinationPage/SearchCombinationPage.jsx b/src/pages/SearchCombinationPage/SearchCombinationPage.jsx index b19fedb..126cf0d 100644 --- a/src/pages/SearchCombinationPage/SearchCombinationPage.jsx +++ b/src/pages/SearchCombinationPage/SearchCombinationPage.jsx @@ -33,6 +33,7 @@ const SearchCombinationPage = () => { ssdId: selectedItems.SSD[0]?.id, hddId: selectedItems.HDD[0]?.id, }); + if (data && Array.isArray(data)) { setCombinations(data); } diff --git a/src/pages/SearchCombinationPage/components/CombinationBox.jsx b/src/pages/SearchCombinationPage/components/CombinationBox.jsx index 2a595ca..0f4fabb 100644 --- a/src/pages/SearchCombinationPage/components/CombinationBox.jsx +++ b/src/pages/SearchCombinationPage/components/CombinationBox.jsx @@ -5,12 +5,11 @@ import getPartById from "@/api/parts/getPartById"; const CombinationBox = ({ title, combination }) => { const [partDetails, setPartDetails] = useState([]); - useEffect(() => { const fetchPartDetails = async () => { try { const details = await Promise.all( - combination.partids.map(async (partId) => { + combination.partIds.map(async (partId) => { const partData = await getPartById(partId); return { image: partData.image_url, -- GitLab