senaduka/old-svijetlastrana-front
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

fix getting roles

Browse Source
This commit is contained in:
GotPPay
2018-05-25 17:15:31 +02:00
parent 11fe5f1c61
commit ef904e4e38
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/components/Sidenav/SidenavContent.js
View File

@@ -101,10 +101,10 @@ class SidebarContent extends React.Component {
return ( return (
<ul className="nav" ref={(c) => { this.nav = c; }}> <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> <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> <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> <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> <ul>
@@ -113,7 +113,7 @@ class SidebarContent extends React.Component {
</ul> </ul>
</li> </li>
} }
{!loggedUser.anyOf(planScheduler, visitReporter) && {!loggedUser.anyOf(visitReporter) &&
<li> <li>
<FlatButton href="#/app/chart"><i className="nav-icon material-icons">people_outline</i><span className="nav-text">Members</span></FlatButton> <FlatButton href="#/app/chart"><i className="nav-icon material-icons">people_outline</i><span className="nav-text">Members</span></FlatButton>
<ul> <ul>
@@ -122,36 +122,40 @@ class SidebarContent extends React.Component {
</ul> </ul>
</li> </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> <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>
<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" /> <li className="nav-divider" />
</ul> </ul>

2
src/utils/authorization/normalizeRoles.js
View File

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