Merge pull request #58 from KPMP/KPMP-4590_FixShowHide

KPMP-4590: Commit changes to master
KPMP · Jul 5, 2023 · 5142803 · 5142803
2 parents 937dc55 + a7c5020
commit 5142803
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 29 deletions.
diff --git a/src/components/Repository/FileList.js b/src/components/Repository/FileList.js
@@ -385,38 +385,38 @@ class FileList extends Component {
         return (
             <Container id='outer-wrapper' className="multi-container-container container-xxl">
                 <Row>
-                    <Col xl={3}>
+                    <Col xl={3} className={`filter-panel-wrapper ${this.props.filterTabActive ? '': 'hidden'}`}>
                         <div className={`filter-panel-wrapper ${this.props.filterTabActive ? '': 'hidden'}`}>
-                        <div className="filter-panel-tab-wrapper">
-
-                            <div onClick={() => {this.props.setActiveFilterTab(tabEnum.PARTICIPANT)}}
-                                 className={`filter-tab ${this.props.activeFilterTab === tabEnum.PARTICIPANT ? 'active' : ''} rounded border`}>
-                                    PARTICIPANT
-                            </div>
+                            <div className="filter-panel-tab-wrapper">
+                                
+                                <div onClick={() => {this.props.setActiveFilterTab(tabEnum.PARTICIPANT)}}
+                                    className={`filter-tab ${this.props.activeFilterTab === tabEnum.PARTICIPANT ? 'active' : ''} rounded border`}>
+                                        PARTICIPANT
+                                </div>
 
-                            <div onClick={() => {this.props.setActiveFilterTab(tabEnum.FILE)}}
-                                 className={`filter-tab ${this.props.activeFilterTab === tabEnum.FILE ? 'active' : ''} rounded border`}>
-                                    FILE
-                            </div>
+                                <div onClick={() => {this.props.setActiveFilterTab(tabEnum.FILE)}}
+                                    className={`filter-tab ${this.props.activeFilterTab === tabEnum.FILE ? 'active' : ''} rounded border`}>
+                                        FILE
+                                </div>
 
 
-                            <div className="filter-tab filter-tab-control-icon clickable"
-                                 alt="Close Filter Tab"
-                                 onClick={() => {this.props.toggleFilterTab()}}>                                
-                                <FontAwesomeIcon
-                                    className="fas fa-angles-left " icon={faAnglesLeft} />
+                                <div className="filter-tab filter-tab-control-icon clickable"
+                                    alt="Close Filter Tab"
+                                    onClick={() => {this.props.toggleFilterTab()}}>                                
+                                    <FontAwesomeIcon
+                                        className="fas fa-angles-left " icon={faAnglesLeft} />
+                                </div>
                             </div>
-                        </div>
-                        {this.accessAlertModal()}
+                            {this.accessAlertModal()}
                             <React.Fragment>
 
-                            {this.props.activeFilterTab === tabEnum.FILE &&
-                                <FileFacet/>
-                            }
+                                {this.props.activeFilterTab === tabEnum.FILE &&
+                                    <FileFacet/>
+                                }
 
-                            {this.props.activeFilterTab === tabEnum.PARTICIPANT &&
-                               <ParticipantFacet/>
-                            }
+                                {this.props.activeFilterTab === tabEnum.PARTICIPANT &&
+                                <ParticipantFacet/>
+                                }
                             </React.Fragment>
                         </div>
 

diff --git a/src/components/Repository/FileListHolder.js b/src/components/Repository/FileListHolder.js
@@ -20,11 +20,7 @@ class FileListHolder extends Component {
     };
 
     toggleFilterTab = () => {
-        if(this.state.filterTabActive) {
-            this.setState({filterTabActive: false});
-        } else {
-            this.setState({filterTabActive: true});
-        }
+        this.setState({filterTabActive: !this.state.filterTabActive})
     };
 
     render() {