Skip to content

feat: add avatar urls to groups #4525

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
merged 16 commits into from
Oct 17, 2022
Merged

feat: add avatar urls to groups #4525

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1c1d579
feat: add avatar urls to groups
sreya Oct 12, 2022
e682e13
fix issue where update doesn't work when submitting the existing name
sreya Oct 13, 2022
8d1393c
add some tests
sreya Oct 13, 2022
223182f
fix some dumb shit
sreya Oct 13, 2022
ef0e7d5
fix test/js
sreya Oct 13, 2022
6728e8c
fix test/js AGAIN
sreya Oct 13, 2022
c26ae3a
don't autofocus
sreya Oct 13, 2022
83fed8b
Merge branch 'main' into jon/groupavatars
sreya Oct 13, 2022
76dbe3c
update migration file
sreya Oct 13, 2022
cf1243b
use a better alt for avatars
sreya Oct 14, 2022
e3af511
use avatar attr
sreya Oct 14, 2022
867bae9
use firstletter
sreya Oct 14, 2022
9020f2c
Merge branch 'main' into jon/groupavatars
sreya Oct 17, 2022
b622487
update migration file
sreya Oct 17, 2022
16c0ed6
fix a little avatar bug
sreya Oct 17, 2022
5e66b15
fix merge conflict
sreya Oct 17, 2022
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
Prev Previous commit
Next Next commit
fix some dumb shit
  • Loading branch information
@sreya
sreya committed Oct 13, 2022
commit 223182f7bc7050a255f931d35ce32c5d4fe577d1
24 changes: 12 additions & 12 deletions enterprise/coderd/groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
return
}

// If the name matches the existing group name pretend we aren't
// updating the name at all.
if req.Name == group.Name {
req.Name = ""
}

users := make([]string, 0, len(req.AddUsers)+len(req.RemoveUsers))
users = append(users, req.AddUsers...)
users = append(users, req.RemoveUsers...)
Expand Down Expand Up @@ -110,22 +116,16 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
return
}
}
if req.Name != "" {
existingGroup, err := api.Database.GetGroupByOrgAndName(ctx, database.GetGroupByOrgAndNameParams{
if req.Name != "" && req.Name != group.Name {
_, err := api.Database.GetGroupByOrgAndName(ctx, database.GetGroupByOrgAndNameParams{
OrganizationID: group.OrganizationID,
Name: req.Name,
})
if err == nil {
// We may have just queried ourself. This should really
// go in the tx.
if existingGroup.ID != group.ID {
httpapi.Write(ctx, rw, http.StatusConflict, codersdk.Response{
Message: fmt.Sprintf("A group with name %q already exists.", req.Name),
})
return
}
// If we queried ourself then we don't want to update the name.
req.Name = ""
httpapi.Write(ctx, rw, http.StatusConflict, codersdk.Response{
Message: fmt.Sprintf("A group with name %q already exists.", req.Name),
})
return
}
}

Expand Down