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 9F2D879A47 for ; Wed, 27 Oct 2021 14:58:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9CF4C13674 for ; Wed, 27 Oct 2021 14:58:44 +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 1827D1366B for ; Wed, 27 Oct 2021 14:58:44 +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 E4E87468BB for ; Wed, 27 Oct 2021 14:58:43 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 27 Oct 2021 14:58:43 +0200 Message-Id: <20211027125843.1082129-1-d.csapak@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.265 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: [pbs-devel] [PATCH proxmox-backup] ui: datastore content: improve sorting verification column X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2021 12:58:44 -0000 sort failed < no verify < outdated < all ok Signed-off-by: Dominik Csapak --- www/datastore/Content.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/www/datastore/Content.js b/www/datastore/Content.js index 87a9079d..5f98653a 100644 --- a/www/datastore/Content.js +++ b/www/datastore/Content.js @@ -826,6 +826,23 @@ Ext.define('PBS.DataStoreContent', { sortable: true, dataIndex: 'verification', width: 120, + sorter: (arec, brec) => { + let a = arec.data.verification || { ok: 0, outdated: 0, failed: 0 }; + let b = brec.data.verification || { ok: 0, outdated: 0, failed: 0 }; + if (a.failed === b.failed) { + if (a.none === b.none) { + if (a.outdated === b.outdated) { + return b.ok - a.ok; + } else { + return b.outdated - a.outdated; + } + } else { + return b.none - a.none; + } + } else { + return b.failed - a.failed; + } + }, renderer: (v, meta, record) => { let i = (cls, txt) => ` ${txt}`; if (v === undefined || v === null) { -- 2.30.2