@hipay/hipay-material-ui 1.0.0-beta.2 → 1.0.0-beta.20

package/es/HiTable/BodyCells/CellCountry.js

@@ -47,41 +47,12 @@ export const styles = theme => ({
 class CellCountry extends React.PureComponent {
 
     render() {
-        const { classes, value, isoCode, view } = this.props;
-
-        let path = '/static/images/countries/' + isoCode.toLowerCase() + '.svg';
-
-        let tooltipContent = React.createElement(
-            'div',
-            null,
-            React.createElement('img', { src: path, className: classes.tooltipImg }),
-            React.createElement(
-                'span',
-                { className: classes.tooltipLabel },
-                value
-            )
-        );
+        const { label, path, value, view } = this.props;
 
         if (view === cst.VIEWS.LARGE) {
-            return React.createElement(CellImage, { view: cst.VIEWS.LARGE, value: value, path: path });
+            return React.createElement(CellImage, { value: label ? label : value, path: path, view: view });
         } else {
-            let valueElement = value;
-            if (view === cst.VIEWS.SMALL) {
-                valueElement = isoCode.toUpperCase();
-            }
-            return React.createElement(
-                Tooltip,
-                { title: tooltipContent, placement: this.props.sticky ? 'right' : 'bottom' },
-                React.createElement(
-                    'div',
-                    { className: classes.wrapper },
-                    React.createElement(
-                        'span',
-                        { className: classes.label },
-                        valueElement
-                    )
-                )
-            );
+            return React.createElement(CellImage, { value: value, path: path, view: view });
         }
     }
 }
@@ -94,11 +65,15 @@ CellCountry.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Label
      */
-    value: PropTypes.string.isRequired,
+    label: PropTypes.string,
+    /**
+     * Flag's image path
+     */
+    path: PropTypes.string,
     /**
-     * Code ISO
+     * Value - code isoa2 (uppercase)
      */
-    isoCode: PropTypes.string.isRequired,
+    value: PropTypes.string,
     /**
      * View (L/M/S)
      */

package/es/HiTable/BodyCells/CellIcon.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
 import Tooltip from '../../Tooltip';
 import withStyles from '../../styles/withStyles';
 import * as cst from '../constants';
 import HiIconBuilder from '../../utils/HiIconBuilder';
 
-export const styles = theme => ({
+export const styles = {
     icon: {
         float: 'left'
     },
@@ -17,8 +16,11 @@ export const styles = theme => ({
         whiteSpace: 'nowrap',
         overflow: 'hidden',
         textOverflow: 'ellipsis'
+    },
+    nowrap: {
+        whiteSpace: 'nowrap'
     }
-});
+};
 
 /**
  * Cette cellule permet d'afficher une icône et un label (optionnel).
@@ -27,13 +29,13 @@ export const styles = theme => ({
 class CellIcon extends React.PureComponent {
 
     render() {
-        const { classes, icon, value, view } = this.props;
+        const { classes, icon, value, view, color } = this.props;
 
-        const iconElement = React.createElement(HiIconBuilder, { className: classes.icon, icon: icon, size: 18 });
+        const iconElement = icon !== '' ? React.createElement(HiIconBuilder, { color: color, className: classes.icon, icon: icon, size: 18 }) : '';
 
         const tooltipContent = React.createElement(
             'div',
-            null,
+            { className: classes.nowrap },
             iconElement,
             React.createElement(
                 'span',
@@ -60,7 +62,9 @@ class CellIcon extends React.PureComponent {
 }
 
 CellIcon.defaultProps = {
-    view: 'l'
+    icon: '',
+    view: 'l',
+    color: '#000'
 };
 CellIcon.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
@@ -68,9 +72,14 @@ CellIcon.propTypes = process.env.NODE_ENV !== "production" ? {
      */
     classes: PropTypes.object,
     /**
-     * Icône name [from material-design-icons](https://materialdesignicons.com/)
+     * Couleur de l'icône
+     */
+    color: PropTypes.string.isRequired,
+    /**
+     * Icon name [from material-design-icons](https://materialdesignicons.com/)
+     * used by HiIconBuilder
      */
-    icon: PropTypes.string.isRequired,
+    icon: PropTypes.string,
     /**
      * Label
      */

package/es/HiTable/BodyCells/CellImage.js

@@ -1,43 +1,42 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
 import Tooltip from '../../Tooltip';
 import withStyles from '../../styles/withStyles';
 import * as cst from '../constants';
 
 export const styles = theme => ({
     img: {
-        width: 24,
         height: 'auto',
         float: 'left'
     },
     smallImg: {
-        width: 24,
         height: 'auto'
     },
     label: {
-        marginLeft: 5
+        marginLeft: 5,
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis'
     },
     tooltipImg: {
         width: 24,
         height: 'auto',
-        float: 'left',
-        marginTop: 2
+        float: 'left'
     },
     tooltipLabel: {
         marginLeft: 5,
-        position: 'relative',
-        bottom: 2,
         verticalAlign: 'middle'
-
     },
     wrapper: {
-        whiteSpace: 'nowrap',
-        overflow: "hidden",
-        textOverflow: "ellipsis"
+        display: 'flex',
+        alignItems: 'center'
     },
     center: {
         textAlign: 'center'
+    },
+    tooltipContainer: {
+        display: 'flex',
+        alignItems: 'center'
     }
 });
 
@@ -49,12 +48,12 @@ export const styles = theme => ({
 class CellImage extends React.PureComponent {
 
     render() {
-        const { classes, path, value, view } = this.props;
+        const { classes, path, value, view, size } = this.props;
 
         const tooltipContent = React.createElement(
             'div',
-            null,
-            React.createElement('img', { src: path, alt: value, className: classes.tooltipImg }),
+            { className: classes.tooltipContainer },
+            React.createElement('img', { src: path, alt: value, className: classes.tooltipImg, width: size }),
             React.createElement(
                 'span',
                 { className: classes.tooltipLabel },
@@ -63,17 +62,29 @@ class CellImage extends React.PureComponent {
         );
 
         let innerCellElement = null;
-        if (view === cst.VIEWS.SMALL) {
-            innerCellElement = React.createElement(
-                'div',
-                { className: classes.center },
-                React.createElement('img', { src: path, alt: value, className: classes.smallImg })
-            );
+        if (path) {
+            if (view === cst.VIEWS.SMALL) {
+                innerCellElement = React.createElement(
+                    'div',
+                    { className: classes.center },
+                    React.createElement('img', { src: path, alt: value, className: classes.smallImg, width: size })
+                );
+            } else {
+                innerCellElement = React.createElement(
+                    'div',
+                    { className: classes.wrapper },
+                    React.createElement('img', { src: path, alt: value, className: classes.img, width: size }),
+                    !!value && React.createElement(
+                        'span',
+                        { className: classes.label },
+                        value
+                    )
+                );
+            }
         } else {
             innerCellElement = React.createElement(
                 'div',
                 { className: classes.wrapper },
-                React.createElement('img', { src: path, alt: value, className: classes.img }),
                 !!value && React.createElement(
                     'span',
                     { className: classes.label },
@@ -83,6 +94,7 @@ class CellImage extends React.PureComponent {
         }
 
         if (view === cst.VIEWS.LARGE) {
+            // Don't add tooltip for large view
             return innerCellElement;
         } else {
             return React.createElement(
@@ -94,6 +106,9 @@ class CellImage extends React.PureComponent {
     }
 }
 
+CellImage.defaultProps = {
+    size: 24
+};
 CellImage.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Useful to extend the style applied to components.
@@ -102,9 +117,13 @@ CellImage.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Image path
      */
-    path: PropTypes.string.isRequired,
+    path: PropTypes.string,
+    /**
+     * Image path
+     */
+    size: PropTypes.number.isRequired,
     /**
-     * Label
+     * Value
      */
     value: PropTypes.string,
     /**

package/es/HiTable/BodyCells/CellLayout.js

@@ -28,6 +28,10 @@ export const styles = theme => ({
     lookedUp: {
         background: `linear-gradient(0deg, transparent 25%, #FFFF8D 10%, #FFFF8D 75%, transparent 30%)`,
         borderRadius: '45%'
+    },
+    pins: {
+        position: 'relative',
+        top: 3
     }
 });
 
@@ -57,34 +61,35 @@ class CellLayout extends React.Component {
         const {
             classes, type, children,
             align = cst.ALIGN_RIGHT_TYPES.includes(type) ? 'right' : 'left',
-            view, dense, width = cst.DEFAULT_WIDTHS[type][view], fixedWidth, sticky,
-            selectable, selected, onSelect, childrenCount, theme, padding,
+            view, dense, width = cst.DEFAULT_WIDTHS[type][view], fixedColumnWidth, sticky,
+            selectable, selected, onSelect, childrenCount, detailInfos, onOpenDetails, theme, padding,
             lookedUp
         } = this.props;
 
-        let offset = selectable ? dense ? 32 : 40 : 0;
+        const offset = selectable ? dense ? 32 : 40 : 0;
 
         // Inclus le padding et/ou la checkbox dans la largeur de la cellule
-        let _width = width + offset + (selectable ? padding : 2 * padding);
+        const _width = width + offset + (selectable ? padding : 2 * padding);
 
         const lookedUpClassName = classNames(classes.flexContent, { [classes.lookedUp]: lookedUp });
 
+        const cellStyle = {
+            zIndex: sticky ? 12 : 11,
+            textAlign: align,
+            position: sticky ? 'relative' : 'inherit',
+            border: 'none',
+            height: dense ? cst.CELL_HEIGHT_DENSE : cst.CELL_HEIGHT
+        };
+
+        if (fixedColumnWidth) {
+            cellStyle.maxWidth = _width;
+            cellStyle.minWidth = _width;
+            cellStyle.width = _width;
+        }
+
         return React.createElement(
             TableCell,
-            {
-                className: classes.root,
-                style: {
-                    maxWidth: _width,
-                    minWidth: _width,
-                    width: _width,
-                    // la cellule sticky doit être au dessus des autres cellules du body
-                    zIndex: sticky ? 12 : 11,
-                    textAlign: align,
-                    position: sticky ? 'relative' : 'inherit',
-                    border: 'none',
-                    height: dense ? cst.CELL_HEIGHT_DENSE : cst.CELL_HEIGHT
-                }
-            },
+            { className: classes.root, style: cellStyle },
             !!selectable && React.createElement(HiCheckbox, {
                 classes: { root: classes.checkbox },
                 style: { margin: dense ? 6 : 10 },
@@ -115,9 +120,25 @@ class CellLayout extends React.Component {
                     },
                     React.createElement(
                         HiPins,
-                        { color: theme.palette.business.primary.normal },
+                        { color: theme.palette.business.primary.normal, className: classes.pins },
                         childrenCount
                     )
+                ),
+                detailInfos && React.createElement(
+                    'div',
+                    {
+                        style: {
+                            position: 'absolute',
+                            top: dense ? 2 : 6,
+                            right: 0
+                        },
+                        onClick: onOpenDetails
+                    },
+                    React.createElement(
+                        HiPins,
+                        { color: theme.palette.business.secondary.normal, className: classes.pins },
+                        detailInfos.total
+                    )
                 )
             )
         );
@@ -129,9 +150,10 @@ CellLayout.defaultProps = {
     selectable: false,
     selected: false,
     dense: false,
-    fixedWidth: false,
+    fixedColumnWidth: true,
     sticky: false,
-    padding: 8
+    padding: 8,
+    detailInfos: null
 };
 CellLayout.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
@@ -146,6 +168,10 @@ CellLayout.propTypes = process.env.NODE_ENV !== "production" ? {
      * Densité, défini la hauteur de la ligne
      */
     dense: PropTypes.bool,
+    /**
+     * Ajoute un Chip affichant le nombre de ligne de détails de la ligne et permettant de les affichés via onOpenDetails
+     */
+    detailInfos: PropTypes.object,
     /**
      * Recherche lookup sur cette colonne
      */
@@ -161,11 +187,12 @@ CellLayout.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Largeur de la cellule (hors padding), est déduit de view par défaut
      */
-    width: PropTypes.number,
+    width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     /**
-     * La largeur de la cellule est fixé (toutes les colonnes sauf une)
+     * Fixe la taille des colonnes selon le type de vue
+     * Sinon les colonnes s'adaptent à l'espace disponible
      */
-    fixedWidth: PropTypes.bool,
+    fixedColumnWidth: PropTypes.bool,
     /**
      * Title alignement, est déduit de type par défaut
      */

package/es/HiTable/BodyCells/CellNumeric.js

@@ -18,7 +18,7 @@ export const styles = theme => ({
 class CellNumeric extends React.PureComponent {
 
     render() {
-        const { classes, value, locale, currency, view } = this.props;
+        const { classes, value, locale, currency, view, precision } = this.props;
 
         let displayedValue = '';
         let titleValue = '';
@@ -31,7 +31,7 @@ class CellNumeric extends React.PureComponent {
                 titleValue = formatCurrencyAmount(value, cst.VIEWS.LARGE, locale, currency);
             }
         } else {
-            displayedValue = formatNumber(value, view, locale);
+            displayedValue = formatNumber(value, view, locale, precision);
         }
 
         return React.createElement(
@@ -63,6 +63,10 @@ CellNumeric.propTypes = process.env.NODE_ENV !== "production" ? {
      * Code de la devise (ISO 4217)
      */
     currency: PropTypes.string,
+    /**
+     * Nombre de chiffres après la virgule
+     */
+    precision: PropTypes.number,
     /**
      * View (L/M/S)
      */

package/es/HiTable/BodyCells/CellSentinel.js

@@ -5,15 +5,18 @@ import HiColoredLabel from '../../HiColoredLabel';
 import { withStyles } from '../../styles';
 import * as cst from '../constants';
 
-export const styles = theme => ({
+export const styles = {
     smartDecision: {
         display: 'inline-block',
         minWidth: 18
     },
     label: {
         marginLeft: 2
+    },
+    nowrap: {
+        whiteSpace: 'nowrap'
     }
-});
+};
 
 /**
  * Cette cellule permet d'afficher le résultat de Sentinel (score & fraudResult & smartDecision)
@@ -21,7 +24,7 @@ export const styles = theme => ({
 class CellSentinel extends React.PureComponent {
 
     constructor(props) {
-        super();
+        super(props);
 
         this.getColorFromFraudResult = this.getColorFromFraudResult.bind(this);
     }
@@ -66,7 +69,8 @@ class CellSentinel extends React.PureComponent {
             fraudResult,
             automaticFraudReviewResult,
             pendingManualAction,
-            smartDecision
+            smartDecision,
+            hideFraudResult
         } = this.props;
 
         const scoreLabel = score > 0 ? `+${score}` : `${score}`;
@@ -76,17 +80,17 @@ class CellSentinel extends React.PureComponent {
             null,
             React.createElement(
                 'div',
-                null,
+                { className: classes.nowrap },
                 scoreLabel
             ),
             React.createElement(
                 'div',
-                null,
+                { className: classes.nowrap },
                 fraudResult
             ),
             !!smartDecision && automaticFraudReviewResult && React.createElement(
                 'div',
-                null,
+                { className: classes.nowrap },
                 'SD: ',
                 automaticFraudReviewResult
             )
@@ -97,14 +101,14 @@ class CellSentinel extends React.PureComponent {
             { title: tooltipContent, placement: this.props.sticky ? 'right' : 'bottom' },
             React.createElement(
                 'div',
-                null,
+                { style: { textAlign: 'right' } },
                 React.createElement(HiColoredLabel, {
                     label: scoreLabel,
                     color: this.getColorFromFraudResult(fraudResult.toLowerCase()),
                     classes: { root: classes.label },
                     active: pendingManualAction
                 }),
-                React.createElement(HiColoredLabel, {
+                !hideFraudResult && React.createElement(HiColoredLabel, {
                     label: fraudResult.toUpperCase().substr(0, 1),
                     color: this.getColorFromFraudResult(fraudResult),
                     classes: { root: classes.label },
@@ -124,6 +128,9 @@ class CellSentinel extends React.PureComponent {
     }
 }
 
+CellSentinel.defaultProps = {
+    hideFraudResult: false
+};
 CellSentinel.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Résultat de l'automaticFraudReview si la transaction est passée par SmartDecision
@@ -137,6 +144,10 @@ CellSentinel.propTypes = process.env.NODE_ENV !== "production" ? {
      * Résultat de la fraude
      */
     fraudResult: PropTypes.string.isRequired,
+    /**
+     * Si true le fraudResult ne sera pas affiché
+     */
+    hideFraudResult: PropTypes.bool.isRequired,
     /**
      * Signal qu'il attend une réponse manuelle
      */

package/es/HiTable/BodyCells/CellStatus.js

@@ -11,6 +11,10 @@ export const styles = theme => ({
         display: 'inline-flex',
         alignItems: 'baseline',
         maxWidth: 'calc(100% - 36px)'
+    },
+    pins: {
+        position: 'relative',
+        bottom: 1
     }
 });
 
@@ -33,7 +37,7 @@ class CellStatus extends React.PureComponent {
                     React.createElement(HiColoredLabel, { label: value, color: color }),
                     React.createElement(
                         HiPins,
-                        { color: color, onClick: onOpenDetails },
+                        { color: color, onClick: onOpenDetails, className: classes.pins },
                         nbOperations
                     )
                 ) : React.createElement(HiColoredLabel, { label: value, color: color })
@@ -56,11 +60,11 @@ CellStatus.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Nombre d'opérations financières
      */
-    nbOperations: PropTypes.number.isRequired,
+    nbOperations: PropTypes.number,
     /**
      * Statut courant de la transaction
      */
-    value: PropTypes.string.isRequired,
+    value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
     /**
      * Code du statut courant de la transaction (détermine la couleur du label)
      */

package/es/HiTable/BodyCells/CellText.js

@@ -17,7 +17,8 @@ export const styles = theme => ({
         display: 'inline-block',
         overflow: 'hidden',
         textOverflow: 'ellipsis',
-        whiteSpace: 'pre'
+        whiteSpace: 'pre',
+        width: '100%'
     },
     noEllipsisSpan: {
         display: 'inline-block',