Merge: + client: add detailed date format for filters
Close #624 Squashed commit of the following: commit 5a66d8ca350880abd0a7a146b75df385aa8f97b4 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Jan 20 19:16:27 2020 +0300 update CellWrap logic commit 072586493ef2cb73ba514a01d8b7f8904d4f5754 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Jan 20 15:37:26 2020 +0300 fix invalid date case commit bd2a21f2c788b2835485f4697dac1b797d5559c0 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Jan 17 18:44:23 2020 +0300 + client: add detailed date format for filters
This commit is contained in:
@@ -1,19 +1,29 @@
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
const CellWrap = ({ value }) => (
|
||||
<div className="logs__row logs__row--overflow">
|
||||
<span className="logs__text logs__text--full" title={value}>
|
||||
{value}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
const CellWrap = ({ value }, formatValue, formatTitle = formatValue) => {
|
||||
if (!value) {
|
||||
return '–';
|
||||
}
|
||||
const cellValue = typeof formatValue === 'function' ? formatValue(value) : value;
|
||||
const cellTitle = typeof formatTitle === 'function' ? formatTitle(value) : value;
|
||||
|
||||
return (
|
||||
<div className="logs__row logs__row--overflow">
|
||||
<span className="logs__text logs__text--full" title={cellTitle}>
|
||||
{cellValue}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
CellWrap.propTypes = {
|
||||
value: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.number,
|
||||
]),
|
||||
formatValue: PropTypes.func,
|
||||
formatTitle: PropTypes.func,
|
||||
};
|
||||
|
||||
export default CellWrap;
|
||||
|
||||
Reference in New Issue
Block a user