fix(oxibadge): accept hostnames and FQDNs for the time clock address
Check, format and test / build (push) Successful in 11m10s
Check, format and test / build (push) Successful in 11m10s
The "Edit address" field in Settings only accepted an IPv4 address (IPV4.test), rejecting a bare hostname (e.g. "timbratore") or FQDN (e.g. "timbratore.lan") even though the underlying connection (Rust's ToSocketAddrs) already resolves those fine. Onboarding had no such restriction. Replaced the IPv4-only check with isValidHost (IPv4 OR a standard DNS hostname), dropped the numeric-only keyboard hint on that field, and reworded the labels/placeholder error to not imply IP-only. Also makes "Edit address" test the connection before accepting it, instead of saving unconditionally: ActionButton gained a `disabled` prop so the confirm/cancel buttons can be locked (with a spinner on confirm) while the test is in flight, and the edit form now only closes on a successful test, staying open with the raw error shown otherwise. Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -3,7 +3,15 @@ import type { Shifts } from '$lib/shifts';
|
||||
|
||||
export type { Shifts };
|
||||
|
||||
export const IPV4 = /^((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/;
|
||||
const IPV4 = /^((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/;
|
||||
|
||||
// A DNS label: alphanumeric, hyphens allowed in the middle, 1-63 chars.
|
||||
const LABEL = '[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?';
|
||||
const HOSTNAME = new RegExp(`^${LABEL}(?:\\.${LABEL})*$`);
|
||||
|
||||
/** Whether `v` is a usable time clock address: an IPv4 address, a bare
|
||||
* hostname (e.g. "timbratore") or a FQDN (e.g. "timbratore.lan"). */
|
||||
export const isValidHost = (v: string): boolean => IPV4.test(v) || HOSTNAME.test(v);
|
||||
|
||||
/** The 4 time fields of `Shifts` — everything but `round_step_min`, which isn't a time. */
|
||||
export type ShiftTimeKey = 'in1' | 'out1' | 'in2' | 'out2';
|
||||
|
||||
Reference in New Issue
Block a user