IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Timeline: Renames component to avoid casing conflicts (#32736)

Browse Source
This commit is contained in:
Hugo Häggmark 2021-04-07 08:16:14 +02:00 committed by GitHub
parent a56293142a
commit 10697d6130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grafana-ui/src/components/Timeline/Timeline.tsx → packages/grafana-ui/src/components/Timeline/TimelineChart.tsx
View File

@ -11,7 +11,7 @@ import { LegendDisplayMode } from '../VizLegend/types';
import { VizLayout } from '../VizLayout/VizLayout'; import { VizLayout } from '../VizLayout/VizLayout';
import { TimelineProps } from './types'; import { TimelineProps } from './types';
class UnthemedTimeline extends React.Component<TimelineProps, GraphNGState> { class UnthemedTimelineChart extends React.Component<TimelineProps, GraphNGState> {
constructor(props: TimelineProps) { constructor(props: TimelineProps) {
super(props); super(props);
let dimFields = props.fields; let dimFields = props.fields;
@ -191,5 +191,5 @@ class UnthemedTimeline extends React.Component<TimelineProps, GraphNGState> {
} }
} }
export const Timeline = withTheme(UnthemedTimeline); export const TimelineChart = withTheme(UnthemedTimelineChart);
Timeline.displayName = 'Timeline'; TimelineChart.displayName = 'TimelineChart';

4
packages/grafana-ui/src/components/index.ts
View File

@ -188,7 +188,7 @@ export { PluginSignatureBadge, PluginSignatureBadgeProps } from './PluginSignatu
export { InlineFormLabel } from './FormLabel/FormLabel'; export { InlineFormLabel } from './FormLabel/FormLabel';
// Select // Select
import { Select, AsyncSelect } from './Forms/Legacy/Select/Select'; import { AsyncSelect, Select } from './Forms/Legacy/Select/Select';
import { IndicatorsContainer } from './Forms/Legacy/Select/IndicatorsContainer'; import { IndicatorsContainer } from './Forms/Legacy/Select/IndicatorsContainer';
import { NoOptionsMessage } from './Forms/Legacy/Select/NoOptionsMessage'; import { NoOptionsMessage } from './Forms/Legacy/Select/NoOptionsMessage';
@ -221,7 +221,7 @@ export { usePlotContext, usePlotPluginContext } from './uPlot/context';
export { GraphNG, FIXED_UNIT } from './GraphNG/GraphNG'; export { GraphNG, FIXED_UNIT } from './GraphNG/GraphNG';
export { useGraphNGContext } from './GraphNG/hooks'; export { useGraphNGContext } from './GraphNG/hooks';
export { BarChart } from './BarChart/BarChart'; export { BarChart } from './BarChart/BarChart';
export { Timeline } from './Timeline/Timeline'; export { TimelineChart } from './Timeline/TimelineChart';
export { BarChartOptions, BarStackingMode, BarValueVisibility, BarChartFieldConfig } from './BarChart/types'; export { BarChartOptions, BarStackingMode, BarValueVisibility, BarChartFieldConfig } from './BarChart/types';
export { TimelineOptions, TimelineFieldConfig } from './Timeline/types'; export { TimelineOptions, TimelineFieldConfig } from './Timeline/types';
export { GraphNGLegendEvent, GraphNGLegendEventMode } from './GraphNG/types'; export { GraphNGLegendEvent, GraphNGLegendEventMode } from './GraphNG/types';

4
public/app/plugins/panel/timeline/TimelinePanel.tsx
View File

@ -1,6 +1,6 @@
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
import { PanelProps } from '@grafana/data'; import { PanelProps } from '@grafana/data';
import { Timeline, GraphNGLegendEvent, TimelineOptions } from '@grafana/ui'; import { GraphNGLegendEvent, TimelineChart, TimelineOptions } from '@grafana/ui';
import { changeSeriesColorConfigFactory } from '../timeseries/overrides/colorSeriesConfigFactory'; import { changeSeriesColorConfigFactory } from '../timeseries/overrides/colorSeriesConfigFactory';
import { hideSeriesConfigFactory } from '../timeseries/overrides/hideSeriesConfigFactory'; import { hideSeriesConfigFactory } from '../timeseries/overrides/hideSeriesConfigFactory';
@ -42,7 +42,7 @@ export const TimelinePanel: React.FC<TimelinePanelProps> = ({
} }
return ( return (
<Timeline <TimelineChart
data={data.series} data={data.series}
timeRange={timeRange} timeRange={timeRange}
timeZone={timeZone} timeZone={timeZone}