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

Merge branch 'additional-wifi-module-fix' into 'dev'

Browse Source 
Fix Wi-Fi Form bug with additional Wi-Fi modules

Closes reforis#204

See merge request turris/reforis/foris-js!117
This commit is contained in:
Aleksandr Gumroian 2020-07-17 14:38:24 +02:00
commit 8d40dbb841
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,18 +31,19 @@ WiFiForm.propTypes = {
WiFiForm.defaultProps = {
formData: { devices: [] },
setFormValue: () => {},
setFormValue: () => { },
hasGuestNetwork: true,
};
export default function WiFiForm({
formData, formErrors, setFormValue, hasGuestNetwork, disabled,
}) {
return formData.devices.map((device) => (
return formData.devices.map((device, index) => (
<DeviceForm
key={device.id}
formData={device}
formErrors={(formErrors || [])[device.id]}
deviceIndex={index}
formErrors={(formErrors || [])[index]}
setFormValue={setFormValue}
hasGuestNetwork={hasGuestNetwork}
disabled={disabled}
@ -65,6 +66,7 @@ DeviceForm.propTypes = {
formErrors: PropTypes.object.isRequired,
setFormValue: PropTypes.func.isRequired,
hasGuestNetwork: PropTypes.bool,
deviceIndex: PropTypes.number,
};
DeviceForm.defaultProps = {
@ -73,7 +75,7 @@ DeviceForm.defaultProps = {
};
function DeviceForm({
formData, formErrors, setFormValue, hasGuestNetwork, ...props
formData, formErrors, setFormValue, hasGuestNetwork, deviceIndex, ...props
}) {
const deviceID = formData.id;
return (
@ -84,7 +86,7 @@ function DeviceForm({
checked={formData.enabled}
onChange={setFormValue(
(value) => ({ devices: { [deviceID]: { enabled: { $set: value } } } }),
(value) => ({ devices: { [deviceIndex]: { enabled: { $set: value } } } }),
)}
{...props}
@ -98,7 +100,13 @@ function DeviceForm({
error={formErrors.SSID || null}
required
onChange={setFormValue(
(value) => ({ devices: { [deviceID]: { SSID: { $set: value } } } }),
(value) => ({
devices: {
[deviceIndex]: {
SSID: { $set: value },
},
},
}),
)}
{...props}
@ -121,7 +129,7 @@ function DeviceForm({
onChange={setFormValue(
(value) => (
{ devices: { [deviceID]: { password: { $set: value } } } }
{ devices: { [deviceIndex]: { password: { $set: value } } } }
),
)}
@ -135,7 +143,7 @@ function DeviceForm({
onChange={setFormValue(
(value) => (
{ devices: { [deviceID]: { hidden: { $set: value } } } }
{ devices: { [deviceIndex]: { hidden: { $set: value } } } }
),
)}
@ -152,7 +160,7 @@ function DeviceForm({
onChange={setFormValue(
(value) => ({
devices: {
[deviceID]: {
[deviceIndex]: {
hwmode: { $set: value },
channel: { $set: "0" },
},
@ -171,7 +179,7 @@ function DeviceForm({
onChange={setFormValue(
(value) => (
{ devices: { [deviceID]: { htmode: { $set: value } } } }
{ devices: { [deviceIndex]: { htmode: { $set: value } } } }
),
)}
@ -185,7 +193,7 @@ function DeviceForm({
onChange={setFormValue(
(value) => (
{ devices: { [deviceID]: { channel: { $set: value } } } }
{ devices: { [deviceIndex]: { channel: { $set: value } } } }
),
)}
@ -194,7 +202,7 @@ function DeviceForm({
{hasGuestNetwork && (
<WifiGuestForm
formData={{ id: deviceID, ...formData.guest_wifi }}
formData={{ id: deviceIndex, ...formData.guest_wifi }}
formErrors={formErrors.guest_wifi || {}}
setFormValue={setFormValue}