From e29766121953676427be9ea1fa9983c75d83629e Mon Sep 17 00:00:00 2001
From: lcross2002 <liamdcross@outlook.com>
Date: Sat, 13 Apr 2024 18:06:47 +0100
Subject: [PATCH] actually use the current airline id
---
client/src/components/FlightList/FlightList.tsx | 2 +-
client/src/components/Header/Header.tsx | 2 +-
client/src/services/FlightList/FlightList.ts | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/client/src/components/FlightList/FlightList.tsx b/client/src/components/FlightList/FlightList.tsx
index 819bfe3..6674565 100644
--- a/client/src/components/FlightList/FlightList.tsx
+++ b/client/src/components/FlightList/FlightList.tsx
@@ -18,7 +18,7 @@ function FlightList() {
{
flights.map((flight) => {
return (
- <FlightCard flight={flight} extraInfo={true} />
+ <FlightCard key={flight.id} flight={flight} extraInfo={true} />
);
})
}
diff --git a/client/src/components/Header/Header.tsx b/client/src/components/Header/Header.tsx
index 3fc4d51..fb28dd8 100644
--- a/client/src/components/Header/Header.tsx
+++ b/client/src/components/Header/Header.tsx
@@ -27,7 +27,7 @@ function Header() {
<div>
<NavLink to={userToDashboard(user)} className={activeClass} >Dashboard</NavLink>
{user?.type === 0 && <NavLink to={'booking/query'} className={activeClass}>Book a Flight</NavLink>}
- {user?.type === 1 && <NavLink to={'flights'} className={activeClass}>Flight List</NavLink>}
+ {user?.type === 1 && <NavLink to={`flights?id=${user.id}`} className={activeClass}>Flight List</NavLink>}
<NavLink to={'logout'} className={activeClass}>Logout</NavLink>
</div> :
<div>
diff --git a/client/src/services/FlightList/FlightList.ts b/client/src/services/FlightList/FlightList.ts
index 38e3a8e..3ce1f23 100644
--- a/client/src/services/FlightList/FlightList.ts
+++ b/client/src/services/FlightList/FlightList.ts
@@ -1,9 +1,10 @@
-import { Params } from 'react-router-dom';
import Api from '../../helpers/Api';
+import { getSearchParam } from '../../helpers/SearchParams';
-export async function GetFlightList({ params }: { params: Params }) {
+export async function GetFlightList({ request }: { request: Request}) {
try {
- const result = await Api.get(`Flight?airlineId=${params.id}`, { withCredentials: true });
+ const id = getSearchParam(request.url, 'id');
+ const result = await Api.get(`Flight?airlineId=${id}`, { withCredentials: true });
return result.data;
} catch (error) {
return null;
--
GitLab