Open platform to collect and prioritize feedback
Show email on the member listing
Matt Robertsc3a15ccf1fe6
diff --git a/app/models/entity/user.go b/app/models/entity/user.goindex bcf37e02b..5e6df4923 100644--- a/app/models/entity/user.go+++ b/app/models/entity/user.go@@ -2,12 +2,12 @@ package entityimport "github.com/getfider/fider/app/models/enum"-//User represents an user inside our application+// User represents an user inside our applicationtype User struct {ID int `json:"id"`Name string `json:"name"`Tenant *Tenant `json:"-"`- Email string `json:"-"`+ Email string `json:"email"`Role enum.Role `json:"role"`Providers []*UserProvider `json:"-"`AvatarBlobKey string `json:"-"`@@ -16,7 +16,7 @@ type User struct {Status enum.UserStatus `json:"status"`}-//HasProvider returns true if current user has registered with given provider+// HasProvider returns true if current user has registered with given providerfunc (u *User) HasProvider(provider string) bool {for _, p := range u.Providers {if p.Name == provider {@@ -36,7 +36,7 @@ func (u *User) IsAdministrator() bool {return u.Role == enum.RoleAdministrator}-//UserProvider represents the relationship between an User and an Authentication provide+// UserProvider represents the relationship between an User and an Authentication providetype UserProvider struct {Name stringUID stringdiff --git a/public/components/common/UserName.scss b/public/components/common/UserName.scssindex aaa8a796b..e4c70594f 100644--- a/public/components/common/UserName.scss+++ b/public/components/common/UserName.scss@@ -6,6 +6,13 @@display: inline-flex;align-items: center;+ &--email {+ margin-left: 10px;+ color: get("colors.gray.600");+ font-size: get("font.size.xs");+ font-weight: 400;+ }+&--staff {color: get("colors.primary.base");border-color: get("colors.primary.base");diff --git a/public/components/common/UserName.tsx b/public/components/common/UserName.tsxindex 8559d3bd0..b7a7eb7a7 100644--- a/public/components/common/UserName.tsx+++ b/public/components/common/UserName.tsx@@ -9,6 +9,7 @@ interface UserNameProps {id: numbername: stringrole?: UserRole+ email?: string}}@@ -22,6 +23,8 @@ export const UserName = (props: UserNameProps) => {return (<div className={className}><span>{props.user.name || "Anonymous"}</span>+ <>{props.user.email && <span className="c-username--email">({props.user.email})</span>}</>+{isStaff && (<div data-tooltip={isStaff ? "Staff" : undefined}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">diff --git a/public/models/identity.ts b/public/models/identity.tsindex 8b561fbd9..47755d91e 100644--- a/public/models/identity.ts+++ b/public/models/identity.ts@@ -22,6 +22,7 @@ export enum TenantStatus {export interface User {id: numbername: string+ email?: stringrole: UserRolestatus: UserStatusavatarURL: stringdiff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsxindex 37a44592c..7ae349f00 100644--- a/public/pages/Administration/pages/ManageMembers.page.tsx+++ b/public/pages/Administration/pages/ManageMembers.page.tsx@@ -69,6 +69,7 @@ export default class ManageMembersPage extends AdminBasePage<ManageMembersPagePrsuper(props)const users = this.props.users.sort(this.sortByStaff)+this.state = {query: "",users,@@ -86,8 +87,12 @@ export default class ManageMembersPage extends AdminBasePage<ManageMembersPagePrthis.handleSearchFilterChanged("")}+ private memberFilter = (query: string, user: User): boolean => {+ return user.name.toLowerCase().indexOf(query.toLowerCase()) >= 0 || (user.email && user.email.toLowerCase().indexOf(query.toLowerCase()) >= 0) || false;+ }+private handleSearchFilterChanged = (query: string) => {- const users = this.props.users.filter((x) => x.name.toLowerCase().indexOf(query.toLowerCase()) >= 0).sort(this.sortByStaff)+ const users = this.props.users.filter((x) => this.memberFilter(query, x)).sort(this.sortByStaff)this.setState({ query, users, visibleUsers: users.slice(0, 10) })}@@ -145,7 +150,7 @@ export default class ManageMembersPage extends AdminBasePage<ManageMembersPagePrfield="query"icon={this.state.query ? IconX : IconSearch}onIconClick={this.state.query ? this.clearSearch : undefined}- placeholder="Search for users by name..."+ placeholder="Search for users by name / email ..."value={this.state.query}onChange={this.handleSearchFilterChanged}/>