From 69c99a8700bb510ee55019af313afa8d81be4ad5 Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Tue, 17 Oct 2017 16:41:57 +0200
Subject: [PATCH] Add IcoContainer component to content-manager

---
 .../lib/src/components/Ico/index.js                    | 10 +++++++---
 .../admin/src/components/TableRow/index.js             |  6 +++---
 .../admin/src/containers/List/index.js                 |  5 +----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/strapi-helper-plugin/lib/src/components/Ico/index.js b/packages/strapi-helper-plugin/lib/src/components/Ico/index.js
index c420a93ada..e9a0a2e285 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Ico/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Ico/index.js
@@ -4,9 +4,13 @@ import PropTypes from 'prop-types';
 import styles from './styles.scss';
 
 function Ico(props) {
+  const iProps = Object.assign({}, props);
+  const propsToDelete = ['onClick', 'icoType'];
+  propsToDelete.map((value) => delete iProps[value]);
+
   return (
-    <div className={styles.ico} onClick={(e) => handleClick(e, props.onClick)}>
-      <i className={`fa fa-${props.icoType}`} id={props.id} role="button" aria-hidden="true"/>
+    <div className={styles.ico} onClick={(e) => handleClick(e, props.onClick)} id={props.id}>
+      <i className={`fa fa-${props.icoType}`} id={props.id} role="button" aria-hidden="true"  {...iProps} />
     </div>
   )
 }
@@ -14,7 +18,7 @@ function Ico(props) {
 const handleClick = (e, onClick) => {
   e.preventDefault();
   e.stopPropagation();
-  onClick();
+  onClick(e);
 }
 
 Ico.proptypes = {
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
index 3772e29f70..1fd7594c60 100755
--- a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
@@ -9,6 +9,8 @@ import PropTypes from 'prop-types';
 import moment from 'moment';
 import { isEmpty, isObject } from 'lodash';
 
+import IcoContainer from 'components/IcoContainer';
+
 import styles from './styles.scss';
 
 class TableRow extends React.Component {
@@ -73,11 +75,9 @@ class TableRow extends React.Component {
       </td>
     ));
 
-    // Add actions cell.
     cells.push(
       <td key='action' className={styles.actions}>
-        <i className="fa fa-pencil" aria-hidden="true"></i>
-        <i onClick={this.props.onDelete} id={this.props.record.id} className="fa fa-trash" aria-hidden="true"></i>
+        <IcoContainer icons={[{ icoType: 'pencil' }, { id: this.props.record.id, icoType: 'trash', onClick: this.props.onDelete }]} />
       </td>
     );
 
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
index 643bd74607..bf5be77dd9 100755
--- a/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
@@ -69,7 +69,6 @@ export class List extends React.Component {
   componentDidMount() {
     // Init the view
     this.init(this.props);
-    // this.init(this.props.match.params.slug);
   }
 
   componentWillReceiveProps(nextProps) {
@@ -77,7 +76,6 @@ export class List extends React.Component {
 
     if (locationChanged) {
       this.init(nextProps);
-      // this.init(nextProps.match.params.slug);
     }
 
     if (!isEmpty(nextProps.location.search) && this.props.location.search !== nextProps.location.search) {
@@ -148,10 +146,8 @@ export class List extends React.Component {
 
   toggleModalWarning = (e) => {
     if (!isUndefined(e)) {
-
       e.preventDefault();
       e.stopPropagation();
-
       this.setState({
         target: e.target.id,
       });
@@ -164,6 +160,7 @@ export class List extends React.Component {
     if (!this.props.currentModelName || !this.props.schema) {
       return <div />;
     }
+
     // Detect current model structure from models list
     const currentModel = this.props.models[this.props.currentModelName];