Skip to content

🧹 [code health] avoid 'any[]' type in API response interfaces #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TargetMisser wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🧹 [code health] avoid 'any[]' type in API response interfaces #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 24 additions & 27 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/components/ShiftTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { MaterialIcons } from '@expo/vector-icons';
import { useAppTheme, type ThemeColors } from '../context/ThemeContext';
import { useAirport } from '../context/AirportContext';
import { getAirlineOps, getAirlineColor } from '../utils/airlineOps';
import { fetchAirportScheduleRaw } from '../utils/fr24api';
import { fetchAirportScheduleRaw, type FR24FlightData } from '../utils/fr24api';
import { useLanguage } from '../context/LanguageContext';

if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) {
Expand Down Expand Up @@ -36,7 +36,7 @@ type Flight = {
ops: { checkInOpen: number; checkInClose: number; gateOpen: number; gateClose: number };
};

function parseFlight(item: any): Flight | null {
function parseFlight(item: FR24FlightData): Flight | null {
const f = item.flight;
if (!f) return null;
const ts = f.time?.scheduled?.departure;
Expand Down
20 changes: 10 additions & 10 deletions src/screens/FlightScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { MaterialIcons } from '@expo/vector-icons';
import { useAppTheme, type ThemeColors } from '../context/ThemeContext';
import { useAirport } from '../context/AirportContext';
import { getAirlineOps, getAirlineColor } from '../utils/airlineOps';
import { fetchAirportScheduleRaw } from '../utils/fr24api';
import { fetchAirportScheduleRaw, type FR24FlightData } from '../utils/fr24api';
import { fetchStaffMonitorData, normalizeFlightNumber, type StaffMonitorFlight } from '../utils/staffMonitor';
import { formatAirportHeader } from '../utils/airportSettings';
import { requestWidgetUpdate } from 'react-native-android-widget';
Expand Down Expand Up @@ -111,7 +111,7 @@ async function cancelPreviousNotifications() {
}

async function scheduleShiftNotifications(
shiftFlights: any[],
shiftFlights: FR24FlightData[],
shiftEnd: number,
locale: string,
): Promise<number> {
Expand Down Expand Up @@ -172,7 +172,7 @@ async function cancelPinnedNotifications() {
await AsyncStorage.removeItem(PINNED_NOTIF_IDS_KEY);
}

async function schedulePinnedNotifications(item: any, tab: 'arrivals' | 'departures', locale: string): Promise<void> {
async function schedulePinnedNotifications(item: FR24FlightData, tab: 'arrivals' | 'departures', locale: string): Promise<void> {
await cancelPinnedNotifications();
const now = Date.now() / 1000;
const ids: string[] = [];
Expand Down Expand Up @@ -243,17 +243,17 @@ export default function FlightScreen() {
const [refreshing, setRefreshing] = useState(false);
const [activeTab, setActiveTab] = useState<'arrivals' | 'departures'>('departures');
const [activeDay, setActiveDay] = useState<'today' | 'tomorrow'>('today');
const [arrivals, setArrivals] = useState<any[]>([]);
const [departures, setDepartures] = useState<any[]>([]);
const [arrivals, setArrivals] = useState<FR24FlightData[]>([]);
const [departures, setDepartures] = useState<FR24FlightData[]>([]);
const [shifts, setShifts] = useState<{ today: { start: number; end: number } | null; tomorrow: { start: number; end: number } | null }>({ today: null, tomorrow: null });
const [notifsEnabled, setNotifsEnabled] = useState(false);
const [scheduledCount, setScheduledCount] = useState(0);
const [pinnedFlightId, setPinnedFlightId] = useState<string | null>(null);
const [inboundArrivals, setInboundArrivals] = useState<Record<string, number>>({});
const [filterMode, setFilterMode] = useState<'mine' | 'all'>('mine');
const [filterMenuVisible, setFilterMenuVisible] = useState(false);
const [allArrivalsFull, setAllArrivalsFull] = useState<any[]>([]);
const [allDeparturesFull, setAllDeparturesFull] = useState<any[]>([]);
const [allArrivalsFull, setAllArrivalsFull] = useState<FR24FlightData[]>([]);
const [allDeparturesFull, setAllDeparturesFull] = useState<FR24FlightData[]>([]);
const [staffMonitorDeps, setStaffMonitorDeps] = useState<StaffMonitorFlight[]>([]);
const [staffMonitorArrs, setStaffMonitorArrs] = useState<StaffMonitorFlight[]>([]);

Expand Down Expand Up @@ -371,7 +371,7 @@ export default function FlightScreen() {
return (ciO <= shiftToday!.end && ciC >= shiftToday!.start) || (gO <= shiftToday!.end && gC >= shiftToday!.start);
})
.map(item => {
const ts = item.flight.time.scheduled.departure;
const ts = item.flight?.time?.scheduled?.departure || 0;
const airline = item.flight?.airline?.name || 'Sconosciuta';
const ops = getAirlineOps(airline);
const fn = item.flight?.identification?.number?.default || 'N/A';
Expand Down Expand Up @@ -486,7 +486,7 @@ export default function FlightScreen() {
}
}, [notifsEnabled, shifts, arrivals]);

const pinFlight = useCallback(async (item: any) => {
const pinFlight = useCallback(async (item: FR24FlightData) => {
try {
const id = item.flight?.identification?.number?.default;
if (!id) return;
Expand Down Expand Up @@ -543,7 +543,7 @@ export default function FlightScreen() {
});
})();

const renderFlight = useCallback(({ item }: { item: any }) => {
const renderFlight = useCallback(({ item }: { item: FR24FlightData }) => {
const flightNumber = item.flight?.identification?.number?.default || 'N/A';
const airline = item.flight?.airline?.name || 'Sconosciuta';
const iataCode = item.flight?.airline?.code?.iata || '';
Expand Down
10 changes: 5 additions & 5 deletions src/utils/autoNotifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as Calendar from 'expo-calendar';
import * as Notifications from 'expo-notifications';
import AsyncStorage from '@react-native-async-storage/async-storage';
import { getAirlineOps } from './airlineOps';
import { fetchAirportScheduleRaw } from './fr24api';
import { fetchAirportScheduleRaw, type FR24FlightData } from './fr24api';
import {
showShiftOngoingNotification,
dismissShiftOngoingNotification,
Expand Down Expand Up @@ -63,13 +63,13 @@ export async function autoScheduleNotifications(): Promise<number> {
const { departures: allDepartures, arrivals: allArrivals } = await fetchAirportScheduleRaw();

// Filter departures during shift
const shiftDepartures = allDepartures.filter((item: any) => {
const shiftDepartures = allDepartures.filter((item: FR24FlightData) => {
const ts = item.flight?.time?.scheduled?.departure;
return ts && ts >= shiftStart && ts <= shiftEnd;
});

// Filter arrivals during shift (inbound aircraft that become our departures)
const shiftArrivals = allArrivals.filter((item: any) => {
const shiftArrivals = allArrivals.filter((item: FR24FlightData) => {
const ts = item.flight?.time?.scheduled?.arrival;
return ts && ts >= shiftStart && ts <= shiftEnd;
});
Expand All @@ -83,8 +83,8 @@ export async function autoScheduleNotifications(): Promise<number> {

if (now >= shiftStart && now <= shiftEnd) {
const upcoming = shiftDepartures
.filter((f: any) => (f.flight?.time?.scheduled?.departure ?? 0) > now)
.sort((a: any, b: any) =>
.filter((f: FR24FlightData) => (f.flight?.time?.scheduled?.departure ?? 0) > now)
.sort((a: FR24FlightData, b: FR24FlightData) =>
(a.flight?.time?.scheduled?.departure ?? 0) - (b.flight?.time?.scheduled?.departure ?? 0),
);
const next = upcoming[0];
Expand Down
Loading
Loading