diff --git a/server/api.go b/server/api.go index 88ca4f2..68b0af8 100644 --- a/server/api.go +++ b/server/api.go @@ -91,6 +91,7 @@ type RevokeOwnershipRequest struct { type TypeWithBadgeCount struct { *badgesmodel.BadgeTypeDefinition BadgeCount int `json:"badge_count"` + CreatedByUsername string `json:"created_by_username"` AllowlistCanCreate string `json:"allowlist_can_create"` AllowlistCanGrant string `json:"allowlist_can_grant"` } @@ -204,9 +205,14 @@ func (p *Plugin) getTypes(w http.ResponseWriter, r *http.Request, userID string) result := make([]TypeWithBadgeCount, len(types)) for i, t := range types { + createdByUsername := t.CreatedBy + if creator, appErr := p.mm.User.Get(t.CreatedBy); appErr == nil { + createdByUsername = creator.Username + } result[i] = TypeWithBadgeCount{ BadgeTypeDefinition: t, BadgeCount: badgeCountByType[t.ID], + CreatedByUsername: createdByUsername, AllowlistCanCreate: p.resolveUserIDList(t.CanCreate.AllowList), AllowlistCanGrant: p.resolveUserIDList(t.CanGrant.AllowList), } diff --git a/webapp/src/components/rhs/all_types_row.tsx b/webapp/src/components/rhs/all_types_row.tsx index c1d2ae9..b17b482 100644 --- a/webapp/src/components/rhs/all_types_row.tsx +++ b/webapp/src/components/rhs/all_types_row.tsx @@ -43,6 +43,12 @@ const AllTypesRow: React.FC = ({badgeType, onEdit, onDelete, onClick}: Pr )}
+ + {' · '}