From f9066eced04f7420622e388e4bd6019cff0ca192 Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Sun, 2 Mar 2025 01:43:07 -0500 Subject: [PATCH] fix: added a notes fild to Dynamic form allowing for notes to inform users about using BLE and wifi at the same time. (#474) --- src/components/Form/DynamicForm.tsx | 3 +++ src/components/PageComponents/Config/Bluetooth.tsx | 4 +++- src/components/PageComponents/Config/Network.tsx | 2 ++ src/components/PageComponents/Connect/Serial.tsx | 11 +++++++---- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/Form/DynamicForm.tsx b/src/components/Form/DynamicForm.tsx index 3dd4d5eb..839e8094 100644 --- a/src/components/Form/DynamicForm.tsx +++ b/src/components/Form/DynamicForm.tsx @@ -27,6 +27,7 @@ export interface BaseFormBuilderProps { disabledBy?: DisabledBy[]; label: string; description?: string; + notes?: string; validationText?: string; properties?: Record; } @@ -45,6 +46,7 @@ export interface DynamicFormProps { fieldGroups: { label: string; description: string; + notes?: string; valid?: boolean; validationText?: string; fields: FieldProps[]; @@ -95,6 +97,7 @@ export function DynamicForm({

{fieldGroup.label}

{fieldGroup.description} + {fieldGroup?.notes}
{fieldGroup.fields.map((field) => { diff --git a/src/components/PageComponents/Config/Bluetooth.tsx b/src/components/PageComponents/Config/Bluetooth.tsx index e5d5e333..ce02e0f3 100644 --- a/src/components/PageComponents/Config/Bluetooth.tsx +++ b/src/components/PageComponents/Config/Bluetooth.tsx @@ -70,7 +70,9 @@ export const Bluetooth = () => { fieldGroups={[ { label: "Bluetooth Settings", - description: "Settings for the Bluetooth module", + description: "Settings for the Bluetooth module ", + notes: + "Note: Some devices (ESP32) cannot use both Bluetooth and WiFi at the same time.", fields: [ { type: "toggle", diff --git a/src/components/PageComponents/Config/Network.tsx b/src/components/PageComponents/Config/Network.tsx index a3dc219f..1c991cb4 100644 --- a/src/components/PageComponents/Config/Network.tsx +++ b/src/components/PageComponents/Config/Network.tsx @@ -53,6 +53,8 @@ export const Network = () => { { label: "WiFi Config", description: "WiFi radio configuration", + notes: + "Note: Some devices (ESP32) cannot use both Bluetooth and WiFi at the same time.", fields: [ { type: "toggle", diff --git a/src/components/PageComponents/Connect/Serial.tsx b/src/components/PageComponents/Connect/Serial.tsx index 49fb53d9..b6cdf5f9 100644 --- a/src/components/PageComponents/Connect/Serial.tsx +++ b/src/components/PageComponents/Connect/Serial.tsx @@ -18,7 +18,9 @@ export const Serial = ({ closeDialog }: TabElementProps) => { setSerialPorts(await navigator?.serial.getPorts()); }, []); - navigator?.serial?.addEventListener("connect", () => { + navigator?.serial?.addEventListener("connect", (event) => { + console.log(event); + updateSerialPortList(); }); navigator?.serial?.addEventListener("disconnect", () => { @@ -45,6 +47,8 @@ export const Serial = ({ closeDialog }: TabElementProps) => {
{serialPorts.map((port, index) => { + console.log(port); + const { usbProductId, usbVendorId } = port.getInfo(); return ( ); })}