瀏覽代碼

filters of workspace content now keep empty folder

Skylsmoi 7 年之前
父節點
當前提交
6a2e2f2215
共有 3 個文件被更改,包括 4 次插入3 次删除
  1. 1 1
      src/component/Workspace/Folder.jsx
  2. 2 1
      src/container/Tracim.jsx
  3. 1 1
      src/container/WorkspaceContent.jsx

+ 1 - 1
src/component/Workspace/Folder.jsx 查看文件

36
     } = this.props
36
     } = this.props
37
 
37
 
38
     return (
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
         <div className='folder__header align-items-center' onClick={this.handleClickToggleFolder}>
40
         <div className='folder__header align-items-center' onClick={this.handleClickToggleFolder}>
41
 
41
 
42
           <div className='folder__header__triangleborder'>
42
           <div className='folder__header__triangleborder'>

+ 2 - 1
src/container/Tracim.jsx 查看文件

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

+ 1 - 1
src/container/WorkspaceContent.jsx 查看文件

76
     ? contentList
76
     ? contentList
77
     : contentList.filter(c => c.type === 'folder' || filter.includes(c.type)) // keep unfiltered files and folders
77
     : contentList.filter(c => c.type === 'folder' || filter.includes(c.type)) // keep unfiltered files and folders
78
       .map(c => c.type !== 'folder' ? c : {...c, content: this.filterWorkspaceContent(c.content, filter)}) // recursively filter folder content
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
   render () {
81
   render () {
82
     const { workspace, app } = this.props
82
     const { workspace, app } = this.props