feat(site): edit organization member roles (#13977)

coderd/apidoc/docs.go

@@ -10625,6 +10625,9 @@ const docTemplate = `{
                     "type": "string",
                     "format": "date-time"
                 },
+                "email": {
+                    "type": "string"
+                },
                 "global_roles": {
                     "type": "array",
                     "items": {

coderd/apidoc/swagger.json

@@ -9567,6 +9567,9 @@
           "type": "string",
           "format": "date-time"
         },
+        "email": {
+          "type": "string"
+        },
         "global_roles": {
           "type": "array",
           "items": {

coderd/database/queries.sql.go

@@ -4293,7 +4293,7 @@ func (q *sqlQuerier) InsertOrganizationMember(ctx context.Context, arg InsertOrg
 const organizationMembers = `-- name: OrganizationMembers :many
 SELECT
 	organization_members.user_id, organization_members.organization_id, organization_members.created_at, organization_members.updated_at, organization_members.roles,
-	users.username, users.avatar_url, users.name, users.rbac_roles as "global_roles"
+	users.username, users.avatar_url, users.name, users.email, users.rbac_roles as "global_roles"
 FROM
 	organization_members
 		INNER JOIN
@@ -4323,6 +4323,7 @@ type OrganizationMembersRow struct {
 	Username           string             `db:"username" json:"username"`
 	AvatarURL          string             `db:"avatar_url" json:"avatar_url"`
 	Name               string             `db:"name" json:"name"`
+	Email              string             `db:"email" json:"email"`
 	GlobalRoles        pq.StringArray     `db:"global_roles" json:"global_roles"`
 }
 
@@ -4348,6 +4349,7 @@ func (q *sqlQuerier) OrganizationMembers(ctx context.Context, arg OrganizationMe
 			&i.Username,
 			&i.AvatarURL,
 			&i.Name,
+			&i.Email,
 			&i.GlobalRoles,
 		); err != nil {
 			return nil, err

coderd/database/queries/organizationmembers.sql

@@ -5,7 +5,7 @@
 --  - Use both to get a specific org member row
 SELECT
 	sqlc.embed(organization_members),
-	users.username, users.avatar_url, users.name, users.rbac_roles as "global_roles"
+	users.username, users.avatar_url, users.name, users.email, users.rbac_roles as "global_roles"
 FROM
 	organization_members
 		INNER JOIN

coderd/members.go

@@ -319,6 +319,7 @@ func convertOrganizationMembersWithUserData(ctx context.Context, db database.Sto
 			Username:           rows[i].Username,
 			AvatarURL:          rows[i].AvatarURL,
 			Name:               rows[i].Name,
+			Email:              rows[i].Email,
 			GlobalRoles:        db2sdk.SlimRolesFromNames(rows[i].GlobalRoles),
 			OrganizationMember: convertedMembers[i],
 		})