Merge pull request #3330 from appirio-tech/revert-3316-issue-3211

Revert "Avoid reloading file icons in the Assets Library #3211"

Author: maxceem

src/components/AssetsLibrary/FilesGridView.jsx

@@ -10,7 +10,6 @@ import DeleteFileLinkModal from '../LinksMenu/DeleteFileLinkModal'
 import EditFileAttachment from '../LinksMenu/EditFileAttachment'
 import SubFolder from './SubFolder'
 import ItemOperations from './ItemOperations'
-import FileIcon from '../../components/FileIcon'
 
 import FolderIcon from '../../assets/icons/v.2.5/icon-folder-small.svg'
 
@@ -150,10 +149,16 @@ const FilesGridView = ({
                     />
                   </li>)
               } else {
+                let iconPath
+                try {
+                  iconPath = require('../../assets/icons/' + link.title.split('.')[1] +'.svg')
+                } catch(err) {
+                  iconPath = require('../../assets/icons/default.svg')
+                }
                 return (
                   <li styleName="assets-gridview-row" key={'assets-gridview-item-' +idx}>
                     <div styleName="flex-item item-type">
-                      <FileIcon type={link.title.split('.')[1]} />
+                      <img width={42} height={42} src={iconPath} />
                     </div>
                     <div styleName="flex-item item-name"><p>{renderLink(link)}</p></div>
                     <div styleName="flex-item item-modified">{formatModifyDate(link)}</div>

src/components/AssetsLibrary/SubFolder.jsx

@@ -5,7 +5,6 @@ import cn from 'classnames'
 import DeleteFileLinkModal from '../LinksMenu/DeleteFileLinkModal'
 import ItemOperations from './ItemOperations'
 import FolderIcon from '../../assets/icons/v.2.5/icon-folder-small.svg'
-import FileIcon from '../../components/FileIcon'
 
 import './GridView.scss'
 class SubFolder extends React.Component {
@@ -87,17 +86,19 @@ class SubFolder extends React.Component {
                   </li>
                 )
               }
-              let iconKey
-              if (isLinkSubFolder) {
-                // Key Icon here
-                iconKey = 'link-12'
-              } else {
-                iconKey = childLink.title.split('.')[1]
+              let iconPath
+              try {
+                if (isLinkSubFolder) {
+                  //Link Icon here
+                  iconPath = require('../../assets/icons/link-12.svg')
+                } else {
+                  iconPath = require('../../assets/icons/' + childLink.title.split('.')[1] +'.svg')
+                }
+              } catch(err) {
+                iconPath = require('../../assets/icons/default.svg')
               }
               return (<li styleName="assets-gridview-row" key={`childlink-${childLink.address}-${i}`}>
-                <div styleName="flex-item item-type">
-                  <FileIcon type={iconKey} />
-                </div>
+                <div styleName="flex-item item-type"><img width={42} height={42} src={ iconPath } /></div>
                 <div styleName="flex-item item-name"><p>{renderLink(childLink)}</p></div>
                 <div styleName="flex-item item-modified">{formatModifyDate(childLink)}</div>
                 <div styleName="flex-item item-action">