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

[TSVB] Adds ignore DST switch for timeseries #98484

Merged
merged 11 commits into from
May 5, 2021
Merged

[TSVB] Adds ignore DST switch for timeseries #98484

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c5a144c
[TSVB] add ignore DST switch
dimaanj Apr 27, 2021
8d3bf49
[TSVB] move YesNo component to timeseries panel, get rid of getTimezo…
dimaanj Apr 28, 2021
385736c
Merge branch 'master' into ignore-dst-timeseries
kibanamachine Apr 28, 2021
9b1c724
[TSVB] reduce formatter creation number
dimaanj Apr 28, 2021
bb6e9d8
[TSVB] add usage EuFormRow, remove redundant translations
dimaanj Apr 29, 2021
1947b03
Merge branch 'master' into ignore-dst-timeseries
kibanamachine May 4, 2021
1c72466
Merge branch 'master' into ignore-dst-timeseries
kibanamachine May 5, 2021
beff6ed
[TSVB] use boolean instead of number
dimaanj May 5, 2021
7def18d
[TSVB] use number for YesNo
dimaanj May 5, 2021
488576e
[TSVB] resolve YesNo value type
dimaanj May 5, 2021
5f7e362
[TSVB] replace number with boolean
dimaanj May 5, 2021
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: 1 addition & 0 deletions src/plugins/vis_type_timeseries/common/vis_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ export const panel = schema.object({
background_color_rules: schema.maybe(schema.arrayOf(backgroundColorRulesItems)),
drilldown_url: stringOptional,
drop_last_bucket: numberIntegerOptional,
ignore_daylight_time: numberIntegerOptional,
filter: schema.maybe(queryObject),
gauge_color_rules: schema.maybe(schema.arrayOf(gaugeColorRulesItems)),
gauge_width: schema.nullable(schema.oneOf([stringOptionalNullable, numberOptional])),
Expand Down
9 changes: 8 additions & 1 deletion src/plugins/vis_type_timeseries/public/application/components/last_value_mode_indicator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface LastValueModeIndicatorProps {
seriesData?: PanelData['data'];
panelInterval: number;
modelInterval: string;
ignoreDaylightTime: boolean;
}

const lastValueLabel = i18n.translate('visTypeTimeseries.lastValueModeIndicator.lastValue', {
Expand All @@ -29,6 +30,7 @@ export const LastValueModeIndicator = ({
seriesData,
panelInterval,
modelInterval,
ignoreDaylightTime,
}: LastValueModeIndicatorProps) => {
if (!seriesData?.length) return <EuiBadge>{lastValueLabel}</EuiBadge>;

Expand All @@ -40,7 +42,12 @@ export const LastValueModeIndicator = ({
return interval && `${interval.unitValue}${interval.unitString}`;
};

const formatter = createIntervalBasedFormatter(panelInterval, scaledDataFormat, dateFormat);
const formatter = createIntervalBasedFormatter(
panelInterval,
scaledDataFormat,
dateFormat,
ignoreDaylightTime
);
const lastBucketDate = formatter(seriesData[seriesData.length - 1][0]);
const formattedPanelInterval =
(isAutoInterval(modelInterval) || isGteInterval(modelInterval)) && getFormattedPanelInterval();
Expand Down
12 changes: 10 additions & 2 deletions .../vis_type_timeseries/public/application/components/lib/create_interval_based_formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

import moment from 'moment';

const JANUARY_MOMENT_CONFIG = { M: 0, d: 1 };

function getFormat(interval: number, rules: string[][] = []) {
for (let i = rules.length - 1; i >= 0; i--) {
const rule = rules[i];
Expand All @@ -20,9 +22,15 @@ function getFormat(interval: number, rules: string[][] = []) {
export function createIntervalBasedFormatter(
interval: number,
rules: string[][],
dateFormat: string
dateFormat: string,
ignoreDaylightTime: boolean
) {
const fixedOffset = moment(JANUARY_MOMENT_CONFIG).utcOffset();
return (val: moment.MomentInput): string => {
dimaanj marked this conversation as resolved.
Show resolved Hide resolved
return moment(val).format(getFormat(interval, rules) ?? dateFormat);
const momentVal = moment(val);
if (ignoreDaylightTime) {
momentVal.utcOffset(fixedOffset);
}
return momentVal.format(getFormat(interval, rules) ?? dateFormat);
};
}
17 changes: 17 additions & 0 deletions src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export class TimeseriesPanelConfig extends Component<
legend_position: 'right',
show_grid: 1,
tooltip_mode: 'show_all',
ignore_daylight_time: 0,
dimaanj marked this conversation as resolved.
Show resolved Hide resolved
};
const model = { ...defaults, ...this.props.model };
const { selectedTab } = this.state;
Expand Down Expand Up @@ -227,6 +228,22 @@ export class TimeseriesPanelConfig extends Component<
/>
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFormRow
label={i18n.translate(
'visTypeTimeseries.timeseries.optionsTab.ignoreDaylightTimeLabel',
{
defaultMessage: 'Ignore daylight time?',
}
)}
>
<YesNo
value={model.ignore_daylight_time}
name="ignore_daylight_time"
onChange={this.props.onChange}
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPanel>

Expand Down
1 change: 1 addition & 0 deletions src/plugins/vis_type_timeseries/public/application/components/timeseries_visualization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ function TimeseriesVisualization({
`${isVisSeriesData(visData) ? model.id : 'series[0]'}.series[0].data`,
undefined
)}
ignoreDaylightTime={Boolean(model.ignore_daylight_time)}
panelInterval={getInterval(visData, model)}
modelInterval={model.interval ?? AUTO_INTERVAL}
/>
Expand Down
9 changes: 6 additions & 3 deletions src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ class TimeseriesVisualization extends Component {
scaledDataFormat = this.props.getConfig('dateFormat:scaled');
dateFormat = this.props.getConfig('dateFormat');

xAxisFormatter = (interval) => (val) => {
xAxisFormatter = (interval) => {
const formatter = createIntervalBasedFormatter(
interval,
this.scaledDataFormat,
this.dateFormat
this.dateFormat,
Boolean(this.props.model.ignore_daylight_time)
);
return formatter(val);
return (val) => {
dimaanj marked this conversation as resolved.
Show resolved Hide resolved
return formatter(val);
};
};

yAxisStackedByPercentFormatter = (val) => {
Expand Down