Skip to content

Fixed overrideFrequency Input Constraints #801

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 6 commits into from
Sep 4, 2025
Merged

Fixed overrideFrequency Input Constraints #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af21ae5
Fixed overrideFrequency to properly allow for floats with a minimum o…
BMorgan1296 Aug 22, 2025
8109910
Removed duplicate error message in FormInput.tsx
BMorgan1296 Aug 22, 2025
dddbcbb
Added error message for overrideFrequency in several locales
BMorgan1296 Aug 22, 2025
16ffb38
Simplified check and reverted translated languages to English besides…
BMorgan1296 Sep 4, 2025
d0eb18d
Merge branch 'main' into main
BMorgan1296 Sep 4, 2025
3f32ff1
Let i18n handle fallback + linting
philon- Sep 4, 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
3 changes: 3 additions & 0 deletions packages/web/public/i18n/locales/de-DE/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@
"generic": "Dies ist ein Pflichtfeld.",
"managed": "Mindestens ein administrativer Schlüssel wird benötigt, um diesen Knoten zu verwalten",
"key": "Schlüssel erforderlich."
},
"invalidOverrideFreq": {
"number": "Ungültiges Format, erwartet 430-930 MHz."
}
},
"yes": "Ja",
Expand Down
3 changes: 3 additions & 0 deletions packages/web/public/i18n/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@
"generic": "This field is required.",
"managed": "At least one admin key is requred if the node is managed.",
"key": "Key is required."
},
"invalidOverrideFreq": {
"number": "Invalid format, expected between 430-930 MHz."
}
},
"yes": "Yes",
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/components/Form/DynamicFormField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export function DynamicFormField<T extends FieldValues>({
control={control}
disabled={disabled}
isDirty={isDirty}
invalid={invalid}
/>
);

Expand Down
9 changes: 0 additions & 9 deletions packages/web/src/components/Form/FormInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export function GenericInput<T extends FieldValues>({
control,
disabled,
field,
invalid,
}: GenericFormElementProps<T, InputFieldProps<T>>) {
const { fieldLength, ...restProperties } = field.properties || {};

Expand All @@ -46,8 +45,6 @@ export function GenericInput<T extends FieldValues>({
},
});

const isInvalid = invalid || Boolean(error?.message);

const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const newValue = e.target.value;

Expand Down Expand Up @@ -100,12 +97,6 @@ export function GenericInput<T extends FieldValues>({
{currentLength}/{fieldLength.max}
</div>
)}

{isInvalid && (
<div className="absolute inset-y-12 bottom-0 flex items-center pr-3">
<p className="text-sm text-red-500">{error?.message ?? ""}</p>
</div>
)}
</div>
);
}
2 changes: 1 addition & 1 deletion packages/web/src/components/UI/Input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const cnInvalidBase = "border-2 border-red-500 dark:border-red-500";
const cnDirtyBase = "border-2 border-sky-500 dark:border-sky-500";

const inputVariants = cva(
"flex h-10 w-full rounded-md border border-slate-300 bg-transparent py-2 px-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1 focus:ring-slate-400 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-500 dark:bg-transparet dark:text-slate-100 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-600",
"flex h-10 w-full rounded-md border border-slate-300 bg-transparent py-2 px-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-1 focus:ring-slate-400 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-500 dark:bg-transparent dark:text-slate-100 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-600",
{
variants: {
variant: {
Expand Down
6 changes: 5 additions & 1 deletion packages/web/src/validation/config/lora.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ export const LoRaValidationSchema = z.object({
channelNum: z.coerce.number().int(),
overrideDutyCycle: z.boolean(),
sx126xRxBoostedGain: z.boolean(),
overrideFrequency: z.coerce.number().int(),
overrideFrequency: z.coerce
.number()
.refine((val) => val >= 410 && val <= 930, {
message: "formValidation.invalidOverrideFreq.number",
}),
ignoreIncoming: z.coerce.number().array(),
ignoreMqtt: z.boolean(),
configOkToMqtt: z.boolean(),
Expand Down