FIXUP: drop connect dialog helperTextInvalid

We don't want the dialog to start out with invalid helper texts. As we
disable the connect button anyway while password (or SSID for hidden) is
empty, there is then never a case when we actually show them, so just
drop them.

#22884 (comment)

Author: martinpitt

pkg/networkmanager/network-interface.jsx

@@ -37,7 +37,6 @@ import {
     ThumbtackIcon,
 } from "@patternfly/react-icons";
 
-import { FormHelper } from "cockpit-components-form-helper";
 import { KebabDropdown } from "cockpit-components-dropdown";
 import { ListingTable } from "cockpit-components-table.jsx";
 import { ModalError } from 'cockpit-components-inline-notification.jsx';
@@ -95,9 +94,7 @@ const WiFiConnectDialog = ({ dev, model, ssid: knownSsid, ap }) => {
 
     // Validation
     const passwordRequired = !isHidden || security !== "none";
-    const ssidInvalid = isHidden && inputSsid.trim() === "";
-    const passwordInvalid = passwordRequired && password.trim() === "";
-    const canConnect = !ssidInvalid && !passwordInvalid;
+    const canConnect = !(isHidden && inputSsid.trim() === "") && !(passwordRequired && password.trim() === "");
 
     useEvent(model, "changed");
 
@@ -208,10 +205,8 @@ const WiFiConnectDialog = ({ dev, model, ssid: knownSsid, ap }) => {
                                            type="text"
                                            value={inputSsid}
                                            onChange={(_event, value) => setInputSsid(value)}
-                                           validated={ssidInvalid ? "error" : "default"}
                                            autoFocus // eslint-disable-line jsx-a11y/no-autofocus
                                            isDisabled={connecting} />
-                                <FormHelper helperTextInvalid={ssidInvalid ? _("Network name is required") : undefined} />
                             </FormGroup>
                             <FormGroup fieldId={idPrefix + "-security-select"} label={_("Security")}>
                                 <FormSelect id={idPrefix + "-security-select"}
@@ -232,7 +227,6 @@ const WiFiConnectDialog = ({ dev, model, ssid: knownSsid, ap }) => {
                                                type={passwordVisible ? "text" : "password"}
                                                value={password}
                                                onChange={(_event, value) => setPassword(value)}
-                                               validated={passwordInvalid ? "error" : "default"}
                                                autoFocus={!isHidden} // eslint-disable-line jsx-a11y/no-autofocus
                                                isDisabled={connecting} />
                                 </InputGroupItem>
@@ -245,7 +239,6 @@ const WiFiConnectDialog = ({ dev, model, ssid: knownSsid, ap }) => {
                                     </Button>
                                 </InputGroupItem>
                             </InputGroup>
-                            <FormHelper helperTextInvalid={passwordInvalid ? _("Password is required") : undefined} />
                         </FormGroup>
                     )}
                 </Form>

test/verify/check-networkmanager-wifi

@@ -180,11 +180,9 @@ wpa_passphrase=hidden99""")
         b.wait_in_text("#network-wifi-connect-dialog", "Connect to ZE WIFI!")
         # Validation: Empty password
         b.wait_val("#network-wifi-connect-password-input", "")
-        b.wait_in_text("#network-wifi-connect-dialog", "Password is required")
         b.wait_visible("#network-wifi-connect-connect:disabled")
         # Test password reveal
         b.set_input_text("#network-wifi-connect-password-input", "wrong123")
-        b.wait_not_in_text("#network-wifi-connect-dialog", "Password is required")
         b.wait_visible("#network-wifi-connect-connect:not(:disabled)")
         self.assertEqual(b.attr("#network-wifi-connect-password-input", "type"), "password")
         b.click("#network-wifi-connect-dialog button[aria-label='Show password']")
@@ -311,27 +309,21 @@ wpa_passphrase=hidden99""")
         b.click("button:contains('Connect to hidden network')")
         b.wait_in_text("#network-wifi-connect-dialog", "Connect to hidden network")
 
-        # Validation: Empty network name
-        b.wait_val("#network-wifi-connect-ssid-input", "")
-        b.wait_in_text("#network-wifi-connect-dialog", "Network name is required")
+        # Validation: Connect button only becomes active with SSID and password
         b.wait_visible("#network-wifi-connect-connect:disabled")
-
-        # Validation: Empty password with WPA security
         b.set_input_text("#network-wifi-connect-ssid-input", "SomeNetwork")
-        b.wait_not_in_text("#network-wifi-connect-dialog", "Network name is required")
-        b.wait_val("#network-wifi-connect-password-input", "")
-        b.wait_in_text("#network-wifi-connect-dialog", "Password is required")
+        time.sleep(0.5)
         b.wait_visible("#network-wifi-connect-connect:disabled")
 
         # Validation: No password required for open networks
         b.set_val("#network-wifi-connect-security-select", "none")
         b.wait_not_present("#network-wifi-connect-password-input")
-        b.wait_not_in_text("#network-wifi-connect-dialog", "Password is required")
         b.wait_visible("#network-wifi-connect-connect:not(:disabled)")
 
-        # Reset for error cases
+        # Validation: Password required for WPA networks
         b.set_val("#network-wifi-connect-security-select", "wpa-psk")
         b.wait_visible("#network-wifi-connect-password-input")
+        b.wait_visible("#network-wifi-connect-connect:disabled")
 
         # Error case 1: Wrong SSID
         b.set_input_text("#network-wifi-connect-ssid-input", "WrongSSID")