fix: show member email instead of UUID in team management
This commit is contained in:
@@ -20,6 +20,7 @@ type UserTenant struct {
|
|||||||
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
||||||
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
||||||
Role string `db:"role" json:"role"`
|
Role string `db:"role" json:"role"`
|
||||||
|
Email string `db:"email" json:"email"`
|
||||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,11 @@ func (s *TenantService) FirstTenantForUser(ctx context.Context, userID uuid.UUID
|
|||||||
func (s *TenantService) ListMembers(ctx context.Context, tenantID uuid.UUID) ([]models.UserTenant, error) {
|
func (s *TenantService) ListMembers(ctx context.Context, tenantID uuid.UUID) ([]models.UserTenant, error) {
|
||||||
var members []models.UserTenant
|
var members []models.UserTenant
|
||||||
err := s.db.SelectContext(ctx, &members,
|
err := s.db.SelectContext(ctx, &members,
|
||||||
`SELECT user_id, tenant_id, role, created_at FROM user_tenants WHERE tenant_id = $1 ORDER BY created_at`,
|
`SELECT ut.user_id, ut.tenant_id, ut.role, ut.created_at, COALESCE(au.email, '') as email
|
||||||
|
FROM user_tenants ut
|
||||||
|
LEFT JOIN auth.users au ON au.id = ut.user_id
|
||||||
|
WHERE ut.tenant_id = $1
|
||||||
|
ORDER BY ut.created_at`,
|
||||||
tenantID,
|
tenantID,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ export function TeamSettings() {
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<p className="text-sm font-medium text-neutral-900">
|
<p className="text-sm font-medium text-neutral-900">
|
||||||
{member.user_id.slice(0, 8)}...
|
{member.email || member.user_id.slice(0, 8) + "..."}
|
||||||
</p>
|
</p>
|
||||||
<p className="text-xs text-neutral-500">{roleInfo.label}</p>
|
<p className="text-xs text-neutral-500">{roleInfo.label}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user