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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9157C73289 for ; Mon, 5 Jul 2021 16:34:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 87FE821442 for ; Mon, 5 Jul 2021 16:34:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 6250E21423 for ; Mon, 5 Jul 2021 16:34:03 +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 38B2E40C06 for ; Mon, 5 Jul 2021 16:34:03 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 5 Jul 2021 16:34:02 +0200 Message-Id: <20210705143402.2362828-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705143402.2362828-1-d.csapak@proxmox.com> References: <20210705143402.2362828-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.675 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH widget-toolkit 4/4] node/Tasks: add 'clear filter' button 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: Mon, 05 Jul 2021 14:34:04 -0000 that does two things, show the user that some filters are active (even if filters are collapsed), and let the user to reset the filters all at once Signed-off-by: Dominik Csapak --- src/node/Tasks.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/node/Tasks.js b/src/node/Tasks.js index dfe93dc..aa074b4 100644 --- a/src/node/Tasks.js +++ b/src/node/Tasks.js @@ -89,6 +89,13 @@ Ext.define('Proxmox.node.Tasks', { let vm = me.getViewModel(); vm.set('showFilter', pressed); }, + + clearFilter: function() { + let me = this; + me.lookup('filtertoolbar').query('field').forEach((field) => { + field.setValue(undefined); + }); + }, }, listeners: { @@ -140,6 +147,44 @@ Ext.define('Proxmox.node.Tasks', { return params; }, + filterCount: function(get) { + let count = 0; + if (get('typefilter')) { + count++; + } + let status = get('statusfilter'); + if ((Ext.isArray(status) && status.length > 0) || + (!Ext.isArray(status) && status)) { + count++; + } + if (get('since')) { + count++; + } + if (get('until')) { + count++; + } + + if (get('extraFilter')) { + let extraFilter = get('extraFilter'); + for (const value of Object.values(extraFilter)) { + if (value !== undefined && value !== null && value !== "") { + count++; + } + } + } + + return count; + }, + clearFilterText: function(get) { + let count = get('filterCount'); + let fieldMsg = ''; + if (count > 1) { + fieldMsg = ` (${count} ${gettext('Fields')})`; + } else if (count > 0) { + fieldMsg = ` (1 ${gettext('Field')})`; + } + return gettext('Clear Filter') + fieldMsg; + }, }, stores: { @@ -186,6 +231,16 @@ Ext.define('Proxmox.node.Tasks', { handler: 'reload', }, '->', + { + xtype: 'button', + bind: { + text: '{clearFilterText}', + disabled: '{!filterCount}', + }, + text: gettext('Clear Filter'), + enabled: false, + handler: 'clearFilter', + }, { xtype: 'button', enableToggle: true, -- 2.30.2