From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 98D771FF0B3 for ; Fri, 25 Sep 2026 11:43:25 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id BC97221792; Fri, 25 Sep 2026 11:42:37 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com subject: SPAM: [PATCH pve-manager v3 11/16] ui: firewall: add common widgets for deleting and updating references Date: Fri, 25 Sep 2026 11:42:25 +0200 Message-ID: <20260925094230.844917-12-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260925094230.844917-1-a.bied-charreton@proxmox.com> References: <20260925094230.844917-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 3 AWL 0.764 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: GHVZMPZBH76F3Y4U47U7UYRN65RE652K X-Message-ID-Hash: GHVZMPZBH76F3Y4U47U7UYRN65RE652K X-MailFrom: abied-charreton@jett.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The ipset and alias grids need the same two UI pieces to let users update/delete referencing rules when removing or renaming an object. Add them as reusable components. FirewallObjectRemove extends ConfirmRemoveDialog with a keep/disable/drop selector that sets 'dangling-references', FirewallUpdateReferences is a no/yes/force selector that submits 'update-references'. Callers will be added in subsequent commits. Signed-off-by: Arthur Bied-Charreton --- www/manager6/Makefile | 1 + www/manager6/grid/FirewallObjectCommon.js | 143 ++++++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 www/manager6/grid/FirewallObjectCommon.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index d2ea786b..e211ad40 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -98,6 +98,7 @@ JSSRC= \ form/TagFieldSet.js \ form/IsoSelector.js \ grid/BackupView.js \ + grid/FirewallObjectCommon.js \ grid/FirewallAliases.js \ grid/FirewallOptions.js \ grid/FirewallRules.js \ diff --git a/www/manager6/grid/FirewallObjectCommon.js b/www/manager6/grid/FirewallObjectCommon.js new file mode 100644 index 00000000..75c012b5 --- /dev/null +++ b/www/manager6/grid/FirewallObjectCommon.js @@ -0,0 +1,143 @@ +Ext.define('PVE.window.FirewallObjectRemove', { + extend: 'Proxmox.window.ConfirmRemoveDialog', + alias: 'widget.pveFirewallObjectRemove', + + width: 500, + + keepTip: undefined, + disableTip: undefined, + dropTip: undefined, + + initComponent: function () { + let me = this; + + me.additionalItems = [ + { + xtype: 'pveFirewallDanglingReferences', + keepTip: me.keepTip, + disableTip: me.disableTip, + dropTip: me.dropTip, + }, + ]; + + me.callParent(); + }, + + getParams: function () { + let me = this; + + // do not write into the shared config default, it outlives this dialog + me.params = Ext.applyIf( + { 'dangling-references': me.down('pveFirewallDanglingReferences').getValue() }, + me.params, + ); + + return me.callParent(); + }, +}); + +Ext.define('PVE.form.FirewallUpdateReferences', { + extend: 'Ext.form.FieldContainer', + alias: 'widget.pveFirewallUpdateReferences', + + fieldLabel: gettext('Update references'), + labelWidth: 150, + layout: { type: 'hbox', pack: 'end' }, + + // submitted parameter + name: 'update-references', + value: 'no', + + noTip: undefined, + yesTip: undefined, + forceTip: undefined, + + initComponent: function () { + let me = this; + + for (const tip of ['noTip', 'yesTip', 'forceTip']) { + if (me[tip] === undefined) { + throw new Error(`${tip} is undefined, cannot initialize component`); + } + } + + me.items = [ + { + xtype: 'segmentedbutton', + allowMultiple: false, + value: me.value, + items: [ + { text: gettext('No'), value: 'no', tooltip: me.noTip }, + { text: gettext('Yes'), value: 'yes', tooltip: me.yesTip }, + { text: gettext('Force'), value: 'force', tooltip: me.forceTip }, + ], + listeners: { + change: (btn, val) => me.down('hiddenfield').setValue(val), + }, + }, + { + xtype: 'hiddenfield', + name: me.name, + value: me.value, + isDirty: () => false, + }, + ]; + + me.callParent(); + }, +}); + +Ext.define('PVE.form.FirewallDanglingReferences', { + extend: 'Ext.form.FieldContainer', + alias: 'widget.pveFirewallDanglingReferences', + + fieldLabel: gettext('Referencing rules'), + labelWidth: 200, + layout: { type: 'hbox', pack: 'end' }, + + // submitted parameter + name: 'dangling-references', + value: 'disable', + + keepTip: undefined, + disableTip: undefined, + dropTip: undefined, + + getValue: function () { + return this.down('hiddenfield').getValue(); + }, + + initComponent: function () { + let me = this; + + for (const tip of ['keepTip', 'disableTip', 'dropTip']) { + if (me[tip] === undefined) { + throw new Error(`${tip} is undefined, cannot initialize component`); + } + } + + me.items = [ + { + xtype: 'segmentedbutton', + allowMultiple: false, + value: me.value, + items: [ + { text: gettext('Keep'), value: 'keep', tooltip: me.keepTip }, + { text: gettext('Disable'), value: 'disable', tooltip: me.disableTip }, + { text: gettext('Delete'), value: 'drop', tooltip: me.dropTip }, + ], + listeners: { + change: (btn, val) => me.down('hiddenfield').setValue(val), + }, + }, + { + xtype: 'hiddenfield', + name: me.name, + value: me.value, + isDirty: () => false, + }, + ]; + + me.callParent(); + }, +}); -- 2.47.3