[hotfix] fix bug where Deactivated org component was trying to displa…

…y when !currentOrg
ideo · Jan 24, 2019 · e0c5526 · e0c5526
1 parent 902334e
commit e0c5526
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/app/javascript/stores/ApiStore.js b/app/javascript/stores/ApiStore.js
@@ -112,7 +112,7 @@ class ApiStore extends jsonapi(datxCollection) {
   get currentOrgIsDeactivated() {
     const org =
       this.currentUserOrganization || this.currentUser.current_organization
-    if (!org) return true
+    if (!org) return false
     return org.deactivated
   }
 

diff --git a/app/javascript/ui/layout/Deactivated.js b/app/javascript/ui/layout/Deactivated.js
@@ -34,6 +34,7 @@ class Deactivated extends React.Component {
     const {
       apiStore: { currentUserOrganization: organization },
     } = this.props
+    if (!organization) return ''
     return (
       <PageContainer>
         <Wrapper>

diff --git a/app/javascript/ui/roles/RolesMenu.js b/app/javascript/ui/roles/RolesMenu.js
@@ -136,6 +136,7 @@ class RolesMenu extends React.Component {
 
     this.setState(prevState => ({
       groups,
+      pendingPanelOpen: counts.active === 0 && counts.pending > 0,
       page: {
         pending:
           status === 'pending' || status === 'both'