Skip to content
This repository has been archived by the owner on Mar 16, 2021. It is now read-only.

Display full name #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display full name #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/app/containers/Base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class Base extends React.Component {
<Dropdown className='item' trigger={
<span>
<Avatar uid={viewer.member.uid} size={30} inline spaced shape='rounded' />
{viewer.member.userName}
{viewer.member.fullName}
</span>
}>
<Dropdown.Menu>
Expand Down
104 changes: 82 additions & 22 deletions web/src/app/containers/Circle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { PropTypes } from 'react'
import { graphql, compose } from 'react-apollo'
import gql from 'graphql-tag'
import { Link } from 'react-router-dom'
import { Container, Header, Segment, Form, Button, Grid, Menu, Card, List, Table, Popup, Icon, Dropdown, Label, TextArea } from 'semantic-ui-react'
import { Container, Header, Segment, Form, Button, Grid, Menu, Card, List, Table, Popup, Icon, Dropdown, Label, TextArea, Accordion } from 'semantic-ui-react'
import moment from 'moment'
import marked from 'marked'

Expand Down Expand Up @@ -182,7 +182,11 @@ class Circle extends React.Component {
<Avatar uid={d.member.uid} size={50} floated='right' inline spaced shape='rounded' />
<Card.Header>
<Link to={Util.memberUrl(d.member.uid, timeLine)}>
{d.member.userName}
<Popup content={d.member.fullName} trigger={
<span>
{d.member.userName}
</span>
} />
</Link>
</Card.Header>
</Card.Content>
Expand All @@ -204,7 +208,11 @@ class Circle extends React.Component {
<Avatar uid={d.member.uid} size={50} floated='right' inline spaced shape='rounded' />
<Card.Header>
<Link to={Util.memberUrl(d.member.uid, timeLine)}>
{d.member.userName}
<Popup content={d.member.fullName} trigger={
<span>
{d.member.userName}
</span>
} />
</Link>
</Card.Header>
</Card.Content>
Expand Down Expand Up @@ -252,7 +260,11 @@ class Circle extends React.Component {
filler =
<Link to={memberLink}>
<Avatar uid={member.uid} size={30} inline spaced shape='rounded' />
{member.userName}
<Popup content={member.fullName} trigger={
<span>
{member.userName}
</span>
} />
</Link>
if (moment.utc(roleMember.electionExpiration).isValid()) {
expireInfo = 'expires on ' + moment.utc(roleMember.electionExpiration).format('L')
Expand Down Expand Up @@ -310,6 +322,7 @@ class Circle extends React.Component {
const roleType = r.roleType

let fillers = []
let extras = []
if (roleType === 'normal') {
for (let i = 0, len = r.roleMembers.length; i < len; i++) {
// Only display max 3 fillers
Expand All @@ -322,22 +335,60 @@ class Circle extends React.Component {
focusString = ` (${focus})`
}
const memberLink = Util.memberUrl(member.uid, timeLine)
fillers.push(
extras.push(
<List.Item key={member.uid}>
<Link to={memberLink}>
<Avatar uid={member.uid} size={30} inline spaced shape='rounded' />
{member.userName}
<Popup content={member.fullName} trigger={
<span>
{member.userName}
</span>
} />
</Link>
{focusString}
</List.Item>)
}
if (fillers.length === 0) {
/* TODO(sgotti) limit showed fillers when exceeding a choosed number and show a "more" button */

if (r.roleMembers.length === 0) {
fillers.push(<div key='none'>no members assigned to role</div>)
} else {
fillers.push(<List>{extras}</List>)
}
if (r.roleMembers.length > 3) {

if (r.roleMembers.length > 3) { // Other members accordion
extras = []
const moreFillersCount = r.roleMembers.length - 3
fillers.push(<div key='more'>... {moreFillersCount} other {moreFillersCount > 1 ? 'members' : 'member' }</div>)
for (let i = 3, len = r.roleMembers.length; i < len; i++) {
let focus = r.roleMembers[i].focus
let focusString = ''
if (focus) {
focusString = ` (${focus})`
}
let extramember = r.roleMembers[i].member
const extramemberLink = Util.memberUrl(extramember.uid, timeLine)
extras.push(
<List.Item key={extramember.uid}>
<Link to={extramemberLink}>
<Avatar uid={extramember.uid} size={30} inline spaced shape='rounded' />
<Popup content={extramember.fullName} trigger={
<span>
{extramember.userName}
</span>
} />
</Link>
{focusString}
</List.Item>)
}
fillers.push(
<Accordion>
<Accordion.Title><Icon name='dropdown' />{moreFillersCount} other {moreFillersCount > 1 ? 'members' : 'member' }</Accordion.Title>
<Accordion.Content>
<List>
{extras}
</List>
</Accordion.Content>
</Accordion>
)
}
}

Expand All @@ -357,13 +408,16 @@ class Circle extends React.Component {

const memberLink = Util.memberUrl(leadlinkMember.uid, timeLine)
fillers.push(
<List.Item key={leadlinkMember.uid}>
<Link to={memberLink}>
<Avatar uid={leadlinkMember.uid} size={30} inline spaced shape='rounded' />
{leadlinkMember.userName}
</Link>
<span> (Lead Link)</span>
</List.Item>)
<List>
<List.Item key={leadlinkMember.uid}>
<Link to={memberLink}>
<Avatar uid={leadlinkMember.uid} size={30} inline spaced shape='rounded' />
{leadlinkMember.fullName}
</Link>
<span> (Lead Link)</span>
</List.Item>
</List>
)
} else {
fillers.push(<div key='none'>no leadlink assigned</div>)
}
Expand Down Expand Up @@ -400,9 +454,7 @@ class Circle extends React.Component {
</Card.Content>
<Card.Content>
<Card.Description>
<List>
{fillers}
</List>
{fillers}
</Card.Description>
</Card.Content>
</Card>
Expand Down Expand Up @@ -441,7 +493,11 @@ class Circle extends React.Component {
<Table.Cell>
<Link to={Util.memberUrl(t.member.uid, timeLine)}>
<Avatar uid={t.member.uid} size={30} inline spaced shape='rounded' />
{t.member.userName}
<Popup content={t.member.fullName} trigger={
<span>
{t.member.userName}
</span>
} />
</Link>
</Table.Cell>
<Table.Cell>
Expand Down Expand Up @@ -599,7 +655,11 @@ class Circle extends React.Component {
<Table.Cell>
<Link to={Util.memberUrl(e.issuer.uid, timeLine)}>
<Avatar uid={e.issuer.uid} size={30} inline spaced shape='rounded' />
{e.issuer.userName}
<Popup content={e.issuer.fullName} trigger={
<span>
{e.issuer.userName}
</span>
} />
</Link>
{' did some changes'}
</Table.Cell>
Expand Down
9 changes: 7 additions & 2 deletions web/src/app/containers/CircleSetCoreRoleMember.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { PropTypes } from 'react'
import { graphql, compose } from 'react-apollo'
import gql from 'graphql-tag'
import { Modal, Container, Form, Button, Table, Icon, Message, Divider } from 'semantic-ui-react'
import { Modal, Container, Form, Button, Table, Icon, Message, Divider, Popup } from 'semantic-ui-react'
import moment from 'moment'

import { withError } from '../modules/Error'
Expand Down Expand Up @@ -131,7 +131,11 @@ class CircleSetCoreRoleMember extends React.Component {
{ role.roleMembers.map(roleMember => (
<Table.Row key={roleMember.member.uid}>
<Table.Cell>
{roleMember.member.userName}
<Popup content={roleMember.member.FullName} trigger={
<span>
{roleMember.member.UserName}
</span>
} />
</Table.Cell>
{role.roleType !== 'leadlink' &&
<Table.Cell>
Expand Down Expand Up @@ -221,6 +225,7 @@ const CoreRoleMemberQuery = gql`
member {
uid
userName
fullName
}
electionExpiration
}
Expand Down
1 change: 1 addition & 0 deletions web/src/app/containers/MemberTensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const ViewerQuery = gql`
member {
uid
userName
fullName
circles {
role {
uid
Expand Down
8 changes: 8 additions & 0 deletions web/src/app/containers/RolePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ const RolePageQuery = gql`
member {
uid
userName
fullName
}
isCoreMember
isDirectMember
Expand All @@ -129,6 +130,7 @@ const RolePageQuery = gql`
member {
uid
userName
fullName
}
focus
electionExpiration
Expand All @@ -141,6 +143,7 @@ const RolePageQuery = gql`
member {
uid
userName
fullName
}
}
}
Expand All @@ -149,6 +152,7 @@ const RolePageQuery = gql`
member {
uid
userName
fullName
roles {
role {
uid
Expand All @@ -173,6 +177,7 @@ const RolePageQuery = gql`
member {
uid
userName
fullName
}
focus
electionExpiration
Expand All @@ -186,6 +191,7 @@ const RolePageQuery = gql`
member {
uid
userName
fullName
}
}
}
Expand All @@ -211,6 +217,7 @@ const RoleEventsQuery = gql`
issuer {
uid
userName
fullName
}
changedRoles {
changeType
Expand Down Expand Up @@ -283,6 +290,7 @@ const ViewerQuery = gql`
member {
uid
userName
fullName
circles {
role {
uid
Expand Down
1 change: 1 addition & 0 deletions web/src/app/containers/RoleSetMembers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ const RoleSetMemberQuery = gql`
member {
uid
userName
fullName
}
focus
}
Expand Down
8 changes: 6 additions & 2 deletions web/src/app/containers/SearchPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { PropTypes } from 'react'
import { graphql, compose } from 'react-apollo'
import gql from 'graphql-tag'
import { Link } from 'react-router-dom'
import { Container, Label, Segment, Message } from 'semantic-ui-react'
import { Container, Label, Segment, Message, Popup } from 'semantic-ui-react'

import Util from '../modules/Util'
import Avatar from '../components/Avatar'
Expand Down Expand Up @@ -70,7 +70,11 @@ class SearchPage extends React.Component {
<Segment>
<Link to={memberLink}>
<Avatar uid={hit.id} size={30} inline spaced shape='rounded' />
{hit.fields.UserName}
<Popup content={hit.fields.FullName} trigger={
<span>
{hit.fields.UserName}
</span>
} />
</Link>
<Label className='labelright' color='green' horizontal basic size='tiny'>Member</Label>
</Segment>
Expand Down
1 change: 1 addition & 0 deletions web/src/app/containers/UpdateMemberPassword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ const ViewerQuery = gql`
uid
isAdmin
userName
fullName
}
}
}
Expand Down
1 change: 1 addition & 0 deletions web/src/app/graphql/ViewerQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const ViewerQuery = gql`
uid
isAdmin
userName
fullName
circles {
role {
uid
Expand Down