mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2024-12-18 13:06:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: order labels and locations by name (#86)

Browse source 
* order labels and locations by name

* sort items
This commit is contained in:
Hayden 2022-10-15 13:29:33 -08:00 committed by GitHub
parent 72bdf524c2
commit bb86a51b05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/internal/repo/repo_items.go
View file

@ -24,6 +24,7 @@ type (
Search string `json:"search"` Search string `json:"search"`
LocationIDs []uuid.UUID `json:"locationIds"` LocationIDs []uuid.UUID `json:"locationIds"`
LabelIDs []uuid.UUID `json:"labelIds"` LabelIDs []uuid.UUID `json:"labelIds"`
SortBy string `json:"sortBy"`
} }
ItemCreate struct { ItemCreate struct {
@ -252,7 +253,8 @@ func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q Ite
} }
items, err := mapItemsSummaryErr( items, err := mapItemsSummaryErr(
qb.WithLabel(). qb.Order(ent.Asc(item.FieldName)).
WithLabel().
WithLocation(). WithLocation().
All(ctx), All(ctx),
) )

1
backend/internal/repo/repo_labels.go
View file

@ -84,6 +84,7 @@ func (r *LabelRepository) GetOneByGroup(ctx context.Context, gid, ld uuid.UUID)
func (r *LabelRepository) GetAll(ctx context.Context, groupId uuid.UUID) ([]LabelSummary, error) { func (r *LabelRepository) GetAll(ctx context.Context, groupId uuid.UUID) ([]LabelSummary, error) {
return mapLabelsOut(r.db.Label.Query(). return mapLabelsOut(r.db.Label.Query().
Where(label.HasGroupWith(group.ID(groupId))). Where(label.HasGroupWith(group.ID(groupId))).
Order(ent.Asc(label.FieldName)).
WithGroup(). WithGroup().
All(ctx), All(ctx),
) )

4
backend/internal/repo/repo_locations.go
View file

@ -94,7 +94,9 @@ func (r *LocationRepository) GetAll(ctx context.Context, groupId uuid.UUID) ([]L
locations locations
WHERE WHERE
locations.group_locations = ? locations.group_locations = ?
` ORDER BY
locations.name ASC
`
rows, err := r.db.Sql().QueryContext(ctx, query, groupId) rows, err := r.db.Sql().QueryContext(ctx, query, groupId)
if err != nil { if err != nil {