Attached menu

command/command.go

@@ -36,7 +36,7 @@ const (
 	MaxRoleAdditionalContentLength = 1000 * 1000 // 1M of chars
 
 	MinMemberUserNameLength = 3
-	MaxMemberUserNameLength = 30
+	MaxMemberUserNameLength = 40
 	MinMemberFullNameLength = 3
 	MaxMemberFullNameLength = 100
 	MaxMemberEmailLength    = 100
@@ -52,7 +52,7 @@ const (
 	MaxRoleAssignmentFocusLength = 30
 )
 
-var UserNameRegexp = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9]*([-]?[a-zA-Z0-9]+)+$`)
+var UserNameRegexp = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9]*([-||.||_]?[a-zA-Z0-9]+)+$`)
 
 var (
 	ErrValidation = errors.New("validation error")

command/command_test.go

@@ -10,6 +10,10 @@ var (
 		"foo1",
 		"foo-1",
 		"foo-1-bar",
+		"foo.bar",
+		"foo_bar",
+		"foo.bar_hey",
+		"foo_bar.hello",
 		"f12oo-bar33",
 	}
 	badUserNames = []string{
@@ -18,10 +22,11 @@ var (
 		"-foo-bar",
 		"foo-bar-",
 		"foo--bar",
-		"foo.bar",
-		"foo_bar",
 		"foo#bar",
 		"1foobar",
+		"1foobar",
+		"_foobar",
+		".foobar",
 	}
 )
 

saga/memberrequestsaga.go

@@ -275,7 +275,7 @@ func (s *MemberRequestSaga) HandleEvent(event *eventstore.StoredEvent) ([]ep.Eve
 
 			}
 
-			if err := s.completeMemberChange(correlationID, causationID, memberChangeID, fmt.Sprintf("error updating member: %v, err")); err != nil {
+			if err := s.completeMemberChange(correlationID, causationID, memberChangeID, fmt.Sprintf("error updating member: %v", err)); err != nil {
 				return nil, err
 			}
 			return nil, err

web/src/app/containers/Base.js

@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react'
 import { graphql, compose } from 'react-apollo'
 import { Route, Link, Switch } from 'react-router-dom'
-import { Container, Menu, Dropdown, Message, Form, Input, Button } from 'semantic-ui-react'
+import { Container, Menu, Dropdown, Message, Form, Input, Button, Image } from 'semantic-ui-react'
 
 import config from 'config'
 import Auth from '../modules/Auth'
@@ -23,6 +23,8 @@ import EditTension from './EditTension'
 import SearchPage from './SearchPage'
 import Settings from './Settings'
 
+import sirclesLogo from '../../www/img/sircles.png'
+
 class Base extends React.Component {
   getChildContext () {
     return {appError: this.props.appError}
@@ -120,8 +122,11 @@ class Base extends React.Component {
 
     return (
       <div>
-        <Menu inverted>
-          <Menu.Item as={Link} to='/'>Sircles</Menu.Item>
+        <Menu inverted attached>
+          <Menu.Item as={Link} to='/'>
+            <Image size='tiny' src={sirclesLogo} />
+          </Menu.Item>
+
           {viewer && (
             <Menu.Item as={Form} onSubmit={this.doSearch}>
               <Input icon='search' placeholder='Search...' value={searchString} onChange={this.handleSearchChange} />

web/src/app/containers/Circle.js

@@ -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'
 
@@ -310,6 +310,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
@@ -322,7 +323,7 @@ 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' />
@@ -331,13 +332,40 @@ class Circle extends React.Component {
                 {focusString}
               </List.Item>)
           }
+          fillers.push(<List>{extras}</List>)
           if (fillers.length === 0) {
-            /* TODO(sgotti) limit showed fillers when exceeding a choosed number and show a "more" button */
             fillers.push(<div key='none'>no members assigned to role</div>)
           }
-          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' />
+                    {extramember.userName}
+                  </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>
+            )
           }
         }
 
@@ -357,13 +385,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.userName}
+                  </Link>
+                  <span> (Lead Link)</span>
+                </List.Item>
+              </List>
+            )
           } else {
             fillers.push(<div key='none'>no leadlink assigned</div>)
           }
@@ -400,9 +431,7 @@ class Circle extends React.Component {
             </Card.Content>
             <Card.Content>
               <Card.Description>
-                <List>
-                  {fillers}
-                </List>
+                {fillers}
               </Card.Description>
             </Card.Content>
           </Card>

web/src/app/containers/RoleSetMembers.js

@@ -116,7 +116,7 @@ class RoleSetMembers extends React.Component {
                 {role.roleType === 'normal' &&
                 <Form.Input name='focus' placeholder='Focus' value={focus} onChange={this.handleFocusChange} />
                 }
-                <Form.Field width='two'><Button primary type='submit' disabled={!submitFormValid}>Add</Button></Form.Field>
+                <Form.Field width='four'><Button primary type='submit' disabled={!submitFormValid}>Add</Button></Form.Field>
               </Form.Group>
             </Form>
             <Message negative hidden={!showError} onDismiss={this.handleErrorMessageDismiss}>

web/webpack.config.js

@@ -91,7 +91,7 @@ module.exports = function (env) {
         },
         {
           test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,
-          loader: 'url-loader',
+          loader: 'file-loader',
           options: {
             limit: 10000
           },