medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Treat root fieldset separately for ordering

This commit is contained in:
jamesread 2026-03-09 09:31:40 +00:00
parent b78b0df84d
commit b298a6bd8c
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/internal/api/api_test.go
View File

@ -553,7 +553,7 @@ func TestOrderTopLevelDashboardComponents_RegularFieldsetsPreserveConfigOrder(t
root := &apiv1.DashboardComponent{Title: "Actions", Type: "fieldset", EntityType: ""} root := &apiv1.DashboardComponent{Title: "Actions", Type: "fieldset", EntityType: ""}
components := []*apiv1.DashboardComponent{zebra, alpha, root} components := []*apiv1.DashboardComponent{zebra, alpha, root}
out := orderTopLevelDashboardComponents(components) out := orderTopLevelDashboardComponents(components, root)
require.Len(t, out, 3) require.Len(t, out, 3)
assert.Same(t, zebra, out[0], "first must be Zebra (config order)") assert.Same(t, zebra, out[0], "first must be Zebra (config order)")
@ -566,7 +566,7 @@ func TestOrderTopLevelDashboardComponents_SortablesSorted(t *testing.T) {
entityAlpha := &apiv1.DashboardComponent{Title: "Alpha", Type: "fieldset", EntityType: "server"} entityAlpha := &apiv1.DashboardComponent{Title: "Alpha", Type: "fieldset", EntityType: "server"}
components := []*apiv1.DashboardComponent{entityBeta, entityAlpha} components := []*apiv1.DashboardComponent{entityBeta, entityAlpha}
out := orderTopLevelDashboardComponents(components) out := orderTopLevelDashboardComponents(components, nil)
require.Len(t, out, 2) require.Len(t, out, 2)
assert.Equal(t, "Alpha", out[0].Title, "sortables ordered by title") assert.Equal(t, "Alpha", out[0].Title, "sortables ordered by title")

42
service/internal/api/dashboards.go
View File

@ -112,9 +112,10 @@ func buildDashboardFromConfig(dashboard *config.DashboardComponent, rr *Dashboar
} }
func buildDashboardFromConfigWithEntity(dashboard *config.DashboardComponent, rr *DashboardRenderRequest, entity *entities.Entity) *apiv1.Dashboard { func buildDashboardFromConfigWithEntity(dashboard *config.DashboardComponent, rr *DashboardRenderRequest, entity *entities.Entity) *apiv1.Dashboard {
contents, root := getDashboardComponentContentsWithEntity(dashboard, rr, entity)
return &apiv1.Dashboard{ return &apiv1.Dashboard{
Title: dashboard.Title, Title: dashboard.Title,
Contents: orderTopLevelDashboardComponents(removeNulls(getDashboardComponentContentsWithEntity(dashboard, rr, entity))), Contents: orderTopLevelDashboardComponents(removeNulls(contents), root),
} }
} }
@ -216,19 +217,23 @@ func removeNulls(components []*apiv1.DashboardComponent) []*apiv1.DashboardCompo
return ret return ret
} }
func isRegularFieldset(component *apiv1.DashboardComponent, index int, totalLen int) bool { func isNonEntityFieldset(component *apiv1.DashboardComponent) bool {
if component == nil || component.Type != "fieldset" || component.EntityType != "" { return component != nil && component.Type == "fieldset" && component.EntityType == ""
return false
}
return index != totalLen-1
} }
func partitionTopLevelComponents(components []*apiv1.DashboardComponent) (regular, sortables []*apiv1.DashboardComponent, isRegular []bool) { func isRegularFieldset(component *apiv1.DashboardComponent, root *apiv1.DashboardComponent) bool {
if !isNonEntityFieldset(component) {
return false
}
return root == nil || component != root
}
func partitionTopLevelComponents(components []*apiv1.DashboardComponent, root *apiv1.DashboardComponent) (regular, sortables []*apiv1.DashboardComponent, isRegular []bool) {
regular = make([]*apiv1.DashboardComponent, 0) regular = make([]*apiv1.DashboardComponent, 0)
sortables = make([]*apiv1.DashboardComponent, 0) sortables = make([]*apiv1.DashboardComponent, 0)
isRegular = make([]bool, len(components)) isRegular = make([]bool, len(components))
for i, c := range components { for i, c := range components {
anchor := isRegularFieldset(c, i, len(components)) anchor := isRegularFieldset(c, root)
isRegular[i] = anchor isRegular[i] = anchor
if anchor { if anchor {
regular = append(regular, c) regular = append(regular, c)
@ -254,16 +259,16 @@ func mergeOrderedTopLevelComponents(regular, sortables []*apiv1.DashboardCompone
return out return out
} }
func orderTopLevelDashboardComponents(components []*apiv1.DashboardComponent) []*apiv1.DashboardComponent { func orderTopLevelDashboardComponents(components []*apiv1.DashboardComponent, root *apiv1.DashboardComponent) []*apiv1.DashboardComponent {
if len(components) == 0 { if len(components) == 0 {
return components return components
} }
regular, sortables, isRegular := partitionTopLevelComponents(components) regular, sortables, isRegular := partitionTopLevelComponents(components, root)
sortDashboardComponents(sortables) sortDashboardComponents(sortables)
return mergeOrderedTopLevelComponents(regular, sortables, isRegular) return mergeOrderedTopLevelComponents(regular, sortables, isRegular)
} }
func getDashboardComponentContentsWithEntity(dashboard *config.DashboardComponent, rr *DashboardRenderRequest, entity *entities.Entity) []*apiv1.DashboardComponent { func getDashboardComponentContentsWithEntity(dashboard *config.DashboardComponent, rr *DashboardRenderRequest, entity *entities.Entity) ([]*apiv1.DashboardComponent, *apiv1.DashboardComponent) {
ret := make([]*apiv1.DashboardComponent, 0) ret := make([]*apiv1.DashboardComponent, 0)
rootFieldset := createRootFieldset() rootFieldset := createRootFieldset()
@ -271,7 +276,11 @@ func getDashboardComponentContentsWithEntity(dashboard *config.DashboardComponen
processDashboardSubitemWithEntity(subitem, rr, &ret, rootFieldset, entity) processDashboardSubitemWithEntity(subitem, rr, &ret, rootFieldset, entity)
} }
return appendRootFieldsetIfNeeded(ret, rootFieldset) if len(rootFieldset.Contents) > 0 {
ret = append(ret, rootFieldset)
return ret, rootFieldset
}
return ret, nil
} }
func createRootFieldset() *apiv1.DashboardComponent { func createRootFieldset() *apiv1.DashboardComponent {
@ -310,18 +319,11 @@ func processDashboardSubitemWithEntity(subitem *config.DashboardComponent, rr *D
} }
} }
func appendRootFieldsetIfNeeded(ret []*apiv1.DashboardComponent, rootFieldset *apiv1.DashboardComponent) []*apiv1.DashboardComponent {
if len(rootFieldset.Contents) > 0 {
ret = append(ret, rootFieldset)
}
return ret
}
func buildDashboardComponentSimpleWithEntity(subitem *config.DashboardComponent, rr *DashboardRenderRequest, entity *entities.Entity) *apiv1.DashboardComponent { func buildDashboardComponentSimpleWithEntity(subitem *config.DashboardComponent, rr *DashboardRenderRequest, entity *entities.Entity) *apiv1.DashboardComponent {
var contents []*apiv1.DashboardComponent var contents []*apiv1.DashboardComponent
if len(subitem.Contents) > 0 { if len(subitem.Contents) > 0 {
contents = getDashboardComponentContentsWithEntity(subitem, rr, entity) contents, _ = getDashboardComponentContentsWithEntity(subitem, rr, entity)
} }
action := rr.findActionForEntity(subitem.Title, entity) action := rr.findActionForEntity(subitem.Title, entity)