merged develop

bcgov · Feb 12, 2020 · 6533368 · 6533368
2 parents 80ef3ee + 0f2ad11
commit 6533368
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -44,7 +44,7 @@
     "jest-websocket-mock": "^2.0.0",
     "mini-css-extract-plugin": "^0.4.4",
     "mock-socket": "^9.0.2",
-    "node-sass": "^4.13.0",
+    "node-sass": "^4.13.1",
     "nodemon": "^1.18.11",
     "prettier": "^1.18.2",
     "redux-logger": "^3.0.6",

diff --git a/frontend/src/modules/app/components/app/index.jsx b/frontend/src/modules/app/components/app/index.jsx
@@ -73,7 +73,8 @@ class App extends React.Component {
         zone,
       };
 
-      if (!hasValidGroupAccess) {
+      // Don't let OC's to download or invalid group access
+      if ((hasOcRole && exporterMode === 'download') || !hasValidGroupAccess) {
         return <Unauthorized />;
       }
 
@@ -82,7 +83,7 @@ class App extends React.Component {
         el = <Reports />;
       } else if (hasOcRole && !hasExporterRole) {
         el = <OutputChecker {...props} />;
-      } else {
+      } else if (hasExporterRole) {
         el = <Exporter {...props} />;
       }
     } else if (authFetchStatus === 'loaded') {
@@ -120,6 +121,7 @@ App.propTypes = {
   initSockets: PropTypes.func.isRequired,
   isAuthenticated: PropTypes.bool.isRequired,
   user: PropTypes.shape({
+    groups: PropTypes.arrayOf(PropTypes.string),
     displayName: PropTypes.string,
   }).isRequired,
   zone: PropTypes.string.isRequired,

diff --git a/frontend/src/modules/reports/containers/main.js b/frontend/src/modules/reports/containers/main.js
@@ -44,7 +44,7 @@ const mapStateToProps = state => {
       }
 
       return (
-        d.chronology.some(c => c.enteredState > 2) &&
+        d.chronology.some(c => c.enteredState > 1) &&
         (requestState === 'all' || d.state === requestState)
       );
     })