From dd28c2bc3ea678c0b25a0a0926242c2ec7129b45 Mon Sep 17 00:00:00 2001 From: Thibault Camlane Date: Tue, 10 Jun 2025 11:56:44 +0200 Subject: [PATCH] fix: Fix satellite data graph rendering --- backend/dbLocation.sqlite | Bin 2547712 -> 2547712 bytes .../[satelliteSlug]/orbitDataGraph.tsx | 4 ++- .../app/satellites/[satelliteSlug]/page.tsx | 28 +++++++----------- .../satelliteData/SatelliteDataHome.tsx | 5 ++-- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/backend/dbLocation.sqlite b/backend/dbLocation.sqlite index 5404dcad20df025702f8352ab61201a7c92ad27e..4c7caa274554f84f06df01a12090f6e988294f13 100644 GIT binary patch delta 250 zcmWN=yJ`YK6b9fqiN;GtSK}p{Xmr%XLS(@~U99s6DbpOXgosT*Yy~Y2R)SU*Ru+P7 zim;`JKjd7AD~v;alN|a8&qCI3^qyP6#K3@Bdlvs!n>R zq7)FFoTcMa5N3@2pxBQaSN^=PIe5CA@{R4APRF#sZZ4j7vx8pO@7td3+Uf7t=sTE% zr)60od<*wp^YiZt DsuoWH delta 212 zcmWN=yA6U+6b4|filANr#Rm!s_^Jr8V*p2Rfm4}i;|frmSea-nEUXy8!q7SZCGO+@ zC13h|i4L)OBGA(qJbt_*uy^BIKUx}aEuO4aEdN^IKw&m7+{DC NT;dAXMHO$N_a8tZOGp3! diff --git a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx index 74252f6..4c19927 100644 --- a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx +++ b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx @@ -194,7 +194,9 @@ const OrbitDataGraph: React.FC = ({ updateSize(); return () => window.removeEventListener("resize", updateSize); - }, [handleChartScroll, months]); + }, []); + + console.log("orbitalData", orbitalData); return ( <> diff --git a/frontend/src/app/satellites/[satelliteSlug]/page.tsx b/frontend/src/app/satellites/[satelliteSlug]/page.tsx index 3346bba..8422582 100644 --- a/frontend/src/app/satellites/[satelliteSlug]/page.tsx +++ b/frontend/src/app/satellites/[satelliteSlug]/page.tsx @@ -58,7 +58,7 @@ export default async function SatelliteInfoPage({ // Get the satellite attributes let satAttributes = graphqlData?.data?.satellites?.data[0]?.attributes; - console.log("satAttributes", satAttributes); + // If the satellite is not found return a message if (!satAttributes?.catalogNumberNORAD) { return
Satellite not found
; @@ -74,6 +74,8 @@ export default async function SatelliteInfoPage({ imageURL = STRAPI_URL + satelliteImage; } + console.log("satAttributes", satAttributes); + return ( <>
@@ -112,17 +114,9 @@ export default async function SatelliteInfoPage({ : null}

- - {satAttributes.missionStatus === "IN ORBIT" ? ( -
- {" "} - -
- ) : null} +
+ +
{/* Image container */}
@@ -146,14 +140,16 @@ export default async function SatelliteInfoPage({
) : null} {/* Container for map */} - {noradId && satAttributes.missionStatus === "IN ORBIT" ? ( + {noradId ? (
@@ -167,7 +163,6 @@ export default async function SatelliteInfoPage({ {/* Container for graph of historical orbital data */}
- {/*Pass the historicalData and the launchDate as props to OrbitDataGraph*/} {noradId ? ( satAttributes?.launchDate ? ( - {/* Related projects */}
{relatedProjects?.length != 0 ? ( diff --git a/frontend/src/components/satelliteData/SatelliteDataHome.tsx b/frontend/src/components/satelliteData/SatelliteDataHome.tsx index c818572..76afe71 100644 --- a/frontend/src/components/satelliteData/SatelliteDataHome.tsx +++ b/frontend/src/components/satelliteData/SatelliteDataHome.tsx @@ -12,7 +12,7 @@ const updateInterval = 50; // in ms export default function SatelliteDataHome({ satelliteNum, }: { - satelliteNum: string | null; + satelliteNum: SatelliteNumber | null; }) { const { selectedSatellite, setSelectedSatellite, satNumToEntry } = useSatelliteStore(); @@ -24,8 +24,7 @@ export default function SatelliteDataHome({ useEffect(() => { const intervalId = setInterval(() => { if (satelliteNum) { - const satelliteNumber = parseInt(satelliteNum, 10); - setSelectedSatellite(satelliteNumber as SatelliteNumber); + setSelectedSatellite(satelliteNum); } if (selectedSatellite) { // Access satellite data by name