Skip to content

Fix input parsing in gauge example #30

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

Merged
merged 8 commits into from
Nov 20, 2025
Merged

Fix input parsing in gauge example #30

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f70c104
fix: execute sql parameter parsing
pepperoni505 Nov 20, 2025
a9eedad
fix: all usages of input and inputAlt
pepperoni505 Nov 20, 2025
83d6d7a
fix: wrap in try
pepperoni505 Nov 20, 2025
5a4e366
chore: add console error
pepperoni505 Nov 20, 2025
8f4966a
remove comment
pepperoni505 Nov 20, 2025
81b9d2c
fix: make sure parsed json is array
pepperoni505 Nov 20, 2025
15b63f8
fix: only parse json if string is not empty
pepperoni505 Nov 20, 2025
02c4e23
fix: bring back optional params
pepperoni505 Nov 20, 2025
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
81 changes: 43 additions & 38 deletions example/gauge/Components/Pages/Test/Test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class TestPage extends DisplayComponent<TestPageProps> {
index: 0,
arguments: ["url: string"],
name: "DownloadNavigationData",
functionCallback: input => this.props.interface.download_navigation_data(input ?? ""),
functionCallback: input => this.props.interface.download_navigation_data(input || ""),
},
{
index: 1,
Expand All @@ -51,163 +51,172 @@ export class TestPage extends DisplayComponent<TestPageProps> {
index: 2,
arguments: ["ident: string"],
name: "GetAirport",
functionCallback: input => this.props.interface.get_airport(input ?? ""),
functionCallback: input => this.props.interface.get_airport(input || ""),
},
{
index: 3,
arguments: ["ident: string"],
name: "GetWaypoints",
functionCallback: input => this.props.interface.get_waypoints(input ?? ""),
functionCallback: input => this.props.interface.get_waypoints(input || ""),
},
{
index: 4,
arguments: ["ident: string"],
name: "GetVhfNavaids",
functionCallback: input => this.props.interface.get_vhf_navaids(input ?? ""),
functionCallback: input => this.props.interface.get_vhf_navaids(input || ""),
},
{
index: 5,
arguments: ["ident: string"],
name: "GetNdbNavaids",
functionCallback: input => this.props.interface.get_ndb_navaids(input ?? ""),
functionCallback: input => this.props.interface.get_ndb_navaids(input || ""),
},
{
index: 6,
arguments: ["ident: string"],
name: "GetAirways",
functionCallback: input => this.props.interface.get_airways(input ?? ""),
functionCallback: input => this.props.interface.get_airways(input || ""),
},
{
index: 7,
arguments: ["fixIdent: string", "fixIcao: string"],
name: "GetAirwaysAtFix",
functionCallback: (input, inputAlt) => this.props.interface.get_airways_at_fix(input ?? "", inputAlt ?? ""),
functionCallback: (input, inputAlt) => this.props.interface.get_airways_at_fix(input || "", input || ""),
},
{
index: 8,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetAirportsInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_airports_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_airports_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 9,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetWaypointsInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_waypoints_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_waypoints_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 10,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetVhfNavaidsInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_vhf_navaids_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_vhf_navaids_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 11,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetNdbNavaidsInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_ndb_navaids_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_ndb_navaids_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 12,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetAirwaysInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_airways_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_airways_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 13,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetControlledAirspacesInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_controlled_airspaces_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_controlled_airspaces_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 14,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetRestrictiveAirspacesInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_restrictive_airspaces_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_restrictive_airspaces_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 15,
arguments: ["center: (lat, long)", "range: nm"],
name: "GetCommunicationsInRange",
functionCallback: (input, inputAlt) =>
this.props.interface.get_communications_in_range(this.strToCoords(input), Number(inputAlt ?? 0)),
this.props.interface.get_communications_in_range(this.strToCoords(input || ""), Number(inputAlt || 0)),
},
{
index: 16,
arguments: ["airportIdent: string"],
name: "GetRunwaysAtAirport",
functionCallback: input => this.props.interface.get_runways_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_runways_at_airport(input || ""),
},
{
index: 17,
arguments: ["airportIdent: string"],
name: "GetDeparturesAtAirport",
functionCallback: input => this.props.interface.get_departures_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_departures_at_airport(input || ""),
},
{
index: 18,
arguments: ["airportIdent: string"],
name: "GetArrivalsAtAirport",
functionCallback: input => this.props.interface.get_arrivals_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_arrivals_at_airport(input || ""),
},
{
index: 19,
arguments: ["airportIdent: string"],
name: "GetApproachesAtAirport",
functionCallback: input => this.props.interface.get_approaches_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_approaches_at_airport(input || ""),
},
{
index: 20,
arguments: ["airportIdent: string"],
name: "GetWaypointsAtAirport",
functionCallback: input => this.props.interface.get_waypoints_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_waypoints_at_airport(input || ""),
},
{
index: 21,
arguments: ["airportIdent: string"],
name: "GetNdbNavaidsAtAirport",
functionCallback: input => this.props.interface.get_ndb_navaids_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_ndb_navaids_at_airport(input || ""),
},
{
index: 22,
arguments: ["airportIdent: string"],
name: "GetGatesAtAirport",
functionCallback: input => this.props.interface.get_gates_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_gates_at_airport(input || ""),
},
{
index: 23,
arguments: ["airportIdent: string"],
name: "GetCommunicationsAtAirport",
functionCallback: input => this.props.interface.get_communications_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_communications_at_airport(input || ""),
},
{
index: 24,
arguments: ["airportIdent: string"],
name: "GetGlsNavaidsAtAirport",
functionCallback: input => this.props.interface.get_gls_navaids_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_gls_navaids_at_airport(input || ""),
},
{
index: 25,
arguments: ["airportIdent: string"],
name: "GetPathPointsAtAirport",
functionCallback: input => this.props.interface.get_path_points_at_airport(input ?? ""),
functionCallback: input => this.props.interface.get_path_points_at_airport(input || ""),
},
{
index: 26,
arguments: ["sql: string", "params: string[]"],
name: "ExecuteSQLQuery",
functionCallback: (input, inputAlt) =>
this.props.interface.execute_sql(
input ?? "",
inputAlt?.replace("[", "").replace("]", "").replace('"', "").split(",") ?? [],
),
functionCallback: (input, inputAlt) => {
// Try to parse the argument as a JSON formatted array, falling back to an empty array if needed. We also force all values to strings since that is what the backend expects
let argsList: string[] = [];
if (inputAlt) {
try {
const parsed = JSON.parse(inputAlt);
argsList = Array.isArray(parsed) ? parsed.map(v => String(v)) : [];
} catch (e) {
console.error(`Error parsing argument input: ${e}. Falling back to empty list`);
}
}

return this.props.interface.execute_sql(input || "", argsList);
},
},
{
index: 27,
Expand Down Expand Up @@ -240,12 +249,8 @@ export class TestPage extends DisplayComponent<TestPageProps> {
this.input2State,
);

private strToBool(input?: string): boolean {
return input == "true" ? true : false;
}

private strToCoords(input?: string): Coordinates {
const splitInput = (input ?? "").replace(/[(){}\s]/g, "").split(",");
private strToCoords(input: string): Coordinates {
const splitInput = input.replace(/[(){}\s]/g, "").split(",");

const coords: Coordinates = {
lat: Number(splitInput[0] ?? 0.0),
Expand All @@ -257,8 +262,8 @@ export class TestPage extends DisplayComponent<TestPageProps> {

private handleFunction = () => {
const functionObj = this.selectedFunctionObj.get();
const input1 = this.input1.get();
const input2 = this.input2.get();
const input1 = this.input1.get() || undefined;
const input2 = this.input2.get() || undefined;

functionObj
.functionCallback(input1, input2)
Expand Down