Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Table visualization: accept timestamp for date/time columns #4389

Merged
merged 3 commits into from
Nov 24, 2019
Merged

Table visualization: accept timestamp for date/time columns #4389

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3013f34
Table visualization: accept timestamp for date/time columns
kravets-levko Nov 23, 2019
ada00d0
Fix Map tests
kravets-levko Nov 23, 2019
c9ab1c7
Merge branch 'master' into table-column-datetime-accept-timestamp
kravets-levko Nov 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/app/components/ColorPicker/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export default function ColorPicker({
return (
<Popover
arrowPointAtCenter
destroyTooltipOnHide
overlayClassName={`color-picker ${interactive ? 'color-picker-interactive' : 'color-picker-with-actions'}`}
overlayStyle={{ '--color-picker-selected-color': currentColor }}
content={(
Expand Down
19 changes: 14 additions & 5 deletions client/app/lib/value-format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import moment from 'moment/moment';
import numeral from 'numeral';
import { isString, isArray, isUndefined, isNil, toString } from 'lodash';
import { isString, isArray, isUndefined, isFinite, isNil, toString } from 'lodash';

numeral.options.scalePercentBy100 = false;

Expand All @@ -21,13 +21,22 @@ export function createTextFormatter(highlightLinks) {
return value => toString(value);
}

function toMoment(value) {
if (moment.isMoment(value)) {
return value;
}
if (isFinite(value)) {
return moment(value);
}
// same as default `moment(value)`, but avoid fallback to `new Date()`
return moment(toString(value), [moment.ISO_8601, moment.RFC_2822]);
}

export function createDateTimeFormatter(format) {
if (isString(format) && (format !== '')) {
return (value) => {
if (value && moment.isMoment(value)) {
return value.format(format);
}
return toString(value);
const wrapped = toMoment(value);
return wrapped.isValid() ? wrapped.format(format) : toString(value);
};
}
return value => toString(value);
Expand Down