Merge branch 'feature/wifi-API-update' into 'master'

Draft: WiFi API update

See merge request turris/reforis/foris-js!252

src/common/WiFiSettings/WiFiForm.js

@@ -156,25 +156,25 @@ function DeviceForm({
 
                     <RadioSet
                         name={`band-${deviceID}`}
-                        label="GHz"
+                        label={_("Band")}
                         choices={getBandChoices(formData)}
                         value={formData.band}
                         helpText={HELP_TEXTS.band}
                         inline
                         onChange={setFormValue((value) => {
-                            // Get the last item in an array of available HT modes
+                            // Find the selected band
-                            const [best2] = bnds[0].available_htmodes.slice(-1);
+                            const selectedBand = bnds.find(
-                            const [best5] = bnds[1].available_htmodes.slice(-1);
+                                (band) => band.band === value
+                            );
+                            // Get the last item in the available HT modes for the selected band
+                            const bestHtmode =
+                                selectedBand.available_htmodes.slice(-1)[0];
                             return {
                                 devices: {
                                     [deviceIndex]: {
                                         band: { $set: value },
                                         channel: { $set: "0" },
-                                        htmode: {
+                                        htmode: { $set: bestHtmode },
-                                            $set:
-                                                // Set HT mode depending on checked frequency
-                                                value === "11a" ? best5 : best2,
-                                        },
                                     },
                                 },
                             };
@@ -293,7 +293,7 @@ function getHtmodeChoices(device) {
 
 function getBandChoices(device) {
     return device.available_bands.map((availableBand) => ({
-        label: BANDS[availableBand.band],
+        label: `${BANDS[availableBand.band]} GHz`,
         value: availableBand.band,
     }));
 }

src/common/WiFiSettings/__tests__/WiFiSettings.test.js

@@ -77,7 +77,7 @@ describe("<WiFiSettings/>", () => {
     it("Snapshot 2.4 GHz", () => {
         fireEvent.click(getByText("Wi-Fi 1"));
         const enabledRender = asFragment();
-        fireEvent.click(getAllByText("2.4")[0]);
+        fireEvent.click(getAllByText(/2.4/)[0]);
         expect(diffSnapshot(enabledRender, asFragment())).toMatchSnapshot();
     });
 
@@ -135,7 +135,7 @@ describe("<WiFiSettings/>", () => {
 
     it("Post form: 2.4 GHz", () => {
         fireEvent.click(getByText("Wi-Fi 1"));
-        fireEvent.click(getAllByText("2.4")[0]);
+        fireEvent.click(getAllByText(/2.4/)[0]);
 
         fireEvent.click(getByText("Save"));
         expect(mockAxios.post).toBeCalled();

src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap

@@ -555,7 +555,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           class="d-block"
 +           for="6"
 +         >
-+           GHz
++           Band
 +         </label>
 +         <div
 +           class="mb-3 form-check form-check-inline"
@@ -571,7 +571,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +             class="form-check-label"
 +             for="band-0-0"
 +           >
-+             2.4
++             2.4 GHz
 +           </label>
 +         </div>
 +         <div
@@ -589,7 +589,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +             class="form-check-label"
 +             for="band-0-1"
 +           >
-+             5
++             5 GHz
 +           </label>
 +         </div>
 +         <div