Browse Source

ability to set, oddly the octet direction is reversed

pull/302/head
Hunter Thornsberry 2 years ago
parent
commit
afef780611
  1. 18
      src/components/PageComponents/Config/Network.tsx
  2. 10
      src/validation/config/network.ts

18
src/components/PageComponents/Config/Network.tsx

@ -14,7 +14,12 @@ export const Network = (): JSX.Element => {
value: { value: {
...data, ...data,
ipv4Config: new Protobuf.Config.Config_NetworkConfig_IpV4Config( ipv4Config: new Protobuf.Config.Config_NetworkConfig_IpV4Config(
data.ipv4Config, {
ip: data.ipv4Config.ip.split('.').reverse().reduce((ipnum, octet) => { return (ipnum<<8) + parseInt(octet)}, 0) >>> 0,
subnet: data.ipv4Config.subnet.split('.').reverse().reduce((ipnum, octet) => { return (ipnum<<8) + parseInt(octet)}, 0) >>> 0,
gateway: data.ipv4Config.gateway.split('.').reverse().reduce((ipnum, octet) => { return (ipnum<<8) + parseInt(octet)}, 0) >>> 0,
dns: data.ipv4Config.dns.split('.').reverse().reduce((ipnum, octet) => { return (ipnum<<8) + parseInt(octet)}, 0) >>> 0,
}
), ),
}, },
}, },
@ -25,7 +30,16 @@ export const Network = (): JSX.Element => {
return ( return (
<DynamicForm<NetworkValidation> <DynamicForm<NetworkValidation>
onSubmit={onSubmit} onSubmit={onSubmit}
defaultValues={config.network} defaultValues={{
...config.network,
ipv4Config: {
ip:
config.network?.ipv4Config?.ip.toString() ?? "0",
subnet: config.network?.ipv4Config?.subnet.toString() ?? "0",
gateway: config.network?.ipv4Config?.gateway.toString() ?? "0",
dns: config.network?.ipv4Config?.dns.toString() ?? "0",
}
}}
fieldGroups={[ fieldGroups={[
{ {
label: "WiFi Config", label: "WiFi Config",

10
src/validation/config/network.ts

@ -40,22 +40,20 @@ export class NetworkValidation
} }
export class NetworkValidationIpV4Config export class NetworkValidationIpV4Config
implements
Omit<Protobuf.Config.Config_NetworkConfig_IpV4Config, keyof Message>
{ {
@IsIP() @IsIP()
@IsOptional() @IsOptional()
ip: number; ip: string;
@IsIP() @IsIP()
@IsOptional() @IsOptional()
gateway: number; gateway: string;
@IsIP() @IsIP()
@IsOptional() @IsOptional()
subnet: number; subnet: string;
@IsIP() @IsIP()
@IsOptional() @IsOptional()
dns: number; dns: string;
} }

Loading…
Cancel
Save