public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v4 22/27] ui: firewall: aliases: add controls for dangling references
Date: Thu, 22 Oct 2026 14:47:03 +0200	[thread overview]
Message-ID: <20261022124708.429069-23-a.bied-charreton@proxmox.com> (raw)
In-Reply-To: <20261022124708.429069-1-a.bied-charreton@proxmox.com>

Add the shared dangling-references action selector to the update dialog
and replace the plain remove button with a confirmation dialog carrying
the same selector to let users choose how to handle dangling references
on config changes.

'force-rename' is not offered. It is meant as an escape hatch to recover
from a partially applied rename, putting it next to the normal actions
makes it too easy to select.

StdRemoveButton cannot pass the extra 'dangling-references' parameter,
so the remove button is switched to a plain button that opens the
shared FirewallObjectRemove dialog.

Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
 www/manager6/grid/FirewallAliases.js | 121 ++++++++++++++++++++++-----
 1 file changed, 99 insertions(+), 22 deletions(-)

diff --git a/www/manager6/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js
index 06801d33..06dc3b9c 100644
--- a/www/manager6/grid/FirewallAliases.js
+++ b/www/manager6/grid/FirewallAliases.js
@@ -7,6 +7,8 @@ Ext.define('PVE.FirewallAliasEdit', {
 
     width: 400,
 
+    onlineHelp: 'pve_firewall_dangling_references',
+
     initComponent: function () {
         let me = this;
 
@@ -20,27 +22,68 @@ Ext.define('PVE.FirewallAliasEdit', {
             me.method = 'PUT';
         }
 
+        let items = [
+            {
+                xtype: 'textfield',
+                name: me.isCreate ? 'name' : 'rename',
+                fieldLabel: gettext('Name'),
+                allowBlank: false,
+            },
+            {
+                xtype: 'textfield',
+                name: 'cidr',
+                fieldLabel: gettext('IP/CIDR'),
+                allowBlank: false,
+            },
+            {
+                xtype: 'textfield',
+                name: 'comment',
+                fieldLabel: gettext('Comment'),
+            },
+        ];
+        let advancedItems = [];
+        if (!me.isCreate) {
+            advancedItems.push({
+                xtype: 'pveFirewallReferenceAction',
+                preferredValue: 'rename',
+                referenceActions: [
+                    {
+                        text: gettext('Keep'),
+                        value: 'keep',
+                        description: gettext(
+                            'Do not touch firewall rules and IPSet members referencing this alias.',
+                        ),
+                    },
+                    {
+                        text: gettext('Disable'),
+                        value: 'disable',
+                        description: gettext(
+                            'Disable firewall rules and delete IPSet members referencing this alias.',
+                        ),
+                    },
+                    {
+                        text: gettext('Delete'),
+                        value: 'drop',
+                        description: gettext(
+                            'Delete firewall rules and IPSet members referencing this alias.',
+                        ),
+                    },
+                    {
+                        text: gettext('Rename'),
+                        value: 'rename',
+                        description: gettext(
+                            'Rewrite referencing firewall rules and IPSet members to point to the new alias name.',
+                        ),
+                    },
+                ],
+            });
+        }
+
         let ipanel = Ext.create('Proxmox.panel.InputPanel', {
             isCreate: me.isCreate,
-            items: [
-                {
-                    xtype: 'textfield',
-                    name: me.isCreate ? 'name' : 'rename',
-                    fieldLabel: gettext('Name'),
-                    allowBlank: false,
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'cidr',
-                    fieldLabel: gettext('IP/CIDR'),
-                    allowBlank: false,
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'comment',
-                    fieldLabel: gettext('Comment'),
-                },
-            ],
+            items,
+            // an empty array would still turn on the 'Advanced' checkbox
+            advancedItems: advancedItems.length ? advancedItems : undefined,
         });
 
         Ext.apply(me, {
@@ -158,15 +201,49 @@ Ext.define('PVE.FirewallAliases', {
             },
         });
 
-        me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
+        me.removeBtn = Ext.create('Proxmox.button.Button', {
+            text: gettext('Remove'),
             disabled: true,
+            dangerous: true,
             selModel: sm,
             enableFn: (rec) =>
                 !!caps.vms['VM.Config.Network'] ||
                 !!caps.dc['Sys.Modify'] ||
                 !!caps.nodes['Sys.Modify'],
-            baseurl: me.base_url + '/',
-            callback: reload,
+            handler: function (btn, event, rec) {
+                Ext.create('PVE.window.FirewallObjectRemove', {
+                    item: { id: rec.data.name },
+                    url: me.base_url + '/' + rec.data.name,
+                    text: Ext.String.format(
+                        gettext("Are you sure you want to remove alias '{0}'"),
+                        rec.data.name,
+                    ),
+                    referenceActions: [
+                        {
+                            text: gettext('Keep'),
+                            value: 'keep',
+                            description: gettext(
+                                'Do not touch firewall rules and IPSet members referencing this alias.',
+                            ),
+                        },
+                        {
+                            text: gettext('Disable'),
+                            value: 'disable',
+                            description: gettext(
+                                'Disable firewall rules and delete IPSet members referencing this alias.',
+                            ),
+                        },
+                        {
+                            text: gettext('Delete'),
+                            value: 'drop',
+                            description: gettext(
+                                'Delete firewall rules and IPSet members referencing this alias.',
+                            ),
+                        },
+                    ],
+                    apiCallDone: reload,
+                }).show();
+            },
         });
 
         Ext.apply(me, {
-- 
2.47.3





  parent reply	other threads:[~2026-10-22 12:50 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-22 12:46 [PATCH container/docs/firewall/manager/network/qemu-server v4 00/27] handle dangling references when firewall objects go away Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 01/27] firewall: move object reference helpers to their own module Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 02/27] firewall: references: add helpers to update object references Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 03/27] firewall: references: log the references an object update touched Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 04/27] firewall: references: add wrappers for the SDN-generated IPSets Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 05/27] firewall: parser: do not log errors for disabled rules Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 06/27] firewall: ipset: add option to handle dangling references on rename Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 07/27] firewall: ipset: add option to handle dangling references on delete Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 08/27] firewall: aliases: add option to handle dangling references on rename Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 09/27] firewall: aliases: add option to handle dangling references on delete Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 10/27] firewall: api: run reference updates as tasks Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 11/27] firewall: tests: add tests for object reference updates Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 12/27] firewall: references: handle security groups Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 13/27] firewall: groups: add option to handle dangling references on rename Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-firewall v4 14/27] fix #8176: firewall: groups: handle dangling references on delete Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-network v4 15/27] apply: add option to handle dangling references on VNet deletion Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH qemu-server v4 16/27] api: destroy_vm: add option to handle dangling IPSet references Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-container v4 17/27] " Arthur Bied-Charreton
2026-10-22 12:46 ` [PATCH pve-docs v4 18/27] firewall: remove trailing spaces Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-docs v4 19/27] firewall: document renaming and removing objects Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-manager v4 20/27] ui: firewall: add a common widget for handling dangling references Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-manager v4 21/27] ui: firewall: ipset: add controls for " Arthur Bied-Charreton
2026-10-22 12:47 ` Arthur Bied-Charreton [this message]
2026-10-22 12:47 ` [PATCH pve-manager v4 23/27] ui: sdn: apply: add control for dangling IPSet references Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-manager v4 24/27] ui: guest destroy: use let for non-constant variable bindings Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-manager v4 25/27] ui: guest destroy: add control for dangling IPSet references Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-manager v4 26/27] ui: firewall: show the task for reference updates Arthur Bied-Charreton
2026-10-22 12:47 ` [PATCH pve-manager v4 27/27] ui: firewall: groups: add controls for dangling references Arthur Bied-Charreton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261022124708.429069-23-a.bied-charreton@proxmox.com \
    --to=a.bied-charreton@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal