hide profile from top menu and substitute book ride for visit

src/components/Header/NavRightList.js

@@ -4,6 +4,12 @@ import MenuItem from 'material-ui/MenuItem';
 import IconButton from 'material-ui/IconButton/IconButton';
 import { hashHistory } from 'react-router';
 
+import {
+  loggedUser,
+  visitReporter,
+} from 'utils/authorization';
+
+
 const ImgIconButtonStyle = {
   width: '60px',
   height: '60px'
@@ -48,20 +54,33 @@ class NavRightList extends React.Component {
             targetOrigin={{ horizontal: 'right', vertical: 'top' }}
             menuStyle={{ minWidth: '150px' }}
           >
-            <MenuItem
+            {!loggedUser.anyOf(visitReporter) &&
-              onTouchTap={(e) => this.handleChange(e, `/app/authorizedusers/${this.state.useruuid}`)}
+              <MenuItem
-              primaryText="Profile"
+                onTouchTap={(e) => this.handleChange(e, `/app/authorizedusers/${this.state.useruuid}`)}
-              style={{ fontSize: '14px', lineHeight: '48px' }}
+                primaryText="Profile"
-              innerDivStyle={listItemStyle}
+                style={{ fontSize: '14px', lineHeight: '48px' }}
-              leftIcon={<i className="material-icons">account_circle</i>}
+                innerDivStyle={listItemStyle}
-            />
+                leftIcon={<i className="material-icons">account_circle</i>}
-            <MenuItem
+              />
-              onTouchTap={(e) => this.handleChange(e, `/app/form/steppers/${this.state.useruuid}`)}
+            }
-              primaryText="Book Ride"
+            {!loggedUser.anyOf(visitReporter) &&
-              innerDivStyle={listItemStyle}
+              <MenuItem
-              style={{ fontSize: '14px', lineHeight: '48px' }}
+                onTouchTap={(e) => this.handleChange(e, `/app/form/steppers/${this.state.useruuid}`)}
-              leftIcon={<i className="material-icons">mode_edit</i>}
+                primaryText="Book Ride"
-            />
+                innerDivStyle={listItemStyle}
+                style={{ fontSize: '14px', lineHeight: '48px' }}
+                leftIcon={<i className="material-icons">mode_edit</i>}
+              />
+            }
+            {loggedUser.anyOf(visitReporter) &&
+              <MenuItem
+                onTouchTap={(e) => this.handleChange(e, `/app/form/visit/${this.state.useruuid}`)}
+                primaryText="Create Visit"
+                innerDivStyle={listItemStyle}
+                style={{ fontSize: '14px', lineHeight: '48px' }}
+                leftIcon={<i className="material-icons">mode_edit</i>}
+              />
+            }
             <MenuItem
               onTouchTap={(e) => this.handleChange(e, `/login`)}
               primaryText="Log Out"

src/components/Sidenav/SidenavContent.js

@@ -101,10 +101,10 @@ class SidebarContent extends React.Component {
 
     return (
       <ul className="nav" ref={(c) => { this.nav = c; }}>
-        {loggedUser.anyOf(planScheduler, visitReporter) &&
+        {loggedUser.anyOf(visitReporter) &&
           <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
         }
-        {!loggedUser.anyOf(planScheduler, visitReporter) &&
+        {!loggedUser.anyOf(visitReporter) &&
           <li>
             <FlatButton href="#/app/form"><i className="nav-icon material-icons cyan-text text-lighter-4">directions_car</i><span className="nav-text">Rides</span></FlatButton>
             <ul>
@@ -113,7 +113,7 @@ class SidebarContent extends React.Component {
             </ul>
           </li>
         }
-        {!loggedUser.anyOf(planScheduler, visitReporter) &&
+        {!loggedUser.anyOf(visitReporter) &&
           <li>
             <FlatButton href="#/app/chart"><i className="nav-icon material-icons">people_outline</i><span className="nav-text">Members</span></FlatButton>
             <ul>
@@ -122,36 +122,40 @@ class SidebarContent extends React.Component {
             </ul>
           </li>
         }
-        <li>
+        {!loggedUser.anyOf(visitReporter) &&
-          <FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton>
+          <li>
-          <ul>
+            <FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton>
-            <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
+            <ul>
-            <li> <FlatButton className="prepend-icon" href="#/app/table/visits"><span className="nav-text">Manage Visits</span></FlatButton></li>
+              <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
-          </ul>
+              <li> <FlatButton className="prepend-icon" href="#/app/table/visits"><span className="nav-text">Manage Visits</span></FlatButton></li>
-        </li>
+            </ul>
+          </li>
+        }
 
-        <li>
+        {!loggedUser.anyOf(visitReporter) &&
-          <FlatButton href="#/app/chart"><i className="nav-icon material-icons">settings</i><span className="nav-text">Manage</span></FlatButton>
+          <li>
-          <ul>
+            <FlatButton href="#/app/chart"><i className="nav-icon material-icons">settings</i><span className="nav-text">Manage</span></FlatButton>
-            {!loggedUser.anyOf(planScheduler, providerScheduler) &&
+            <ul>
+              {!loggedUser.anyOf(planScheduler, providerScheduler) &&
+                <li>
+                  <FlatButton href="#/app/table/authorizedusers"><i className="nav-icon material-icons">people</i><span className="nav-text">Authorized Users</span></FlatButton>
+                </li>
+              }
               <li>
-                <FlatButton href="#/app/table/authorizedusers"><i className="nav-icon material-icons">people</i><span className="nav-text">Authorized Users</span></FlatButton>
+                <FlatButton href="#/app/table/organizations"><i className="nav-icon material-icons">assignment</i><span className="nav-text">Organizations</span></FlatButton>
               </li>
-            }
+              <li>
-            <li>
+                <FlatButton href="#/app/table/provider"><i className="nav-icon material-icons">local_hospital</i><span className="nav-text">Participating Providers</span></FlatButton>
-              <FlatButton href="#/app/table/organizations"><i className="nav-icon material-icons">assignment</i><span className="nav-text">Organizations</span></FlatButton>
+              </li>
-            </li>
+              <li>
-            <li>
+                <FlatButton href={"#/app/authorizedusers/" + this.state.user.useruuid}><i className="nav-icon material-icons">account_circle</i><span className="nav-text">Profile</span></FlatButton>
-              <FlatButton href="#/app/table/provider"><i className="nav-icon material-icons">local_hospital</i><span className="nav-text">Participating Providers</span></FlatButton>
+              </li>
-            </li>
+              {/* <li>
-            <li>
+                <FlatButton href="#/app/dashboard"><i className="nav-icon material-icons">equalizer</i><span className="nav-text">Reports</span></FlatButton>
-              <FlatButton href={"#/app/authorizedusers/" + this.state.user.useruuid}><i className="nav-icon material-icons">account_circle</i><span className="nav-text">Profile</span></FlatButton>
+              </li> */}
-            </li>
+            </ul>
-            {/* <li>
+          </li>
-              <FlatButton href="#/app/dashboard"><i className="nav-icon material-icons">equalizer</i><span className="nav-text">Reports</span></FlatButton>
+        }
-            </li> */}
-          </ul>
-        </li>
 
         <li className="nav-divider" />
       </ul>

src/utils/authorization/normalizeRoles.js

@@ -11,7 +11,7 @@ const normalizeRoles = (profiles) => {
   }
 
   if (roleKeys.length === 1) {
-    return profiles[roleKeys[0]].authorize;
+    return profiles[roleKeys[0]].roles;
   }
 
   const roles = profiles.reduce((result, profile) => {