Org/Source/Collections | showing about tab if there is about entry

OpenConceptLab · Dec 17, 2020 · eb31199 · eb31199
1 parent 17028f3
commit eb31199
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 13 deletions.
diff --git a/src/components/collections/CollectionHome.jsx b/src/components/collections/CollectionHome.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { CircularProgress } from '@material-ui/core';
-import { includes } from 'lodash';
+import { includes, isEmpty, get } from 'lodash';
 import APIService from '../../services/APIService';
 import CollectionHomeHeader from './CollectionHomeHeader';
 import CollectionHomeTabs from './CollectionHomeTabs';
@@ -21,7 +21,7 @@ class CollectionHome extends React.Component {
   getDefaultTabIndex() {
     const { location } = this.props;
 
-    if(location.pathname.indexOf('/about') > -1)
+    if(location.pathname.indexOf('/about') > -1 && this.shouldShowAboutTab())
       return 4;
     if(location.pathname.indexOf('/versions') > -1)
       return 3;
@@ -117,10 +117,15 @@ class CollectionHome extends React.Component {
       return version
   }
 
+  shouldShowAboutTab() {
+    return !isEmpty(get(this, 'state.collection.extras.about'));
+  }
+
   render() {
     const { collection, versions, isLoading, tab } = this.state;
     const currentURL = this.getURLFromPath()
     const versionedObjectURL = this.getVersionedObjectURLFromPath()
+    const showAboutTab = this.shouldShowAboutTab();
     return (
       <div style={isLoading ? {textAlign: 'center', marginTop: '40px'} : {}}>
         {
@@ -141,6 +146,7 @@ class CollectionHome extends React.Component {
               location={this.props.location}
               versionedObjectURL={versionedObjectURL}
               currentVersion={this.getCurrentVersion()}
+              aboutTab={showAboutTab}
             />
           </div>
         }

diff --git a/src/components/collections/CollectionHomeTabs.jsx b/src/components/collections/CollectionHomeTabs.jsx
@@ -8,6 +8,7 @@ import AboutAccordian from '../common/AboutAccordian';
 const CollectionHomeTabs = props => {
   const {
     tab, onChange, collection, versions, location, versionedObjectURL, currentVersion,
+    aboutTab
   } = props;
   const about = get(collection, 'extras.about')
 
@@ -18,7 +19,7 @@ const CollectionHomeTabs = props => {
         <Tab label="Mappings" />
         <Tab label="References" />
         <Tab label="Versions" />
-        <Tab label="About" />
+        {aboutTab && <Tab label="About" />}
       </Tabs>
       <div className='sub-tab-container' style={{display: 'flex', minHeight: '500px'}}>
         {
@@ -60,7 +61,7 @@ const CollectionHomeTabs = props => {
           <ConceptContainerVersionList versions={versions} resource='collection' />
         }
         {
-          tab === 4 &&
+          aboutTab && tab === 4 &&
           <AboutAccordian id={collection.id} about={about} />
         }
       </div>

diff --git a/src/components/orgs/OrgHome.jsx b/src/components/orgs/OrgHome.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { CircularProgress } from '@material-ui/core';
-import { reject, get } from 'lodash';
+import { reject, get, isEmpty } from 'lodash';
 import APIService from '../../services/APIService';
 import { isCurrentUserMemberOf } from '../../common/utils';
 import Pins from '../common/Pins';
@@ -21,7 +21,7 @@ class OrgHome extends React.Component {
   getDefaultTabIndex() {
     const { location } = this.props;
 
-    if(location.pathname.indexOf('/about') > -1)
+    if(location.pathname.indexOf('/about') > -1 && this.shouldShowAboutTab())
       return 3;
     if(location.pathname.indexOf('/members') > -1)
       return 2;
@@ -122,10 +122,15 @@ class OrgHome extends React.Component {
     service.put({order: newOrder}).then(() => {})
   }
 
+  shouldShowAboutTab() {
+    return !isEmpty(get(this, 'state.org.extras.about'));
+  }
+
   render() {
     const { org, isLoading, tab, pins } = this.state;
     const url = this.getURLFromPath()
     const isCurrentUserMemberOfOrg = isCurrentUserMemberOf(this.getOrgId());
+    const showAboutTab = this.shouldShowAboutTab()
     return (
       <div style={isLoading ? {textAlign: 'center', marginTop: '40px'} : {}}>
         {
@@ -149,6 +154,7 @@ class OrgHome extends React.Component {
               onPinCreate={this.createPin}
               onPinDelete={this.deletePin}
               showPin={isCurrentUserMemberOfOrg}
+              aboutTab={showAboutTab}
             />
           </div>
         }

diff --git a/src/components/orgs/OrgHomeTabs.jsx b/src/components/orgs/OrgHomeTabs.jsx
@@ -6,7 +6,7 @@ import OrgHomeChildrenList from './OrgHomeChildrenList';
 
 const OrgHomeTabs = props => {
   const {
-    tab, org, location, url, pins, showPin, onTabChange, onPinCreate, onPinDelete,
+    tab, org, location, url, pins, showPin, onTabChange, onPinCreate, onPinDelete, aboutTab
   } = props;
   const about = get(org, 'extras.about')
 
@@ -16,7 +16,7 @@ const OrgHomeTabs = props => {
         <Tab label="Sources" />
         <Tab label="Collections" />
         <Tab label="Members" />
-        <Tab label="About" />
+        {aboutTab && <Tab label="About" />}
       </Tabs>
       <div className='sub-tab-container' style={{display: 'flex', minHeight: '500px'}}>
         {
@@ -56,7 +56,7 @@ const OrgHomeTabs = props => {
           />
         }
         {
-          tab === 3 &&
+          aboutTab && tab === 3 &&
           <AboutAccordian id={org.id} about={about} />
         }
       </div>

diff --git a/src/components/sources/SourceHome.jsx b/src/components/sources/SourceHome.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { CircularProgress } from '@material-ui/core';
-import { includes } from 'lodash';
+import { includes, isEmpty, get } from 'lodash';
 import APIService from '../../services/APIService';
 import SourceHomeHeader from './SourceHomeHeader';
 import SourceHomeTabs from './SourceHomeTabs';
@@ -21,7 +21,7 @@ class SourceHome extends React.Component {
   getDefaultTabIndex() {
     const { location } = this.props;
 
-    if(location.pathname.indexOf('/about') > -1)
+    if(location.pathname.indexOf('/about') > -1 && this.shouldShowAboutTab())
       return 3;
     if(location.pathname.indexOf('/versions') > -1)
       return 2;
@@ -113,10 +113,15 @@ class SourceHome extends React.Component {
       return version
   }
 
+  shouldShowAboutTab() {
+    return !isEmpty(get(this, 'state.source.extras.about'));
+  }
+
   render() {
     const { source, versions, isLoading, tab } = this.state;
     const currentURL = this.getURLFromPath()
     const versionedObjectURL = this.getVersionedObjectURLFromPath()
+    const showAboutTab = this.shouldShowAboutTab();
     return (
       <div style={isLoading ? {textAlign: 'center', marginTop: '40px'} : {}}>
         {
@@ -137,6 +142,7 @@ class SourceHome extends React.Component {
               location={this.props.location}
               versionedObjectURL={versionedObjectURL}
               currentVersion={this.getCurrentVersion()}
+              aboutTab={showAboutTab}
             />
           </div>
         }

diff --git a/src/components/sources/SourceHomeTabs.jsx b/src/components/sources/SourceHomeTabs.jsx
@@ -8,6 +8,7 @@ import AboutAccordian from '../common/AboutAccordian';
 const SourceHomeTabs = props => {
   const {
     tab, onChange, source, versions, location, versionedObjectURL, currentVersion,
+    aboutTab
   } = props;
   const about = get(source, 'extras.about')
 
@@ -17,7 +18,7 @@ const SourceHomeTabs = props => {
         <Tab label="Concepts" />
         <Tab label="Mappings" />
         <Tab label="Versions" />
-        <Tab label="About" />
+        {aboutTab && <Tab label="About" />}
       </Tabs>
       <div className='sub-tab-container' style={{display: 'flex', minHeight: '500px'}}>
         {
@@ -47,7 +48,7 @@ const SourceHomeTabs = props => {
           <ConceptContainerVersionList versions={versions} resource='source' />
         }
         {
-          tab === 3 &&
+          aboutTab && tab === 3 &&
           <AboutAccordian id={source.id} about={about} />
         }
       </div>