Skip to content

RM-86: Keep multi-panel selection order when editing individual panels #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenHall-1 merged 5 commits into from
Dec 13, 2025
Merged

RM-86: Keep multi-panel selection order when editing individual panels #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6f7f6d
RM-86: Keep multi-panel selection order when editing individual panels
biast12 Nov 18, 2025
27a67b2
bump db
BenHall-1 Dec 13, 2025
5785b6d
bump db
BenHall-1 Dec 13, 2025
2b84931
Merge branch 'master' into RM-86
BenHall-1 Dec 13, 2025
429526c
go mod tidy
BenHall-1 Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/http/endpoints/api/panel/multipanelcreate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,12 @@ func MultiPanelCreate(c *gin.Context) {
}

group, _ := errgroup.WithContext(context.Background())
for _, panel := range panels {
for i, panel := range panels {
i := i
panel := panel

group.Go(func() error {
return dbclient.Client.MultiPanelTargets.Insert(c, multiPanel.Id, panel.PanelId)
return dbclient.Client.MultiPanelTargets.Insert(c, multiPanel.Id, panel.PanelId, i)
})
}

Expand Down
5 changes: 3 additions & 2 deletions app/http/endpoints/api/panel/multipanelupdate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,12 @@ func MultiPanelUpdate(c *gin.Context) {

// insert new targets
group, _ := errgroup.WithContext(context.Background())
for _, panel := range panels {
for i, panel := range panels {
i := i
panel := panel

group.Go(func() error {
return dbclient.Client.MultiPanelTargets.Insert(c, multiPanel.Id, panel.PanelId)
return dbclient.Client.MultiPanelTargets.Insert(c, multiPanel.Id, panel.PanelId, i)
})
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/PanelDropdown.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
export let isMulti = true;
export let isSearchable = false;

let selectedRaw = isMulti ? panels.filter((p) => selected.includes(p.panel_id)) : selected;
let selectedRaw = isMulti ? selected.map(panelId => panels.find(p => p.panel_id === panelId)).filter(p => p !== undefined) : selected;

function labelMapper(panel) {
return panel.title || "";
Expand Down Expand Up @@ -46,7 +46,7 @@
function applyOverrides() {
if (isMulti) {
//selected = [];
selectedRaw = panels.filter((p) => selected.includes(p.panel_id));
selectedRaw = selected.map(panelId => panels.find(p => p.panel_id === panelId)).filter(p => p !== undefined);
} else {
if (selectedRaw) {
selectedRaw = selectedRaw.panel_id;
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/BurntSushi/toml v1.2.1
github.com/TicketsBot-cloud/archiverclient v0.0.0-20251015181023-f0b66a074704
github.com/TicketsBot-cloud/common v0.0.0-20251026182733-99fa0dc31d90
github.com/TicketsBot-cloud/database v0.0.0-20251115092952-706aaa38b688
github.com/TicketsBot-cloud/database v0.0.0-20251213191234-a4ff495ab1be
github.com/TicketsBot-cloud/gdl v0.0.0-20251129162044-695f8e5079eb
github.com/TicketsBot-cloud/logarchiver v0.0.0-20251018211319-7a7df5cacbdc
github.com/TicketsBot-cloud/worker v0.0.0-20251212162840-a9cc9bbf5692
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ github.com/TicketsBot-cloud/archiverclient v0.0.0-20251015181023-f0b66a074704 h1
github.com/TicketsBot-cloud/archiverclient v0.0.0-20251015181023-f0b66a074704/go.mod h1:Mux1bEPpOHwRw1wo6Fa6qJLJH9Erk9qv1yAIfLi1Wmw=
github.com/TicketsBot-cloud/common v0.0.0-20251026182733-99fa0dc31d90 h1:gv7uVneGf22eTwT976iWpCPWA6yPY51nfWPadcDreWI=
github.com/TicketsBot-cloud/common v0.0.0-20251026182733-99fa0dc31d90/go.mod h1:uRra7EnPtmd7Og9dLZ7SYgb0AwODeBnd5qSaDdWcjtU=
github.com/TicketsBot-cloud/database v0.0.0-20251115092952-706aaa38b688 h1:Gwfpq0RZUcl+QeRrjW70oycsNP/4YT+/liKxtRVX/RY=
github.com/TicketsBot-cloud/database v0.0.0-20251115092952-706aaa38b688/go.mod h1:LPDEn9e5wccH7rq/pUlVcL3UhyLnnwdM2dhj0tp/ljo=
github.com/TicketsBot-cloud/database v0.0.0-20251213191234-a4ff495ab1be h1:l3ItJmYT3H10F39V5Y23SugYt8+8bUysqaQuG22rsJw=
github.com/TicketsBot-cloud/database v0.0.0-20251213191234-a4ff495ab1be/go.mod h1:LPDEn9e5wccH7rq/pUlVcL3UhyLnnwdM2dhj0tp/ljo=
github.com/TicketsBot-cloud/gdl v0.0.0-20251129162044-695f8e5079eb h1:Efk1PmGyFH3/MmY3r24xCKNP1r5fMxedYTvnYSH3gc8=
github.com/TicketsBot-cloud/gdl v0.0.0-20251129162044-695f8e5079eb/go.mod h1:CdwBR2egPtxUXjD2CgC9ZwfuB8dz9HPePM8nuG6dt7Y=
github.com/TicketsBot-cloud/logarchiver v0.0.0-20251018211319-7a7df5cacbdc h1:qTLNpCvIqM7UwZ6MdWQ9EztcDsIJfHh+VJdG+ULLEaA=
Expand Down