Re: [PATCH manager 1/2] fix #7136: ui: tree: harmonize folder view resource ordering

[Dominik Csapak <d.csapak@proxmox.com>]

while the code here looks ok this produces an issue with all places
where we use the type:
* selecting a category now tries to load the wrong panel type
   (see Workspace.js:236)
* right clicking on vm/container throws an exception
* resource pool folder has the wrong text ('Root' instead of 
'Resource-Pools')

to fix the bug, wouldn't it be easier to use the 'groupbyid' field
in case the type === 'type' ?

then we don't have to touch that semantic at all


also one line is not correctly formatted, running make tidy before
submitting would be great :)

On 8/18/26 10:31 AM, Elias Huhsovitz wrote:
> Grouping nodes in the Folder view are assigned the literal type: 'type'
> instead of their actual type. This causes `getTypeOrder` to return a
> default value for all groups.
> 
> This causes Resources in the Folder View to be ordered
> lexicographically, whereas the Server View correctly relies on the
> `getTypeOrder` function.
> 
> Match the Server View ordering by setting the grouping node's `type` to
> the actual resource type when grouping by `type`. This way
> `getTypeOrder` receives the correct type for sorting.
> 
> Simplify the text resolution logic in `addChildSorted`.
> 
> Propagate `iconCls` from `typeDefaults` to ensure grouping nodes
> display the correct icons.
> 
> Signed-off-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>
> ---
>   www/manager6/tree/ResourceTree.js | 16 +++++++++++-----
>   1 file changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
> index 6ea28919..a7723095 100644
> --- a/www/manager6/tree/ResourceTree.js
> +++ b/www/manager6/tree/ResourceTree.js
> @@ -232,13 +232,13 @@ Ext.define('PVE.tree.ResourceTree', {
>           if (info.groupbyid) {
>               if (me.viewFilter.groupRenderer) {
>                   info.text = me.viewFilter.groupRenderer(info);
> -            } else if (info.type === 'type') {
> +            } else {
>                   let defaults = PVE.tree.ResourceTree.typeDefaults[info.groupbyid];
>                   if (defaults && defaults.text) {
>                       info.text = defaults.text;
> +                } else {
> +                    info.text = info.groupbyid;
>                   }
> -            } else {
> -                info.text = info.groupbyid;
>               }
>           }
>           let child = Ext.create('PVETree', info);
> @@ -267,11 +267,17 @@ Ext.define('PVE.tree.ResourceTree', {
>                   if (info.type === groupBy) {
>                       groupinfo = info;
>                   } else {
> +                    const type = groupBy === 'type' ? v : groupBy;
>                       groupinfo = {
> -                        type: groupBy,
> +                        type: type,
>                           id: groupBy + '/' + v,
>                       };
> -                    if (groupBy !== 'type') {
> +                    if (groupBy === 'type') {
> +                        let defaults = PVE.tree.ResourceTree.typeDefaults[v];
> +                        if (defaults && defaults.iconCls) {
> +                            groupinfo.iconCls = defaults.iconCls;
> +                        }
> +                    } else {
>                           groupinfo[groupBy] = v;
>                       }
>                   }