refactored FileItem into ContentItem + fixed sidebar expand btn + deprecated workspace/filetype folder

src/component/Workspace/BtnExtandedAction.jsx

@@ -15,6 +15,7 @@ const ExtandedAction = props => {
       >
         <i className='fa fa-fw fa-ellipsis-h' />
       </button>
+
       <div className='extandedaction__subdropdown dropdown-menu' aria-labelledby='dropdownMenuButton'>
         <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.edit}>
           <div className='subdropdown__item__icon mr-3'>

src/component/Workspace/FileItem.jsx → src/component/Workspace/ContentItem.jsx

@@ -53,26 +53,12 @@ const FileItem = props => {
         <div className='file__name__text'>
           { props.name }
         </div>
-
-
-        {/*
-          <div className='file__name__icons d-none d-md-flex'>
-            <div className='file__name__icons__download'>
-              <i className='fa fa-download' />
-            </div>
-            <div className='file__name__icons__archive'>
-              <i className='fa fa-archive' />
-            </div>
-            <div className='file__name__icons__delete'>
-              <i className='fa fa-trash-o' />
-            </div>
-          </div>
-        */ }
       </div>
 
       <div className='d-none d-md-flex'>
         <BtnExtandedAction onClickExtendedAction={props.onClickExtendedAction} />
       </div>
+
       <div className={classnames('file__status d-flex align-items-center justify-content-start') + colorStatus}>
         <div className='file__status__icon d-block '>
           <i className={iconStatus} />

src/component/Workspace/FileType/deprecated_folder

@@ -0,0 +1,2 @@
+this folder is deprecated.
+content types are handled by respective apps

src/component/Workspace/Folder.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { translate } from 'react-i18next'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
-import FileItem from './FileItem.jsx'
+import FileItem from './ContentItem.jsx'
 // import PopupExtandedAction from '../../container/PopupExtandedAction.jsx'
 import BtnExtandedAction from './BtnExtandedAction.jsx'
 

src/container/Sidebar.jsx

@@ -64,11 +64,11 @@ class Sidebar extends React.Component {
 
     return (
       <div className={classnames('sidebar', {'sidebarclose': sidebarClose})}>
-        <div className='sidebar__expand' onClick={this.handleClickToggleSidebar}>
-          <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
-        </div>
-
         <div className='sidebarSticky'>
+          <div className='sidebar__expand' onClick={this.handleClickToggleSidebar}>
+            <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
+          </div>
+
           <nav className='sidebar__navigation'>
             <ul className='sidebar__navigation__workspace'>
               { workspaceList.map((ws, i) =>

src/container/WorkspaceContent.jsx

@@ -3,8 +3,8 @@ import { connect } from 'react-redux'
 import appFactory from '../appFactory.js'
 import Sidebar from './Sidebar.jsx'
 import Folder from '../component/Workspace/Folder.jsx'
-import FileItem from '../component/Workspace/FileItem.jsx'
-import FileItemHeader from '../component/Workspace/FileItemHeader.jsx'
+import ContentItem from '../component/Workspace/ContentItem.jsx'
+import ContentItemHeader from '../component/Workspace/ContentItemHeader.jsx'
 import PageWrapper from '../component/common/layout/PageWrapper.jsx'
 import PageTitle from '../component/common/layout/PageTitle.jsx'
 import PageContent from '../component/common/layout/PageContent.jsx'
@@ -98,7 +98,7 @@ class WorkspaceContent extends React.Component {
 
           <PageContent parentClass='workspace__content'>
             <div className='workspace__content__fileandfolder folder__content active'>
-              <FileItemHeader />
+              <ContentItemHeader />
 
               { filteredWorkspaceContent.map((c, i) => c.type === 'folder'
                 ? (
@@ -119,7 +119,7 @@ class WorkspaceContent extends React.Component {
                   />
                 )
                 : (
-                  <FileItem
+                  <ContentItem
                     name={c.title}
                     type={c.type}
                     icon={(app[c.type] || {icon: ''}).icon}