[pve-devel] [PATCH cluster 1/1] datacenter config: add options for sorting the gui tree

Dominik Csapak d.csapak at proxmox.com
Wed Feb 1 16:49:14 CET 2023


namely the 'sort-field' (either vmid or name), 'group-templates' (if the
guest templates should be grouped seperately) and 'group-guest-types'
(if the guest types should be grouped or not)

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 data/PVE/DataCenterConfig.pm | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/data/PVE/DataCenterConfig.pm b/data/PVE/DataCenterConfig.pm
index 7a24870..36e0ea6 100644
--- a/data/PVE/DataCenterConfig.pm
+++ b/data/PVE/DataCenterConfig.pm
@@ -219,6 +219,28 @@ my $user_tag_privs_format = {
     },
 };
 
+my $tree_sorting_format = {
+    'sort-field' => {
+	optional => 1,
+	type => 'string',
+	enum => ['vmid', 'name'],
+	default => 'vmid',
+	description => "Controls the field to use as sort order and primary display.",
+    },
+    'group-templates' => {
+	optional => 1,
+	type => 'boolean',
+	default => 1,
+	description => "If enabled, groups the guest templates seperately from regular guests.",
+    },
+    'group-guest-types' => {
+	optional => 1,
+	type => 'boolean',
+	default => 1,
+	description => "If enabled, groups the guests by type.",
+    },
+};
+
 my $datacenter_schema = {
     type => "object",
     additionalProperties => 0,
@@ -374,6 +396,12 @@ my $datacenter_schema = {
 	    pattern => "(?:${PVE::JSONSchema::PVE_TAG_RE};)*${PVE::JSONSchema::PVE_TAG_RE}",
 	    typetext => "<tag>[;<tag>...]",
 	},
+	'tree-sorting' => {
+	    optional => 1,
+	    type => 'string',
+	    description => "Tree sorting and grouping options",
+	    format => $tree_sorting_format,
+	},
     },
 };
 
@@ -442,6 +470,10 @@ sub parse_datacenter_config {
 	$res->{'registered-tags'} = [split(';', $admin_tags)];
     }
 
+    if (my $tree_sorting = $res->{'tree-sorting'}) {
+	$res->{'tree-sorting'} = parse_property_string($tree_sorting_format, $tree_sorting);
+    }
+
     # for backwards compatibility only, new migration property has precedence
     if (defined($res->{migration_unsecure})) {
 	if (defined($res->{migration}->{type})) {
@@ -524,6 +556,11 @@ sub write_datacenter_config {
 	$cfg->{'registered-tags'} = join(';', sort $admin_tags->@*);
     }
 
+    if (ref(my $tree_sorting = $cfg->{'tree-sorting'})) {
+	$cfg->{'tree-sorting'} =
+	    PVE::JSONSchema::print_property_string($tree_sorting, $tree_sorting_format);
+    }
+
     my $comment = '';
     # add description as comment to top of file
     my $description = $cfg->{description} || '';
-- 
2.30.2






More information about the pve-devel mailing list