GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-09-20 09:54:19 +02:00
Code Issues Releases Activity

Swap checkboxes for switches on Wi-Fi page

Browse Source
This commit is contained in:
Aleksandr Gumroian 2020-08-18 10:30:37 +02:00
parent c1b1d8c079
commit a2acac255d
No known key found for this signature in database
GPG Key ID: 9E77849C64F0A733
2 changed files with 192 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/common/WiFiSettings/WiFiForm.js
View File

@ -7,7 +7,7 @@
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Switch } from "../../bootstrap/Switch";
import { CheckBox } from "../../bootstrap/CheckBox"; import { CheckBox } from "../../bootstrap/CheckBox";
import { PasswordInput } from "../../bootstrap/PasswordInput"; import { PasswordInput } from "../../bootstrap/PasswordInput";
import { RadioSet } from "../../bootstrap/RadioSet"; import { RadioSet } from "../../bootstrap/RadioSet";
@ -18,25 +18,25 @@ import WifiGuestForm from "./WiFiGuestForm";
import { HELP_TEXTS, HTMODES, HWMODES } from "./constants"; import { HELP_TEXTS, HTMODES, HWMODES } from "./constants";
WiFiForm.propTypes = { WiFiForm.propTypes = {
formData: PropTypes.shape( formData: PropTypes.shape({ devices: PropTypes.arrayOf(PropTypes.object) })
{ devices: PropTypes.arrayOf(PropTypes.object) }, .isRequired,
).isRequired, formErrors: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
formErrors: PropTypes.oneOfType([
PropTypes.object,
PropTypes.array,
]),
setFormValue: PropTypes.func.isRequired, setFormValue: PropTypes.func.isRequired,
hasGuestNetwork: PropTypes.bool, hasGuestNetwork: PropTypes.bool,
}; };
WiFiForm.defaultProps = { WiFiForm.defaultProps = {
formData: { devices: [] }, formData: { devices: [] },
setFormValue: () => { }, setFormValue: () => {},
hasGuestNetwork: true, hasGuestNetwork: true,
}; };
export default function WiFiForm({ export default function WiFiForm({
formData, formErrors, setFormValue, hasGuestNetwork, disabled, formData,
formErrors,
setFormValue,
hasGuestNetwork,
disabled,
}) { }) {
return formData.devices.map((device, index) => ( return formData.devices.map((device, index) => (
<DeviceForm <DeviceForm
@ -47,6 +47,7 @@ export default function WiFiForm({
setFormValue={setFormValue} setFormValue={setFormValue}
hasGuestNetwork={hasGuestNetwork} hasGuestNetwork={hasGuestNetwork}
disabled={disabled} disabled={disabled}
divider={index + 1 !== formData.devices.length}
/> />
)); ));
} }
@ -67,6 +68,7 @@ DeviceForm.propTypes = {
setFormValue: PropTypes.func.isRequired, setFormValue: PropTypes.func.isRequired,
hasGuestNetwork: PropTypes.bool, hasGuestNetwork: PropTypes.bool,
deviceIndex: PropTypes.number, deviceIndex: PropTypes.number,
divider: PropTypes.bool,
}; };
DeviceForm.defaultProps = { DeviceForm.defaultProps = {
@ -75,40 +77,42 @@ DeviceForm.defaultProps = {
}; };
function DeviceForm({ function DeviceForm({
formData, formErrors, setFormValue, hasGuestNetwork, deviceIndex, ...props formData,
formErrors,
setFormValue,
hasGuestNetwork,
deviceIndex,
divider,
...props
}) { }) {
const deviceID = formData.id; const deviceID = formData.id;
return ( return (
<> <>
<h2>{_(`Wi-Fi ${deviceID + 1}`)}</h2> <Switch
<CheckBox label={<h2>{_(`Wi-Fi ${deviceID + 1}`)}</h2>}
label={_("Enable")}
checked={formData.enabled} checked={formData.enabled}
onChange={setFormValue((value) => ({
onChange={setFormValue( devices: {
(value) => ({ devices: { [deviceIndex]: { enabled: { $set: value } } } }), [deviceIndex]: { enabled: { $set: value } },
)} },
}))}
switchHeading
{...props} {...props}
/> />
{formData.enabled {formData.enabled ? (
? (
<> <>
<TextInput <TextInput
label="SSID" label="SSID"
value={formData.SSID} value={formData.SSID}
error={formErrors.SSID || null} error={formErrors.SSID || null}
required required
onChange={setFormValue( onChange={setFormValue((value) => ({
(value) => ({
devices: { devices: {
[deviceIndex]: { [deviceIndex]: {
SSID: { $set: value }, SSID: { $set: value },
}, },
}, },
}), }))}
)}
{...props} {...props}
> >
<div className="input-group-append"> <div className="input-group-append">
@ -126,13 +130,11 @@ function DeviceForm({
error={formErrors.password} error={formErrors.password}
helpText={HELP_TEXTS.password} helpText={HELP_TEXTS.password}
required required
onChange={setFormValue((value) => ({
onChange={setFormValue( devices: {
(value) => ( [deviceIndex]: { password: { $set: value } },
{ devices: { [deviceIndex]: { password: { $set: value } } } } },
), }))}
)}
{...props} {...props}
/> />
@ -140,13 +142,11 @@ function DeviceForm({
label="Hide SSID" label="Hide SSID"
helpText={HELP_TEXTS.hidden} helpText={HELP_TEXTS.hidden}
checked={formData.hidden} checked={formData.hidden}
onChange={setFormValue((value) => ({
onChange={setFormValue( devices: {
(value) => ( [deviceIndex]: { hidden: { $set: value } },
{ devices: { [deviceIndex]: { hidden: { $set: value } } } } },
), }))}
)}
{...props} {...props}
/> />
@ -156,18 +156,14 @@ function DeviceForm({
choices={getHwmodeChoices(formData)} choices={getHwmodeChoices(formData)}
value={formData.hwmode} value={formData.hwmode}
helpText={HELP_TEXTS.hwmode} helpText={HELP_TEXTS.hwmode}
onChange={setFormValue((value) => ({
onChange={setFormValue(
(value) => ({
devices: { devices: {
[deviceIndex]: { [deviceIndex]: {
hwmode: { $set: value }, hwmode: { $set: value },
channel: { $set: "0" }, channel: { $set: "0" },
}, },
}, },
}), }))}
)}
{...props} {...props}
/> />
@ -176,13 +172,11 @@ function DeviceForm({
choices={getHtmodeChoices(formData)} choices={getHtmodeChoices(formData)}
value={formData.htmode} value={formData.htmode}
helpText={HELP_TEXTS.htmode} helpText={HELP_TEXTS.htmode}
onChange={setFormValue((value) => ({
onChange={setFormValue( devices: {
(value) => ( [deviceIndex]: { htmode: { $set: value } },
{ devices: { [deviceIndex]: { htmode: { $set: value } } } } },
), }))}
)}
{...props} {...props}
/> />
@ -190,29 +184,28 @@ function DeviceForm({
label="Channel" label="Channel"
choices={getChannelChoices(formData)} choices={getChannelChoices(formData)}
value={formData.channel} value={formData.channel}
onChange={setFormValue((value) => ({
onChange={setFormValue( devices: {
(value) => ( [deviceIndex]: { channel: { $set: value } },
{ devices: { [deviceIndex]: { channel: { $set: value } } } } },
), }))}
)}
{...props} {...props}
/> />
{hasGuestNetwork && ( {hasGuestNetwork && (
<WifiGuestForm <WifiGuestForm
formData={{ id: deviceIndex, ...formData.guest_wifi }} formData={{
id: deviceIndex,
...formData.guest_wifi,
}}
formErrors={formErrors.guest_wifi || {}} formErrors={formErrors.guest_wifi || {}}
setFormValue={setFormValue} setFormValue={setFormValue}
{...props} {...props}
/> />
)} )}
</> </>
) ) : null}
: null} {divider ? <hr /> : null}
</> </>
); );
} }
@ -228,7 +221,9 @@ function getChannelChoices(device) {
availableBand.available_channels.forEach((availableChannel) => { availableBand.available_channels.forEach((availableChannel) => {
channelChoices[availableChannel.number.toString()] = ` channelChoices[availableChannel.number.toString()] = `
${availableChannel.number} ${availableChannel.number}
(${availableChannel.frequency} MHz ${availableChannel.radar ? " ,DFS" : ""}) (${availableChannel.frequency} MHz ${
availableChannel.radar ? " ,DFS" : ""
})
`; `;
}); });
}); });

53
src/common/WiFiSettings/WiFiGuestForm.js
View File

@ -8,8 +8,8 @@
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { CheckBox } from "../../bootstrap/CheckBox";
import { TextInput } from "../../bootstrap/TextInput"; import { TextInput } from "../../bootstrap/TextInput";
import { Switch } from "../../bootstrap/Switch";
import { PasswordInput } from "../../bootstrap/PasswordInput"; import { PasswordInput } from "../../bootstrap/PasswordInput";
import WiFiQRCode from "./WiFiQRCode"; import WiFiQRCode from "./WiFiQRCode";
import { HELP_TEXTS } from "./constants"; import { HELP_TEXTS } from "./constants";
@ -26,42 +26,44 @@ WifiGuestForm.propTypes = {
password: PropTypes.string, password: PropTypes.string,
}), }),
setFormValue: PropTypes.func.isRequired, setFormValue: PropTypes.func.isRequired,
deviceIndex: PropTypes.string,
}; };
export default function WifiGuestForm({ export default function WifiGuestForm({
formData, formErrors, setFormValue, ...props formData,
formErrors,
setFormValue,
deviceIndex,
...props
}) { }) {
return ( return (
<> <>
<CheckBox <Switch
label={_("Enable Guest Wifi")} label={_("Enable Guest Wi-Fi")}
checked={formData.enabled} checked={formData.enabled}
helpText={HELP_TEXTS.guest_wifi_enabled} helpText={HELP_TEXTS.guest_wifi_enabled}
onChange={setFormValue((value) => ({
onChange={setFormValue( devices: {
(value) => ( [formData.id]: {
{ devices: { [formData.id]: { guest_wifi: { enabled: { $set: value } } } } } guest_wifi: { enabled: { $set: value } },
), },
)} },
}))}
{...props} {...props}
/> />
{formData.enabled {formData.enabled ? (
? (
<> <>
<TextInput <TextInput
label="SSID" label="SSID"
value={formData.SSID} value={formData.SSID}
error={formErrors.SSID} error={formErrors.SSID}
onChange={setFormValue((value) => ({
onChange={setFormValue(
(value) => ({
devices: { devices: {
[formData.id]: { guest_wifi: { SSID: { $set: value } } }, [formData.id]: {
guest_wifi: { SSID: { $set: value } },
}, },
}), },
)} }))}
{...props} {...props}
> >
<div className="input-group-append"> <div className="input-group-append">
@ -79,22 +81,17 @@ export default function WifiGuestForm({
helpText={HELP_TEXTS.password} helpText={HELP_TEXTS.password}
error={formErrors.password} error={formErrors.password}
required required
onChange={setFormValue((value) => ({
onChange={setFormValue(
(value) => ({
devices: { devices: {
[formData.id]: { [formData.id]: {
guest_wifi: { password: { $set: value } }, guest_wifi: { password: { $set: value } },
}, },
}, },
}), }))}
)}
{...props} {...props}
/> />
</> </>
) ) : null}
: null}
</> </>
); );
} }