From e8659dcfcae19f6b45519672ef96ecc1050f4562 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Wed, 3 Jul 2019 17:46:24 +0800
Subject: [PATCH] [dir view] improved code for 'file tags'

---
 .../components/dirent-grid-view/dirent-grid-item.js    |  9 ++++-----
 .../components/dirent-list-view/dirent-list-item.js    | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/dirent-grid-view/dirent-grid-item.js b/frontend/src/components/dirent-grid-view/dirent-grid-item.js
index d59a704d47..33e5933588 100644
--- a/frontend/src/components/dirent-grid-view/dirent-grid-item.js
+++ b/frontend/src/components/dirent-grid-view/dirent-grid-item.js
@@ -138,12 +138,11 @@ class DirentGridItem extends React.Component {
     let iconUrl = Utils.getDirentIcon(dirent, true);
     let fileUrl = dirent.encoded_thumbnail_src ? this.getFileUrl(dirent.encoded_thumbnail_src) : '';
 
-    let toolTipID = MD5(dirent.name).slice(0, 7);
+    let toolTipID = '';
     let tagTitle = '';
     if (dirent.file_tags && dirent.file_tags.length > 0) {
-      dirent.file_tags.forEach(item => {
-        tagTitle += item.name + ' ';
-      });
+      toolTipID = MD5(dirent.name).slice(0, 7);
+      tagTitle = dirent.file_tags.map(item => item.name).join(' ');
     }
 
     let dirHref = '';
@@ -179,7 +178,7 @@ class DirentGridItem extends React.Component {
             {dirent.is_locked && <img className="grid-file-locked-icon" src={mediaUrl + 'img/file-locked-32.png'} alt={gettext('locked')} title={lockedInfo}/>}
           </div>
           <div className="grid-file-name" onDragStart={this.onGridItemDragStart} draggable="true" >
-            {(dirent.type !== 'dir' && dirent.file_tags) && (
+            {(dirent.type !== 'dir' && dirent.file_tags && dirent.file_tags.length > 0) && (
               <Fragment>
                 <div id={`tag-list-title-${toolTipID}`} className="dirent-item tag-list tag-list-stacked d-inline-flex">
                   {dirent.file_tags.map((fileTag, index) => {
diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index fd43faa698..82f203e7e6 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -555,12 +555,12 @@ class DirentListItem extends React.Component {
       dirHref = siteRoot + 'library/' + this.props.repoID + '/' + this.props.currentRepoInfo.repo_name + Utils.encodePath(direntPath);
     }
     let fileHref = siteRoot + 'lib/' + this.props.repoID + '/file' + Utils.encodePath(direntPath);
-    let toolTipID = MD5(dirent.name).slice(0, 7);
+
+    let toolTipID = '';
     let tagTitle = '';
     if (dirent.file_tags && dirent.file_tags.length > 0) {
-      dirent.file_tags.forEach(item => {
-        tagTitle += item.name + ' ';
-      });
+      toolTipID = MD5(dirent.name).slice(0, 7);
+      tagTitle = dirent.file_tags.map(item => item.name).join(' ');
     }
 
     let iconUrl = Utils.getDirentIcon(dirent);
@@ -613,7 +613,7 @@ class DirentListItem extends React.Component {
             }
           </td>
           <td className="tag-list-title">
-            {(dirent.type !== 'dir' && dirent.file_tags) && (
+            {(dirent.type !== 'dir' && dirent.file_tags && dirent.file_tags.length > 0) && (
               <Fragment>
                 <div id={`tag-list-title-${toolTipID}`} className="dirent-item tag-list tag-list-stacked">
                   {dirent.file_tags.map((fileTag, index) => {