GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-26 00:21:36 +01:00
Code Issues Releases Activity

Merge branch 'fix-wifi-modes' into 'dev'

Browse Source 
Fix switching Wi-Fi modes depending on bands in WiFiForm

Closes reforis#292

See merge request turris/reforis/foris-js!159
This commit is contained in:
Aleksandr Gumroian 2021-05-14 11:11:01 +00:00
commit 6059ce9e7b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -163,6 +163,10 @@ function DeviceForm({
[deviceIndex]: { [deviceIndex]: {
hwmode: { $set: value }, hwmode: { $set: value },
channel: { $set: "0" }, channel: { $set: "0" },
htmode: {
$set:
value === "11a" ? "VHT80" : "HT20",
},
}, },
}, },
}))} }))}

8
src/common/WiFiSettings/__tests__/WiFiSettings.test.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -116,7 +116,7 @@ describe("<WiFiSettings/>", () => {
enabled: true, enabled: true,
guest_wifi: { enabled: false }, guest_wifi: { enabled: false },
hidden: false, hidden: false,
htmode: "HT40", htmode: "HT80",
hwmode: "11a", hwmode: "11a",
id: 0, id: 0,
password: "TestPass", password: "TestPass",
@ -145,7 +145,7 @@ describe("<WiFiSettings/>", () => {
enabled: true, enabled: true,
guest_wifi: { enabled: false }, guest_wifi: { enabled: false },
hidden: false, hidden: false,
htmode: "HT40", htmode: "HT20",
hwmode: "11g", hwmode: "11g",
id: 0, id: 0,
password: "TestPass", password: "TestPass",
@ -181,7 +181,7 @@ describe("<WiFiSettings/>", () => {
password: "test_password", password: "test_password",
}, },
hidden: false, hidden: false,
htmode: "HT40", htmode: "HT80",
hwmode: "11a", hwmode: "11a",
id: 0, id: 0,
password: "TestPass", password: "TestPass",

4
src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -226,7 +226,7 @@ export function wifiSettingsFixture() {
password: "", password: "",
}, },
hidden: false, hidden: false,
htmode: "HT40", htmode: "HT80",
hwmode: "11a", hwmode: "11a",
id: 0, id: 0,
password: "TestPass", password: "TestPass",