From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7CE736181F; Tue, 18 Aug 2020 19:40:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7187C1656E; Tue, 18 Aug 2020 19:40:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CEC8916561; Tue, 18 Aug 2020 19:40:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 96FEA44626; Tue, 18 Aug 2020 19:40:06 +0200 (CEST) To: Proxmox VE development discussion , Hannes Laimer , pbs-devel@lists.proxmox.com References: <20200818084023.54780-1-h.laimer@proxmox.com> <20200818084023.54780-2-h.laimer@proxmox.com> From: Thomas Lamprecht Message-ID: Date: Tue, 18 Aug 2020 19:40:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:80.0) Gecko/20100101 Thunderbird/80.0 MIME-Version: 1.0 In-Reply-To: <20200818084023.54780-2-h.laimer@proxmox.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.282 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.567 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [item.id] Subject: Re: [pve-devel] [PATCH proxmox-widget-toolkit 1/5] ui refactoring: refactored SafeDestroy from pve-manager into proxmox-widget-toolkit X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2020 17:40:37 -0000 You say refactored: What, besides the name, did you change and why? On 18.08.20 10:40, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > src/Makefile | 1 + > src/window/SafeRemove.js | 193 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 194 insertions(+) > create mode 100644 src/window/SafeRemove.js > > + > + initComponent: function () { > + const me = this; > + me.callParent(); > + > + const item = me.getItem(); > + > + if (!Ext.isDefined(item.id)) { > + throw "no ID specified"; > + } > + > + if (!Ext.isDefined(item.type)) { > + throw "no Disk type specified"; does this always have to by a disk type? It can be a VM, or something completely different. > + } > + > + const messageCmp = me.lookupReference('messageCmp'); > + let msg; > + > + if (item.type === 'VM') { > + msg = Proxmox.Utils.format_task_description('qmdestroy', item.id); > + } else if (item.type === 'CT') { > + msg = Proxmox.Utils.format_task_description('vzdestroy', item.id); > + } else if (item.type === 'CephPool') { > + msg = Proxmox.Utils.format_task_description('cephdestroypool', item.id); > + } else if (item.type === 'Image') { > + msg = Proxmox.Utils.format_task_description('unknownimgdel', item.id); > + } else { > + throw "unknown item type specified"; > + } I'd like to avoid having downstream logic here, that adds cyclic coupling. Why not either do: * a minimal overwrite in PVE, would have the additional benefit of not needing to touch all use sites there. * replace the "type" property with a "task" property, avoiding the need to map. > + > + if (!(item.type === 'VM' || item.type === 'CT')) { > + let purgeCheckbox = me.lookupReference('purgeCheckbox'); > + purgeCheckbox.setDisabled(true); > + purgeCheckbox.setHidden(true); If we touch this we could also make this more explicit with a default off "purgeable" (or similar name) config property. > + } > + > + messageCmp.setHtml(msg); > + > + const confirmField = me.lookupReference('confirmField'); > + msg = gettext('Please enter the ID to confirm') + > + ' (' + item.id + ')'; > + confirmField.setFieldLabel(msg); > + } > +}); >