Skip to content

Add support for storing filters in dashboard entries #215

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

Draft
spl3g wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Add support for storing filters in dashboard entries #215

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f25e5e3
feat: add server support for storing tag filters
spl3g Jun 16, 2025
dcd034b
feat: add TagFilterSelector componenet
spl3g Jun 16, 2025
3d09ce9
feat: add exclude and include tags fields to entry popups
spl3g Jun 16, 2025
09d830f
feat: provide exclude and include tags when querying stats
spl3g Jun 16, 2025
ddc80fb
fix: combine excluded and included tags, simplify tag checking
spl3g Jun 17, 2025
2a0474d
fix: remove useState for excludeTags and includeTags
spl3g Jun 17, 2025
97969f4
feat: add includeInputValueOnNoMatch to useSuggest
spl3g Jun 17, 2025
da667eb
fix: update handleChange so it opens Downshift automatically
spl3g Jun 17, 2025
25a7a7e
fix: provide handleChange instead of calling it
spl3g Jun 20, 2025
a6cf516
fix: check if provided tags list is empty
spl3g Jun 21, 2025
af5e6b2
feat: use a transaction when updating dashboard entry
spl3g Jun 21, 2025
7508f5a
fix: replace ordinary db connection with transaction
spl3g Aug 31, 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
24 changes: 22 additions & 2 deletions dashboard/entry/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,19 @@ func (r *ResolverForEntry) UpdateDashboardEntry(ctx context.Context, id int, ent
entry.Total = *total
}

tx := r.DB.Begin()
if err := tx.Error; err != nil {
return nil, err
}
defer func() {
if r := recover(); r != nil {
tx.Rollback()
panic(r)
} else if tx != nil {
tx.Rollback()
}
}()

if stats != nil {
if stats.RangeID != nil {
if _, err := util.FindDashboardRange(r.DB, *stats.RangeID); err != nil {
Copy link
Member

@jmattheis jmattheis Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deadlocking test is likely fixed by using tx instead of r.DB here, as there may be only one connection and with the transaction open, r.DB cannot open a new connection.

if _, err := util.FindDashboardRange(tx, *stats.RangeID); err != nil {

Copy link
Author

@spl3g spl3g Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, i missed that

Expand All @@ -61,7 +74,7 @@ func (r *ResolverForEntry) UpdateDashboardEntry(ctx context.Context, id int, ent
return nil, err
}

if err := r.DB.Where("dashboard_entry_id = ?", id).Delete(new(model.DashboardTagFilter)).Error; err != nil {
if err := tx.Where("dashboard_entry_id = ?", id).Delete(new(model.DashboardTagFilter)).Error; err != nil {
return nil, fmt.Errorf("failed to update tag filters: %s", err)
}

Expand All @@ -78,7 +91,14 @@ func (r *ResolverForEntry) UpdateDashboardEntry(ctx context.Context, id int, ent
return &gqlmodel.DashboardEntry{}, err
}

r.DB.Save(entry)
if err := tx.Save(entry).Error; err != nil {
return nil, err
}

if err := tx.Commit().Error; err != nil {
return nil, err
}

tx = nil
return convert.ToExternalEntry(entry)
}
Loading