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 C4EAFF5CD for ; Fri, 16 Dec 2022 13:45:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A1AC421ECE for ; Fri, 16 Dec 2022 13:45:08 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 16 Dec 2022 13:45:08 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 077782C1160; Fri, 16 Dec 2022 13:45:08 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 16 Dec 2022 13:45:06 +0100 Message-Id: <20221216124506.316371-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.337 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records RDNS_NONE 0.793 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 Subject: [pve-devel] [PATCH pve-manager] fix #4393: ui: storage backup view: make pbs-specific columns sortable 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: Fri, 16 Dec 2022 12:45:08 -0000 The sort order is analogous to how it behaves in the datastore content overview in pbs. This means sorting in ascending order behaves as follows: Verify State * failed * none * ok Encryption * no * yes For the encryption state there is theoretically a distinction between signed and encrypted, but as far as I can tell we do not render this distinction in PVE, which is why I chose to not make this distinction for sorting as well. Signed-off-by: Stefan Hanreich --- www/manager6/Utils.js | 7 +++++++ www/manager6/storage/BackupView.js | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 8c118fa2..3dd287e3 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1963,6 +1963,13 @@ Ext.define('PVE.Utils', { }, tagCharRegex: /^[a-z0-9+_.-]+$/i, + + verificationStateOrder: { + 'failed': 0, + 'none': 1, + 'ok': 2, + '__default__': 3, + }, }, singleton: true, diff --git a/www/manager6/storage/BackupView.js b/www/manager6/storage/BackupView.js index 2328c0fc..ef3a0166 100644 --- a/www/manager6/storage/BackupView.js +++ b/www/manager6/storage/BackupView.js @@ -197,11 +197,23 @@ Ext.define('PVE.storage.BackupView', { header: gettext('Encrypted'), dataIndex: 'encrypted', renderer: PVE.Utils.render_backup_encryption, + sorter: { + property: 'encrypted', + transform: (value) => value ? 1 : 0, + }, }, verification: { header: gettext('Verify State'), dataIndex: 'verification', renderer: PVE.Utils.render_backup_verification, + sorter: { + property: 'verification', + transform: (value) => { + let state = value?.state ?? 'none'; + let order = PVE.Utils.verificationStateOrder; + return order[state] ?? order.__default__; + }, + }, }, }; } -- 2.30.2