Show warning message on simplified Internet page when wlan1 is missing (#26)

This PR shows a warning message if a user has removed the USB Wi-Fi
dongle (or if the dongle has broken) indicating that fact on the
simplified Internet page, so that the user will know why the machine
isn't attempting to connect to an external Wi-Fi network even if the
user has populated the settings for connecting to an external Wi-Fi
network.

Author: ethanjli

internal/app/deviceadmin/routes/internet/conn-profiles.go

@@ -160,7 +160,7 @@ func (h *Handlers) HandleConnProfilePostByUUID() echo.HandlerFunc {
 			}
 			// Redirect user
 			return c.Redirect(http.StatusSeeOther, redirectTarget)
-		case "simplified-updated":
+		case "simplified-updated", "simplified-updated-activated":
 			formValues, err := c.FormParams()
 			if err != nil {
 				return errors.Wrap(err, "couldn't load form parameters")
@@ -170,8 +170,10 @@ func (h *Handlers) HandleConnProfilePostByUUID() echo.HandlerFunc {
 			); err != nil {
 				return errors.Wrapf(err, "couldn't update connection profile %s", rawUUID)
 			}
-			if err := h.nmc.ActivateConnProfile(c.Request().Context(), uid); err != nil {
-				return err
+			if state == "simplified-updated-activated" {
+				if err := h.nmc.ActivateConnProfile(c.Request().Context(), uid); err != nil {
+					return err
+				}
 			}
 			// Redirect user
 			return c.Redirect(http.StatusSeeOther, redirectTarget)

internal/app/deviceadmin/routes/internet/routes.go

@@ -2,6 +2,7 @@
 package internet
 
 import (
+	"cmp"
 	"context"
 	"slices"
 	"time"
@@ -84,6 +85,7 @@ type InternetViewData struct {
 	AvailableSSIDs           []string
 	Wlan0HotspotConnProfile  nm.ConnProfile
 	Wlan1InternetConnProfile nm.ConnProfile
+	Wlan1Device              nm.Device
 
 	WifiDevices     []nm.Device
 	EthernetDevices []nm.Device
@@ -123,6 +125,9 @@ func getInternetViewData(ctx context.Context, nmc *nm.Client) (vd InternetViewDa
 		default:
 			vd.OtherDevices = append(vd.OtherDevices, device)
 		case "wifi":
+			if cmp.Or(device.IpInterface, device.ControlInterface) == "wlan1" {
+				vd.Wlan1Device = device
+			}
 			vd.WifiDevices = append(vd.WifiDevices, device)
 		case "ethernet":
 			vd.EthernetDevices = append(vd.EthernetDevices, device)

web/templates/internet/external-network-form.partial.tmpl

@@ -1,4 +1,5 @@
 {{$connProfile := (get . "ConnProfile")}}
+{{$device := (get . "Device")}}
 {{$availableSSIDs := (get . "AvailableSSIDs")}}
 {{$Meta := (get . "Meta")}}
 
@@ -64,7 +65,16 @@
     data-controller="form-submission"
     data-action="submit->form-submission#submit"
   >
-    <input type="hidden" name="state" value="simplified-updated">
+    <turbo-frame
+      id="internet_devices_wlan1_conn-profile-internet_update-type.frame"
+      data-turbo-reload
+    >
+      {{if ne (or $device.IpInterface $device.ControlInterface) "wlan1"}}
+        <input type="hidden" name="state" value="simplified-updated">
+      {{else}}
+        <input type="hidden" name="state" value="simplified-updated-activated">
+      {{end}}
+    </turbo-frame>
     <input type="hidden" name="redirect-target" value="{{urlJoin (dict
       "path" $Meta.Path
       "query" $Meta.Form.Encode
@@ -228,13 +238,22 @@
     <div class="field" data-form-submission-target="submitter">
       <div class="field is-grouped">
         <div class="control">
-          <input
-            class="button is-primary"
-            type="submit"
-            name="update-type"
-            value="Save and connect"
-            data-form-submission-target="submit"
+          <turbo-frame
+            id="internet_devices_wlan1_conn-profile-internet_submit.frame"
+            data-turbo-reload
           >
+            <input
+              class="button is-primary"
+              type="submit"
+              name="update-type"
+              {{if ne (or $device.IpInterface $device.ControlInterface) "wlan1"}}
+                value="Save"
+              {{else}}
+                value="Save and connect"
+              {{end}}
+              data-form-submission-target="submit"
+            >
+          </turbo-frame>
         </div>
       </div>
     </div>

web/templates/internet/index.page.tmpl

@@ -65,12 +65,26 @@
           </div>
         </article>
       {{else}}
+        <h3>External Wi-Fi network</h3>
+        <turbo-frame
+          id="internet_wifi_external-network_no-device-message.frame"
+          data-turbo-reload
+        >
+          {{if ne (or .Data.Wlan1Device.IpInterface .Data.Wlan1Device.ControlInterface) "wlan1"}}
+            <article class="message is-warning two-card-width">
+              <div class="message-body">
+                No recognized USB Wi-Fi module is plugged into the machine! Such a module will be
+                needed before this machine can connect to an external Wi-Fi network.
+              </div>
+            </article>
+          {{end}}
+        </turbo-frame>
         <div class="card section-card">
           <div class="card-content">
-            <h3>External Wi-Fi network</h3>
             {{
               template "internet/external-network-form.partial.tmpl" dict
               "ConnProfile" .Data.Wlan1InternetConnProfile
+              "Device" .Data.Wlan1Device
               "AvailableSSIDs" .Data.AvailableSSIDs
               "Meta" .Meta
             }}

web/templates/shared/nav/navbar.partial.tmpl

@@ -30,20 +30,20 @@
     template "shared/nav/navlink.partial.tmpl" dict
     "Display" true
     "Href" (urlJoin (dict
-      "path" (print .Meta.BasePath "remote")
+      "path" (print .Meta.BasePath "internet")
       "query" .Meta.Form.Encode
     ))
-    "Name" "Remote"
+    "Name" "Internet"
     "Meta" .Meta
   }}
   {{
     template "shared/nav/navlink.partial.tmpl" dict
     "Display" true
     "Href" (urlJoin (dict
-      "path" (print .Meta.BasePath "internet")
+      "path" (print .Meta.BasePath "remote")
       "query" .Meta.Form.Encode
     ))
-    "Name" "Internet"
+    "Name" "Remote"
     "Meta" .Meta
   }}
   {{