Browse Source

Fix User config not saving

pull/71/head
Sacha Weatherstone 4 years ago
parent
commit
0f6b0416df
No known key found for this signature in database GPG Key ID: 7AB2D7E206124B31
  1. 42
      src/components/PageComponents/Config/User.tsx

42
src/components/PageComponents/Config/User.tsx

@ -12,6 +12,7 @@ import { UserValidation } from "@app/validation/config/user.js";
import { Form } from "@components/form/Form"; import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js"; import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { ErrorMessage } from "@hookform/error-message";
import { classValidatorResolver } from "@hookform/resolvers/class-validator"; import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
@ -70,13 +71,9 @@ export const User = (): JSX.Element => {
dirty={isDirty} dirty={isDirty}
onSubmit={onSubmit} onSubmit={onSubmit}
> >
<Input <ErrorMessage errors={errors} name="longName" />
label="Device ID" <ErrorMessage errors={errors} name="shortName" />
disabled <ErrorMessage errors={errors} name="isLicensed" />
description="Preset unique identifier for this device."
error={errors.id?.message}
{...register("id")}
/>
<Input <Input
label="Device Name" label="Device Name"
description="Personalised name for this device." description="Personalised name for this device."
@ -88,6 +85,18 @@ export const User = (): JSX.Element => {
maxLength={4} maxLength={4}
{...register("shortName")} {...register("shortName")}
/> />
<Controller
name="isLicensed"
control={control}
render={({ field: { value, ...rest } }) => (
<Toggle
label="Licenced Operator?"
description="Remove bandwidth restrictions in certain regions (HAM license required)"
checked={value}
{...rest}
/>
)}
/>
<Input <Input
label="Mac Address" label="Mac Address"
description="Hardware address for this node." description="Hardware address for this node."
@ -99,6 +108,13 @@ export const User = (): JSX.Element => {
?.join(":") ?? "" ?.join(":") ?? ""
} }
/> />
<Input
label="Device ID"
disabled
description="Preset unique identifier for this device."
error={errors.id?.message}
value={myNode?.data.user?.id}
/>
<Select <Select
label="Hardware" label="Hardware"
description="Hardware model of this device." description="Hardware model of this device."
@ -107,18 +123,6 @@ export const User = (): JSX.Element => {
> >
{renderOptions(Protobuf.HardwareModel)} {renderOptions(Protobuf.HardwareModel)}
</Select> </Select>
<Controller
name="isLicensed"
control={control}
render={({ field: { value, ...rest } }) => (
<Toggle
label="Licenced Operator?"
description="Remove bandwidth restrictions in certain regions (HAM license required)"
checked={value}
{...rest}
/>
)}
/>
</Form> </Form>
); );
}; };

Loading…
Cancel
Save