From f9ce9a9e7a0e03157408843ac14844e63641ee34 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 30 Apr 2025 09:12:30 +0200 Subject: [PATCH] min height for popup content --- .../_components/map/AircraftMarker.tsx | 4 +- .../_components/map/MissionMarkers.tsx | 2 +- .../map/_components/AircraftMarkerTabs.tsx | 4 +- .../map/_components/MissionMarkerTabs.tsx | 87 ++++++++++--------- 4 files changed, 52 insertions(+), 45 deletions(-) diff --git a/apps/dispatch/app/dispatch/_components/map/AircraftMarker.tsx b/apps/dispatch/app/dispatch/_components/map/AircraftMarker.tsx index 2696ba4c..7e2e3e1d 100644 --- a/apps/dispatch/app/dispatch/_components/map/AircraftMarker.tsx +++ b/apps/dispatch/app/dispatch/_components/map/AircraftMarker.tsx @@ -218,7 +218,9 @@ const AircraftPopupContent = ({ aircraft }: { aircraft: Aircraft }) => { -
{renderTabContent}
+
+
{renderTabContent}
+
); }; diff --git a/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx b/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx index d90e7427..4c3f35bc 100644 --- a/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx +++ b/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx @@ -211,7 +211,7 @@ const MissionPopupContent = ({ mission }: { mission: Mission }) => { -
{renderTabContent}
+
{renderTabContent}
); }; diff --git a/apps/dispatch/app/dispatch/_components/map/_components/AircraftMarkerTabs.tsx b/apps/dispatch/app/dispatch/_components/map/_components/AircraftMarkerTabs.tsx index 8ba1f2f8..22abf471 100644 --- a/apps/dispatch/app/dispatch/_components/map/_components/AircraftMarkerTabs.tsx +++ b/apps/dispatch/app/dispatch/_components/map/_components/AircraftMarkerTabs.tsx @@ -37,13 +37,13 @@ const FMSStatusSelector = ({ aircraft }: { aircraft: Aircraft }) => { const [hoveredStatus, setHoveredStatus] = useState(null); return ( -
+
{Array.from({ length: 9 }, (_, i) => (i + 1).toString()) .filter((status) => status !== "5") // Exclude status 5 .map((status) => (
{
    - {(mission.missionLog as unknown as MissionLog[]).map((entry, index) => { - if (entry.type === "station-log") - return ( -
  • - {entry.timeStamp} - - {entry.data.newFMSstatus} - - - {entry.data.station.bosCallsign} - -
  • - ); - if (entry.type === "message-log") - return ( -
  • - - {new Date(entry.timeStamp).toLocaleTimeString([], { - hour: "2-digit", - minute: "2-digit", - })} - - - {entry.data.user.firstname?.[0]?.toUpperCase() ?? "?"} - {entry.data.user.lastname?.[0]?.toUpperCase() ?? "?"} - - {entry.data.message} -
  • - ); + {(mission.missionLog as unknown as MissionLog[]) + .slice() + .reverse() + .map((entry, index) => { + if (entry.type === "station-log") + return ( +
  • + {entry.timeStamp} + + {entry.data.newFMSstatus} + + + {entry.data.station.bosCallsign} + +
  • + ); + if (entry.type === "message-log") + return ( +
  • + + {new Date(entry.timeStamp).toLocaleTimeString([], { + hour: "2-digit", + minute: "2-digit", + })} + + + {entry.data.user.firstname?.[0]?.toUpperCase() ?? "?"} + {entry.data.user.lastname?.[0]?.toUpperCase() ?? "?"} + + + {entry.data.message} + +
  • + ); - return null; - })} + return null; + })}
);