Browse Source

filters of workspace content now keep empty folder

Skylsmoi 6 years ago
parent
commit
6a2e2f2215

+ 1 - 1
src/component/Workspace/Folder.jsx View File

@@ -36,7 +36,7 @@ class Folder extends React.Component {
36 36
     } = this.props
37 37
 
38 38
     return (
39
-      <div className={classnames('folder', {'active': this.state.open, 'item-last': isLast})}>
39
+      <div className={classnames('folder', {'active': this.state.open && folderData.content.length > 0, 'item-last': isLast})}>
40 40
         <div className='folder__header align-items-center' onClick={this.handleClickToggleFolder}>
41 41
 
42 42
           <div className='folder__header__triangleborder'>

+ 2 - 1
src/container/Tracim.jsx View File

@@ -20,7 +20,8 @@ import {
20 20
   getUserIsConnected
21 21
 } from '../action-creator.async.js'
22 22
 import {
23
-  removeFlashMessage, setUserConnected
23
+  removeFlashMessage,
24
+  setUserConnected
24 25
 } from '../action-creator.sync.js'
25 26
 
26 27
 class Tracim extends React.Component {

+ 1 - 1
src/container/WorkspaceContent.jsx View File

@@ -76,7 +76,7 @@ class WorkspaceContent extends React.Component {
76 76
     ? contentList
77 77
     : contentList.filter(c => c.type === 'folder' || filter.includes(c.type)) // keep unfiltered files and folders
78 78
       .map(c => c.type !== 'folder' ? c : {...c, content: this.filterWorkspaceContent(c.content, filter)}) // recursively filter folder content
79
-      .filter(c => c.type !== 'folder' || c.content.length > 0) // remove empty folder
79
+      // .filter(c => c.type !== 'folder' || c.content.length > 0) // remove empty folder => 2018/05/21 - since we load only one lvl of content, don't remove empty folders
80 80
 
81 81
   render () {
82 82
     const { workspace, app } = this.props