public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-manager] fix #4393: ui: storage backup view: make pbs-specific columns sortable
Date: Fri, 16 Dec 2022 13:45:06 +0100	[thread overview]
Message-ID: <20221216124506.316371-1-s.hanreich@proxmox.com> (raw)

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 <s.hanreich@proxmox.com>
---
 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




             reply	other threads:[~2022-12-16 12:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 12:45 Stefan Hanreich [this message]
2023-01-16 13:26 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221216124506.316371-1-s.hanreich@proxmox.com \
    --to=s.hanreich@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal