From 93f4ae277136e72a12dddd3c901a73f48bd7c09d Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 6 Sep 2024 13:06:45 +0000 Subject: [PATCH] slapos_panel: improve listbox's default order and columns --- .../listbox.xml | 12 +++++++ .../my_busy_compute_partition_list.xml | 7 +++- .../listbox.xml | 12 +++++++ .../instance_listbox.xml | 15 +++++++- .../Project_viewOnSlaposPanel/listbox.xml | 4 +++ .../listbox.xml | 12 +++++++ .../listbox.xml | 8 ++--- .../listbox.xml | 36 ++++++++----------- 8 files changed, 78 insertions(+), 28 deletions(-) diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/listbox.xml index 0e8b6b395..21a15381c 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/listbox.xml @@ -18,6 +18,7 @@ <string>portal_types</string> <string>select</string> <string>selection_name</string> + <string>sort</string> <string>title</string> <string>url_columns</string> </list> @@ -204,6 +205,17 @@ <key> <string>selection_name</string> </key> <value> <string>compute_node_software_release_selection</string> </value> </item> + <item> + <key> <string>sort</string> </key> + <value> + <list> + <tuple> + <string>url_string</string> + <string>ASC</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/my_busy_compute_partition_list.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/my_busy_compute_partition_list.xml index 18db8cf2d..c80eb8c90 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/my_busy_compute_partition_list.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewCurrentUsageReport/my_busy_compute_partition_list.xml @@ -606,7 +606,12 @@ <item> <key> <string>sort</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>ASC</string> + </tuple> + </list> </value> </item> <item> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceNode_viewCurrentUsageReport/listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceNode_viewCurrentUsageReport/listbox.xml index 3beeb07f1..15f4aa3d6 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceNode_viewCurrentUsageReport/listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceNode_viewCurrentUsageReport/listbox.xml @@ -15,6 +15,7 @@ <string>list_method</string> <string>portal_types</string> <string>selection_name</string> + <string>sort</string> <string>title</string> </list> </value> @@ -161,6 +162,17 @@ <key> <string>selection_name</string> </key> <value> <string>instance_node_instance_list</string> </value> </item> + <item> + <key> <string>sort</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>ASC</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Instances</string> </value> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_viewOnSlaposPanel/instance_listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_viewOnSlaposPanel/instance_listbox.xml index 2824e5264..3179ee605 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_viewOnSlaposPanel/instance_listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_viewOnSlaposPanel/instance_listbox.xml @@ -221,7 +221,20 @@ <item> <key> <string>sort</string> </key> <value> - <list/> + <list> + <tuple> + <string>portal_type</string> + <string>DESC</string> + </tuple> + <tuple> + <string>source_reference</string> + <string>ASC</string> + </tuple> + <tuple> + <string>title</string> + <string>ASC</string> + </tuple> + </list> </value> </item> <item> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_viewOnSlaposPanel/listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_viewOnSlaposPanel/listbox.xml index 791255dce..ab1c4860b 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_viewOnSlaposPanel/listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_viewOnSlaposPanel/listbox.xml @@ -176,6 +176,10 @@ <key> <string>sort</string> </key> <value> <list> + <tuple> + <string>portal_type</string> + <string>ascending</string> + </tuple> <tuple> <string>title</string> <string>ascending</string> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/RemoteNode_viewCurrentUsageReport/listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/RemoteNode_viewCurrentUsageReport/listbox.xml index 8e9cf8d54..b0d7f8e5a 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/RemoteNode_viewCurrentUsageReport/listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/RemoteNode_viewCurrentUsageReport/listbox.xml @@ -15,6 +15,7 @@ <string>list_method</string> <string>portal_types</string> <string>selection_name</string> + <string>sort</string> <string>title</string> </list> </value> @@ -145,6 +146,17 @@ <key> <string>selection_name</string> </key> <value> <string>remote_node_instance_list</string> </value> </item> + <item> + <key> <string>sort</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>ASC</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Instances</string> </value> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewMyTicketListOnSlaposPanel/listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewMyTicketListOnSlaposPanel/listbox.xml index c5b01fe8c..63ca61887 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewMyTicketListOnSlaposPanel/listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewMyTicketListOnSlaposPanel/listbox.xml @@ -148,6 +148,10 @@ <string>resource_title</string> <string>Type</string> </tuple> + <tuple> + <string>destination_decision_title</string> + <string>Requester</string> + </tuple> <tuple> <string>causality_translated_portal_type</string> <string>Channel</string> @@ -263,10 +267,6 @@ <string>creation_date</string> <string>Creation Date</string> </tuple> - <tuple> - <string>destination_decision_title</string> - <string>Requester</string> - </tuple> <tuple> <string>modification_date</string> <string>Modification Date</string> diff --git a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewTicketListOnSlaposPanel/listbox.xml b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewTicketListOnSlaposPanel/listbox.xml index af4b55247..0e63c3702 100644 --- a/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewTicketListOnSlaposPanel/listbox.xml +++ b/master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewTicketListOnSlaposPanel/listbox.xml @@ -141,6 +141,18 @@ <string>resource_title</string> <string>Type</string> </tuple> + <tuple> + <string>source_decision_title</string> + <string>Supervisor</string> + </tuple> + <tuple> + <string>destination_decision_title</string> + <string>Requester</string> + </tuple> + <tuple> + <string>follow_up_title</string> + <string>Incident Response</string> + </tuple> <tuple> <string>causality_translated_portal_type</string> <string>Channel</string> @@ -229,10 +241,6 @@ <string>destination_project_title</string> <string>Requested Project</string> </tuple> - <tuple> - <string>source_project_title</string> - <string>Handled Project</string> - </tuple> <tuple> <string>owner_title</string> <string>Owner</string> @@ -268,21 +276,13 @@ <string>resource_title</string> <string>Type</string> </tuple> - <tuple> - <string>source_decision_title</string> - <string>Supervisor</string> - </tuple> <tuple> <string>creation_date</string> <string>Creation Date</string> </tuple> <tuple> - <string>destination_decision_title</string> - <string>Requester</string> - </tuple> - <tuple> - <string>follow_up_title</string> - <string>Incident Response</string> + <string>source_project_title</string> + <string>Handled Project</string> </tuple> <tuple> <string>modification_date</string> @@ -454,14 +454,6 @@ <key> <string>sort</string> </key> <value> <list> - <tuple> - <string>follow_up_title</string> - <string>Incident ASC</string> - </tuple> - <tuple> - <string>source_decision_title</string> - <string>ASC</string> - </tuple> <tuple> <string>modification_date</string> <string>DESC</string> -- 2.30.9