From c9eb04b514aa40328e0487e9fab4636962a03514 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 25 Jan 2018 15:25:29 -0500 Subject: [PATCH 1/2] Add permission checks for MOS user --- src/containers/BGroup/BGroup.js | 4 ++-- src/containers/Reports/index.js | 11 ----------- src/screens/DetailPage/index.js | 7 +++++-- src/screens/HomePage/index.js | 6 ++++-- src/screens/ProjectDetailPage/index.js | 6 ++++++ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/containers/BGroup/BGroup.js b/src/containers/BGroup/BGroup.js index 6528ed97..c967a6f7 100644 --- a/src/containers/BGroup/BGroup.js +++ b/src/containers/BGroup/BGroup.js @@ -296,7 +296,7 @@ class BGroup extends Component { Header: 'Address', accessor: 'first_address', Cell: row => ( - {row.value} + {row.value} ), }, ], @@ -495,7 +495,7 @@ class BGroup extends Component { return (
  • { i.state } - {' '} - {i.name} + {' '} - {i.name}
  • ); })} diff --git a/src/containers/Reports/index.js b/src/containers/Reports/index.js index 9984a36a..bf44b61c 100644 --- a/src/containers/Reports/index.js +++ b/src/containers/Reports/index.js @@ -67,9 +67,6 @@ class Reports extends Component { /> ); break; - case 'cbra': - content = 'Coming soon...'; - break; default: content = 'There was an error'; } @@ -93,14 +90,6 @@ class Reports extends Component { Lighting - - this.setState({ reportTab: 'cbra' })} - > - CBRA - - { this.state.mode === 'summary' ? ( View Detailed diff --git a/src/screens/DetailPage/index.js b/src/screens/DetailPage/index.js index fd85751b..c925a10b 100644 --- a/src/screens/DetailPage/index.js +++ b/src/screens/DetailPage/index.js @@ -8,8 +8,11 @@ import NotAuthorized from '../../components/NotAuthorized'; export default function BuildingDetail(props) { if ( - props.location.pathname.endsWith('dimensions') && - !props.user.permissions['view::dimensions'] + !props.user.permissions['view::buildingDetail'] || + ( + props.location.pathname.endsWith('dimensions') && + !props.user.permissions['view::dimensions'] + ) ) { return ; } diff --git a/src/screens/HomePage/index.js b/src/screens/HomePage/index.js index 6828d29e..61f15610 100644 --- a/src/screens/HomePage/index.js +++ b/src/screens/HomePage/index.js @@ -178,6 +178,8 @@ class HomePage extends Component { render() { const viewRecentlyCreatedProjects = this.props.user.permissions['view::recentlyCreatedProjectsCard']; + const viewRecentlyViewedProjects = this.props.user.permissions['view::recentlyViewedProjectsCard']; + const viewRecentlyViewedBuildings = this.props.user.permissions['view::recentlyViewedBuildingsCard']; const viewReports = this.props.user.permissions['view::reportsCard']; const viewBuildingSearch = this.props.user.permissions['view::buildingSearch']; const viewProjectSearch = this.props.user.permissions['view::projectSearch']; @@ -240,7 +242,7 @@ class HomePage extends Component { -
    +

    Recently Viewed Buildings

    {this.renderViewedBuildings()}
    -
    +

    Recently Viewed Projects

    ; + } const viewProjectSearch = props.user.permissions['view::projectSearch']; let backButtonProps = {}; if (viewProjectSearch) { -- GitLab From e87481a80bebd7d3babea2c66e343ae1cfe53600 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 29 Jan 2018 13:00:52 -0500 Subject: [PATCH 2/2] Remove extraneous disabled --- src/containers/BGroup/BGroup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/BGroup/BGroup.js b/src/containers/BGroup/BGroup.js index 22b4ac83..5c49fc2b 100644 --- a/src/containers/BGroup/BGroup.js +++ b/src/containers/BGroup/BGroup.js @@ -339,7 +339,7 @@ class BGroup extends Component { ), accessor: 'first_address', Cell: row => ( - {row.value} + {row.value} ), }, ], -- GitLab