[PATCH widget-toolkit/yew-comp 0/2] Subject: fix #7426: use correct name tooltips for network interface types

[PATCH widget-toolkit/yew-comp 0/2] Subject: fix #7426: use correct name tooltips for network interface types

[Elias Huhsovitz]

Fixes bug #7426, where the tooltip for the network interface
name field incorrectly showed VLAN examples when creating a Linux Bridge or Bond.

The fix is applied to both the ExtJS UI (proxmox-widget-toolkit)
and the new Rust/Yew UI (proxmox-yew-comp).

The tooltips are now dynamically set based on the interface type being
created/edited, providing accurate examples and validation rules.


proxmox-widget-toolkit:

Elias Huhsovitz (1):
  fix #7426: ui: network: use correct name tooltips for interface types

 src/node/NetworkEdit.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)


proxmox-yew-comp:

Elias Huhsovitz (1):
  fix #7426: ui: network: use correct name tooltips for interface types

 src/configuration/network_edit.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Summary over all repositories:
  2 files changed, 13 insertions(+), 12 deletions(-)

-- 
Generated by murpp 0.12.0

[PATCH widget-toolkit 1/2] fix #7426: ui: network: use correct name tooltips for interface types

[Elias Huhsovitz]

The tooltip for the interface name field incorrectly showed VLAN
examples (e.g., vmbr0.100) when creating a Provide accurate tooltips for
Bridges, Bonds and VLANs.

Signed-off-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>
---
 src/node/NetworkEdit.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/node/NetworkEdit.js b/src/node/NetworkEdit.js
index c945139..b08d5ff 100644
--- a/src/node/NetworkEdit.js
+++ b/src/node/NetworkEdit.js
@@ -22,23 +22,23 @@ Ext.define('Proxmox.node.NetworkEdit', {
         me.isCreate = !me.iface;
 
         let iface_vtype;
+        let iface_tooltip;
 
-        if (me.iftype === 'bridge') {
+        if (me.iftype === 'bridge' || me.iftype === 'OVSBridge') {
             iface_vtype = 'BridgeName';
-        } else if (me.iftype === 'bond') {
+            iface_tooltip = gettext('Commonly: vmbr[N] (e.g., vmbr0, vmbr1). Must start with a character, max 10 alphanumeric characters.');
+        } else if (me.iftype === 'bond' || me.iftype === 'OVSBond') {
             iface_vtype = 'BondName';
+            iface_tooltip = gettext('Format: bond[N] (e.g., bond0, bond1)');
         } else if (me.iftype === 'eth' && !me.isCreate) {
             iface_vtype = 'InterfaceName';
+            iface_tooltip = gettext('Format: eth[N] (e.g., eth0, enp0s3, )');
         } else if (me.iftype === 'vlan') {
             iface_vtype = 'VlanName';
-        } else if (me.iftype === 'OVSBridge') {
-            iface_vtype = 'BridgeName';
-        } else if (me.iftype === 'OVSBond') {
-            iface_vtype = 'BondName';
-        } else if (me.iftype === 'OVSIntPort') {
-            iface_vtype = 'InterfaceName';
-        } else if (me.iftype === 'OVSPort') {
+            iface_tooltip = gettext('Format: [interface].[vlan-id] (e.g., eno1.50, bond1.30)');
+        } else if (me.iftype === 'OVSIntPort' || me.iftype === 'OVSPort') {
             iface_vtype = 'InterfaceName';
+            iface_tooltip = gettext('Alphanumeric string starting with a character.');
         } else {
             console.log(me.iftype);
             throw 'unknown network device type specified';
@@ -332,7 +332,7 @@ Ext.define('Proxmox.node.NetworkEdit', {
                 maxLength: iface_vtype === 'BridgeName' ? 10 : 15,
                 autoEl: {
                     tag: 'div',
-                    'data-qtip': gettext('For example, vmbr0.100, vmbr0, vlan0.100, vlan0'),
+                    'data-qtip': iface_tooltip,
                 },
                 listeners: {
                     change: function (f, value) {
-- 
2.47.3

[PATCH yew-comp 2/2] fix #7426: ui: network: use correct name tooltips for interface types

[Elias Huhsovitz]

The tooltip for the interface name field incorrectly showed VLAN
examples (e.g., vmbr0.100) when creating a Provide accurate tooltips for
Bridges, Bonds and VLANs.

Signed-off-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>
---
 src/configuration/network_edit.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/configuration/network_edit.rs b/src/configuration/network_edit.rs
index 6b63586..63317d9 100644
--- a/src/configuration/network_edit.rs
+++ b/src/configuration/network_edit.rs
@@ -131,7 +131,7 @@ fn render_bridge_form(form_ctx: FormContext, props: &NetworkEdit) -> Html {
             tr!("Name"),
             Field::new()
                 .name("name")
-                .tip(tr!("For example, vmbr0, vmbr0.100, vmbr1, ..."))
+                .tip(tr!("Commonly: vmbr[N] (e.g., vmbr0, vmbr1). Must start with a character, max 10 alphanumeric characters."))
                 .required(true)
                 .default(&props.default_name)
                 .disabled(is_edit)
@@ -206,7 +206,7 @@ fn render_bond_form(form_ctx: FormContext, props: &NetworkEdit) -> Html {
             Field::new()
                 .name("name")
                 .default(&props.default_name)
-                .tip(tr!("For example, bond0, bond0.100, bond1, ..."))
+                .tip(tr!("Format: bond[N] (e.g., bond0, bond1)"))
                 .required(true)
                 .disabled(is_edit)
                 .submit(!is_edit),
@@ -279,6 +279,7 @@ fn render_common_form(form_ctx: FormContext, props: &NetworkEdit) -> Html {
             Field::new()
                 .name("name")
                 .default(&props.default_name)
+                .tip(tr!("Format: [interface].[vlan-id] (e.g., eno1.50, bond1.30)"))
                 .required(true)
                 .disabled(is_edit)
                 .submit(!is_edit),
-- 
2.47.3