Gate virtual and manual connect options behind expert mode (betaflight#5049)

* Gate virtual and manual connect options behind expert mode

The Virtual and Manual entries in the sidebar connect menu now require expert mode in addition to the existing showVirtualMode / showManualMode toggles, keeping the casual connect flow free of dev-only options.

* Close virtual/manual bypass and simplify connect menu

- Reset a persisted or auto-selected virtual/manual port to noselection
  on connect when expert mode is off, so the gate can't be bypassed via
  a previously stored selection
- Skip virtual/manual fallbacks in PortHandler.selectActivePort unless
  expert mode is enabled
- Extract buildDeviceItems and buildPermissionItems helpers from the
  menuItems computed to bring cognitive complexity back under the
  SonarCloud limit

* Unify connect menu helper signatures

buildDeviceItems now calls isExpertModeEnabled itself so both it and
buildPermissionItems rely purely on closed-over state — no caller
plumbing required.

Author: blckmn

src/components/port-picker/ConnectButton.vue

@@ -60,6 +60,7 @@ import PortHandler from "../../js/port_handler";
 import { connectDisconnect, disconnect } from "../../js/serial_backend";
 import { i18n } from "../../js/localization";
 import { set as setConfig } from "../../js/ConfigStorage";
+import { isExpertModeEnabled } from "../../js/utils/isExpertModeEnabled";
 import ConnectOptionsDialog from "./ConnectOptionsDialog.vue";
 
 function selectAndConnect(path) {
@@ -124,10 +125,9 @@ export default defineComponent({
             dialogOpen.value = true;
         }
 
-        const menuItems = computed(() => {
-            const items = [];
+        function buildDeviceItems() {
+            const expertMode = isExpertModeEnabled();
             const devices = [];
-
             if (PortHandler.showSerialOption) {
                 for (const d of serialPorts.value) {
                     devices.push({
@@ -155,26 +155,25 @@ export default defineComponent({
                     });
                 }
             }
-
-            if (PortHandler.showVirtualMode) {
+            if (expertMode && PortHandler.showVirtualMode) {
                 devices.push({
                     label: i18n.getMessage("portsSelectVirtual"),
                     icon: "i-lucide-flask-conical",
                     onSelect: () => openConnectDialog("virtual"),
                 });
             }
-            if (PortHandler.showManualMode) {
+            if (expertMode && PortHandler.showManualMode) {
                 devices.push({
                     label: i18n.getMessage("portsSelectManual"),
                     icon: "i-lucide-keyboard",
                     onSelect: () => openConnectDialog("manual"),
                 });
             }
+            return devices;
+        }
 
-            if (devices.length) {
-                items.push(...devices, { type: "separator" });
-            }
-
+        function buildPermissionItems() {
+            const items = [];
             if (PortHandler.showSerialOption) {
                 items.push({
                     label: i18n.getMessage("portsSelectPermission"),
@@ -196,8 +195,14 @@ export default defineComponent({
                     onSelect: () => PortHandler.requestDevicePermission("usb"),
                 });
             }
+            return items;
+        }
 
+        const menuItems = computed(() => {
+            const devices = buildDeviceItems();
+            const items = devices.length ? [...devices, { type: "separator" }] : [];
             items.push(
+                ...buildPermissionItems(),
                 { type: "separator" },
                 {
                     type: "checkbox",
@@ -207,7 +212,6 @@ export default defineComponent({
                     onSelect: (e) => e.preventDefault(),
                 },
             );
-
             return items;
         });
 
@@ -216,6 +220,12 @@ export default defineComponent({
                 return;
             }
 
+            // Guard against a persisted virtual/manual selection when expert mode is off.
+            const gatedModes = ["virtual", "manual"];
+            if (!isExpertModeEnabled() && gatedModes.includes(selectedPort.value)) {
+                PortHandler.portPicker.selectedPort = "noselection";
+            }
+
             if (selectedPort.value === "noselection") {
                 PortHandler.selectActivePort();
                 if (PortHandler.portPicker.selectedPort !== "noselection") {

src/js/port_handler.js

@@ -3,6 +3,7 @@ import { EventBus } from "../components/eventBus";
 import { serial } from "./serial.js";
 import defaultDfu, { UsbDfuProtocol } from "./protocols/usbdfu";
 import CapacitorDfuTransport from "./protocols/CapacitorDfuTransport";
+import { isExpertModeEnabled } from "./utils/isExpertModeEnabled";
 import { reactive } from "vue";
 import {
     checkCompatibility,
@@ -283,13 +284,14 @@ PortHandler.selectActivePort = function (suggestedDevice = false) {
         }
     }
 
-    // Return the virtual port
-    if (!selectedPort && this.showVirtualMode) {
+    // Expert-only fallbacks: only surface virtual/manual when expert mode is on.
+    const expertMode = isExpertModeEnabled();
+
+    if (!selectedPort && expertMode && this.showVirtualMode) {
         selectedPort = "virtual";
     }
 
-    // Return the manual port
-    if (!selectedPort && this.showManualMode) {
+    if (!selectedPort && expertMode && this.showManualMode) {
         selectedPort = "manual";
     }