feat: add members settings page for organizations (#13817)

coderd/database/db2sdk/db2sdk.go

@@ -166,25 +166,7 @@ func User(user database.User, organizationIDs []uuid.UUID) codersdk.User {
 	convertedUser := codersdk.User{
 		ReducedUser:     ReducedUser(user),
 		OrganizationIDs: organizationIDs,
-		Roles:           make([]codersdk.SlimRole, 0, len(user.RBACRoles)),
-	}
-
-	for _, roleName := range user.RBACRoles {
-		// TODO: Currently the api only returns site wide roles.
-		// 	Should it return organization roles?
-		rbacRole, err := rbac.RoleByName(rbac.RoleIdentifier{
-			Name:           roleName,
-			OrganizationID: uuid.Nil,
-		})
-		if err == nil {
-			convertedUser.Roles = append(convertedUser.Roles, SlimRole(rbacRole))
-		} else {
-			// TODO: Fix this for custom roles to display the actual display_name
-			//		Requires plumbing either a cached role value, or the db.
-			convertedUser.Roles = append(convertedUser.Roles, codersdk.SlimRole{
-				Name: roleName,
-			})
-		}
+		Roles:           SlimRolesFromNames(user.RBACRoles),
 	}
 
 	return convertedUser
@@ -537,6 +519,27 @@ func SlimRole(role rbac.Role) codersdk.SlimRole {
 	}
 }
 
+func SlimRolesFromNames(names []string) []codersdk.SlimRole {
+	convertedRoles := make([]codersdk.SlimRole, 0, len(names))
+
+	for _, name := range names {
+		convertedRoles = append(convertedRoles, SlimRoleFromName(name))
+	}
+
+	return convertedRoles
+}
+
+func SlimRoleFromName(name string) codersdk.SlimRole {
+	rbacRole, err := rbac.RoleByName(rbac.RoleIdentifier{Name: name})
+	var convertedRole codersdk.SlimRole
+	if err == nil {
+		convertedRole = SlimRole(rbacRole)
+	} else {
+		convertedRole = codersdk.SlimRole{Name: name}
+	}
+	return convertedRole
+}
+
 func RBACRole(role rbac.Role) codersdk.Role {
 	slim := SlimRole(role)
 

coderd/database/queries.sql.go

@@ -4283,7 +4283,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.username, users.avatar_url, users.name, users.rbac_roles as "global_roles"
 FROM
 	organization_members
 		INNER JOIN
@@ -4311,6 +4311,9 @@ type OrganizationMembersParams struct {
 type OrganizationMembersRow struct {
 	OrganizationMember OrganizationMember `db:"organization_member" json:"organization_member"`
 	Username           string             `db:"username" json:"username"`
+	AvatarURL          string             `db:"avatar_url" json:"avatar_url"`
+	Name               string             `db:"name" json:"name"`
+	GlobalRoles        pq.StringArray     `db:"global_roles" json:"global_roles"`
 }
 
 // Arguments are optional with uuid.Nil to ignore.
@@ -4333,6 +4336,9 @@ func (q *sqlQuerier) OrganizationMembers(ctx context.Context, arg OrganizationMe
 			&i.OrganizationMember.UpdatedAt,
 			pq.Array(&i.OrganizationMember.Roles),
 			&i.Username,
+			&i.AvatarURL,
+			&i.Name,
+			&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.username, users.avatar_url, users.name, users.rbac_roles as "global_roles"
 FROM
 	organization_members
 		INNER JOIN