diff --git a/src/containers/BGroup/BGroup.js b/src/containers/BGroup/BGroup.js
index 75cfb04cd97d201553d3813972a1a9cbc21badfd..5c49fc2b29a8c6e9e44eaa4ae5defaebb5e8047b 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}
),
},
],
@@ -597,7 +597,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 9984a36a21ad8eba98b7ead3f48246b8e318193d..bf44b61c37c737ef3e574ad618025f4196714bf1 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 fd85751bb07b99a4a127965bf0ef17dc48ac93dd..c925a10b30bded39981b15b7715711c1218d26f4 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 6828d29efeb499efa33092d23184e1080414127f..61f156101c42684d0d19d94bb4fe07ff14cb27fb 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) {