From 3959433a8fc8f719a9ea977a7e4cfb12f3abf87b Mon Sep 17 00:00:00 2001
From: zxj96 <35951769+zxj96@users.noreply.github.com>
Date: Tue, 28 May 2019 15:16:27 +0800
Subject: [PATCH] Standard loading (#3557)

* Loading circle

* Fix compilation warning

* Change cur-view-content from display:flex to display:block
---
 .../src/components/file-chooser/file-chooser.js    |  2 +-
 .../src/components/file-chooser/repo-list-item.js  |  8 ++++----
 .../components/file-chooser/searched-list-view.js  | 14 +++++++-------
 .../src/components/file-chooser/tree-list-item.js  |  9 ++++-----
 .../src/components/file-chooser/tree-list-view.js  |  1 -
 frontend/src/pages/dashboard/files-activities.js   |  2 +-
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/file-chooser/file-chooser.js b/frontend/src/components/file-chooser/file-chooser.js
index 8a7d34431e..0d4ea17b09 100644
--- a/frontend/src/components/file-chooser/file-chooser.js
+++ b/frontend/src/components/file-chooser/file-chooser.js
@@ -301,7 +301,7 @@ class FileChooser extends React.Component {
     let selectedItemInfo = {
       repoID: item.repo_id,
       filePath: item.path,
-    }
+    };
 
     this.setState({
       selectedItemInfo: selectedItemInfo
diff --git a/frontend/src/components/file-chooser/repo-list-item.js b/frontend/src/components/file-chooser/repo-list-item.js
index f91f9cf0e2..5e10ad369b 100644
--- a/frontend/src/components/file-chooser/repo-list-item.js
+++ b/frontend/src/components/file-chooser/repo-list-item.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import TreeListView from './tree-list-view'
+import TreeListView from './tree-list-view';
 
 import TreeNode from '../../components/tree-view/tree-node';
 import Dirent from '../../models/dirent';
@@ -34,10 +34,10 @@ class RepoListItem extends React.Component {
     let repoID = this.props.repo.repo_id;
     seafileAPI.listDir(repoID, '/').then(res => {
       let tree = this.state.treeData.clone();
-      let direntList = res.data.dirent_list.filter(item => item.type === 'dir')
+      let direntList = res.data.dirent_list.filter(item => item.type === 'dir');
       this.addResponseListToNode(direntList, tree.root);
       this.setState({treeData: tree});
-    })
+    });
 
     if (this.props.selectedItemInfo.repoID === this.props.repo.repo_id) {
       this.setState({isShowChildren: true});
@@ -65,7 +65,7 @@ class RepoListItem extends React.Component {
     node = tree.getNodeByPath(node.path);
     if (!node.isLoaded) {
       seafileAPI.listDir(repoID, node.path).then(res => {
-        let direntList = res.data.dirent_list.filter(item => item.type === 'dir')
+        let direntList = res.data.dirent_list.filter(item => item.type === 'dir');
         this.addResponseListToNode(direntList, node);
         this.setState({treeData: tree});
       });
diff --git a/frontend/src/components/file-chooser/searched-list-view.js b/frontend/src/components/file-chooser/searched-list-view.js
index c80f2888c5..c0c960fd31 100644
--- a/frontend/src/components/file-chooser/searched-list-view.js
+++ b/frontend/src/components/file-chooser/searched-list-view.js
@@ -34,13 +34,13 @@ class SearchedListView extends React.Component {
         <tbody>
           {this.props.searchResults.map((item, index) => {
             return (
-            <SearchedListItem 
-              key={index} 
-              item={item} 
-              currentItem={this.state.currentItem} 
-              onItemClick={this.onItemClick}
-              onSearchedItemDoubleClick={this.props.onSearchedItemDoubleClick}
-            />);
+              <SearchedListItem 
+                key={index} 
+                item={item} 
+                currentItem={this.state.currentItem} 
+                onItemClick={this.onItemClick}
+                onSearchedItemDoubleClick={this.props.onSearchedItemDoubleClick}
+              />);
           })}
         </tbody>
       </table>
diff --git a/frontend/src/components/file-chooser/tree-list-item.js b/frontend/src/components/file-chooser/tree-list-item.js
index b9d58e610c..256b391876 100644
--- a/frontend/src/components/file-chooser/tree-list-item.js
+++ b/frontend/src/components/file-chooser/tree-list-item.js
@@ -19,7 +19,7 @@ class TreeViewItem extends React.Component {
 
     this.state = {
       filePath: filePath,
-    }
+    };
   }
 
   onToggleClick = (e) => {
@@ -62,16 +62,15 @@ class TreeViewItem extends React.Component {
               node={item}
               onNodeCollapse={this.props.onNodeCollapse}
               onNodeExpanded={this.props.onNodeExpanded}
-              onNodeClick={this.props.onTreeNodeClick}
               repo={this.props.repo} 
               onDirentItemClick={this.props.onDirentItemClick}
               selectedRepo={this.props.selectedRepo}
               selectedPath={this.props.selectedPath}
               fileSuffixes={this.props.fileSuffixes}
-            />)
+            />);
         })}
       </div>
-    )
+    );
   }
 
   render() {
@@ -80,7 +79,7 @@ class TreeViewItem extends React.Component {
     let isCurrentPath = this.props.selectedPath === this.state.filePath;
 
     return(
-      <div className={`file-chooser-item `}>
+      <div className="file-chooser-item">
         <div className={`${node.path === '/'? 'hide': ''}`}>
           <span className={`item-toggle fa ${node.isExpanded ? 'fa-caret-down' : 'fa-caret-right'}`} onClick={this.onToggleClick}></span>
           <span className={`item-info ${(isCurrentRepo && isCurrentPath) ? 'item-active' : ''}`} onClick={this.onItemClick}>
diff --git a/frontend/src/components/file-chooser/tree-list-view.js b/frontend/src/components/file-chooser/tree-list-view.js
index b94cd52e41..ca559d64f9 100644
--- a/frontend/src/components/file-chooser/tree-list-view.js
+++ b/frontend/src/components/file-chooser/tree-list-view.js
@@ -21,7 +21,6 @@ class TreeListView extends React.Component {
           node={this.props.treeData.root}
           onNodeCollapse={this.props.onNodeCollapse}
           onNodeExpanded={this.props.onNodeExpanded}
-          onNodeClick={this.props.onTreeNodeClick}
           repo={this.props.repo} 
           onDirentItemClick={this.props.onDirentItemClick}
           selectedRepo={this.props.selectedRepo}
diff --git a/frontend/src/pages/dashboard/files-activities.js b/frontend/src/pages/dashboard/files-activities.js
index 0144561bfe..0752e593f2 100644
--- a/frontend/src/pages/dashboard/files-activities.js
+++ b/frontend/src/pages/dashboard/files-activities.js
@@ -414,7 +414,7 @@ class FilesActivities extends Component {
           <div className="cur-view-path">
             <h3 className="sf-heading">{gettext('Activities')}</h3>
           </div>
-          <div className="cur-view-content" onScroll={this.handleScroll}>
+          <div className="cur-view-content d-block" onScroll={this.handleScroll}>
             {this.state.isFirstLoading && <Loading />}
             {(!this.state.isFirstLoading && this.state.errorMsg) && 
               <p className="error text-center">{this.state.errorMsg}</p>