PxlLoewe/var-monorepo
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed StationSelectBug, Fixed HPGNotificationGuf, see #45

Browse Source
This commit is contained in:
PxlLoewe
2025-07-06 12:53:04 -07:00
parent 690f4876d6
commit 9b954e4053
8 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/dispatch/app/(app)/dispatch/_components/StationSelect.tsx
View File

@@ -5,10 +5,10 @@ import { Select } from "_components/Select";
import { getConnectedAircraftsAPI } from "_querys/aircrafts";
import { getStationsAPI } from "_querys/stations";
import { Ambulance, FireExtinguisher, Radio, Siren } from "lucide-react";
import { useState } from "react";
import { useEffect, useState } from "react";
import { FieldValues } from "react-hook-form";
type MissionStationsSelectProps<T extends FieldValues> = {
type MissionStationsSelectProps = {
selectedStations?: number[];
className?: string;
menuPlacement?: "top" | "bottom" | "auto"; // Added menuPlacement prop for better control
@@ -27,7 +27,7 @@ type MissionStationsSelectProps<T extends FieldValues> = {
isMulti?: boolean;
};
export function StationsSelect<T extends FieldValues>({
export function StationsSelect({
onChange,
selectedStations,
vehicleStates,
@@ -35,7 +35,7 @@ export function StationsSelect<T extends FieldValues>({
isMulti = true,
menuPlacement = "bottom",
filterSelected = false,
}: MissionStationsSelectProps<T>) {
}: MissionStationsSelectProps) {
const { data: connectedAircrafts } = useQuery({
queryKey: ["aircrafts"],
queryFn: () => getConnectedAircraftsAPI(),
@@ -47,11 +47,21 @@ export function StationsSelect<T extends FieldValues>({
const [value, setValue] = useState<string[]>(selectedStations?.map((id) => String(id)) || []);
useEffect(() => {
setValue([
...(selectedStations || []).map((id) => String(id)),
...(vehicleStates.hpgAmbulanceState !== HpgState.NOT_REQUESTED ? ["RTW"] : []),
...(vehicleStates.hpgFireEngineState !== HpgState.NOT_REQUESTED ? ["FW"] : []),
...(vehicleStates.hpgPoliceState !== HpgState.NOT_REQUESTED ? ["POL"] : []),
]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedStations, vehicleStates]);
// Helper to check if a station is a vehicle and its state is NOT_REQUESTED
const stationsOptions = [
...(stations?.map((station) => ({
label: station.bosCallsign,
value: station.id,
value: String(station.id),
type: "station" as const,
isOnline: !!connectedAircrafts?.find((a) => a.stationId === station.id),
})) || []),
@@ -78,7 +88,7 @@ export function StationsSelect<T extends FieldValues>({
if (!filterSelected) return true; // If filterSelected is false, include all stations
// Filter out selected stations if filterSelectedStations is true
if (s.type === "station") {
return !selectedStations?.includes(s.value);
return !selectedStations?.map(String)?.includes(s.value);
}
// If the station is a vehicle, we need to check its state
if (s.type === "vehicle") {