Skip to content

feat(site): display user avatar #11893

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 9 commits into from
Jan 30, 2024
Merged

feat(site): display user avatar #11893

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dbd5be7
feat(site): display user avatar
BrunoQuaresma Jan 29, 2024
47cc1c7
Fix tests
BrunoQuaresma Jan 29, 2024
ef9d63b
avoid initializing database.User struct with zero-valued fields
johnstcn Jan 30, 2024
194628d
correct references to Username instead of Name
johnstcn Jan 30, 2024
aef1d44
update golden files
johnstcn Jan 30, 2024
e94a0e1
add avatar URL to org member httpmw
johnstcn Jan 30, 2024
b424e48
use avatar URL from org member httpmw
johnstcn Jan 30, 2024
7630879
check avatar URL is set in workspacebuild test
johnstcn Jan 30, 2024
c3d9c51
add more kyle
johnstcn Jan 30, 2024
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
correct references to Username instead of Name
  • Loading branch information
@johnstcn
johnstcn committed Jan 30, 2024
commit 194628d179fad8274ac3746e4258701c89a579c6
4 changes: 2 additions & 2 deletions coderd/workspacebuilds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ func (api *API) convertWorkspaceBuild(
scripts := scriptsByAgentID[agent.ID]
logSources := logSourcesByAgentID[agent.ID]
apiAgent, err := db2sdk.WorkspaceAgent(
api.DERPMap(), *api.TailnetCoordinator.Load(), agent, db2sdk.Apps(apps, agent, owner.Name, workspace), convertScripts(scripts), convertLogSources(logSources), api.AgentInactiveDisconnectTimeout,
api.DERPMap(), *api.TailnetCoordinator.Load(), agent, db2sdk.Apps(apps, agent, owner.Username, workspace), convertScripts(scripts), convertLogSources(logSources), api.AgentInactiveDisconnectTimeout,
api.DeploymentValues.AgentFallbackTroubleshootingURL.String(),
)
if err != nil {
Expand All @@ -927,7 +927,7 @@ func (api *API) convertWorkspaceBuild(
CreatedAt: build.CreatedAt,
UpdatedAt: build.UpdatedAt,
WorkspaceOwnerID: workspace.OwnerID,
WorkspaceOwnerName: owner.Name,
WorkspaceOwnerName: owner.Username,
WorkspaceOwnerAvatarURL: owner.AvatarURL,
WorkspaceID: build.WorkspaceID,
WorkspaceName: workspace.Name,
Expand Down
2 changes: 1 addition & 1 deletion coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ func convertWorkspace(
CreatedAt: workspace.CreatedAt,
UpdatedAt: workspace.UpdatedAt,
OwnerID: workspace.OwnerID,
OwnerName: owner.Name,
OwnerName: owner.Username,
OwnerAvatarURL: owner.AvatarURL,
OrganizationID: workspace.OrganizationID,
TemplateID: workspace.TemplateID,
Expand Down