Skip to content

Commit f1495ed

Browse files
authored
[TSVB] [Cleanup] Remove extra dateFormat props (#84749)
1 parent 9041ea5 commit f1495ed

File tree

8 files changed

+11
-18
lines changed

8 files changed

+11
-18
lines changed

src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ export class MarkdownEditor extends Component {
4949
}
5050

5151
render() {
52-
const { visData, model, dateFormat } = this.props;
52+
const { visData, model, getConfig } = this.props;
5353

5454
if (!visData) {
5555
return null;
5656
}
57-
57+
const dateFormat = getConfig('dateFormat');
5858
const series = _.get(visData, `${model.id}.series`, []);
5959
const variables = convertSeriesToVars(series, model, dateFormat, this.props.getConfig);
6060
const rows = [];
@@ -214,6 +214,6 @@ export class MarkdownEditor extends Component {
214214
MarkdownEditor.propTypes = {
215215
onChange: PropTypes.func,
216216
model: PropTypes.object,
217-
dateFormat: PropTypes.string,
217+
getConfig: PropTypes.func,
218218
visData: PropTypes.object,
219219
};

src/plugins/vis_type_timeseries/public/application/components/panel_config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ PanelConfig.propTypes = {
9090
fields: PropTypes.object,
9191
model: PropTypes.object,
9292
onChange: PropTypes.func,
93-
dateFormat: PropTypes.string,
9493
visData$: PropTypes.object,
94+
getConfig: PropTypes.func,
9595
};

src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ MarkdownPanelConfigUi.propTypes = {
334334
fields: PropTypes.object,
335335
model: PropTypes.object,
336336
onChange: PropTypes.func,
337-
dateFormat: PropTypes.string,
338337
};
339338

340339
export const MarkdownPanelConfig = injectI18n(MarkdownPanelConfigUi);

src/plugins/vis_type_timeseries/public/application/components/timeseries_visualization.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ function TimeseriesVisualization({
9696
if (VisComponent) {
9797
return (
9898
<VisComponent
99-
dateFormat={getConfig('dateFormat')}
10099
getConfig={getConfig}
101100
model={model}
102101
visData={visData}

src/plugins/vis_type_timeseries/public/application/components/vis_editor.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ export class VisEditor extends Component {
181181
fields={this.state.visFields}
182182
model={model}
183183
visData$={this.visData$}
184-
dateFormat={this.props.config.get('dateFormat')}
185184
onChange={this.handleChange}
186185
getConfig={this.getConfig}
187186
/>

src/plugins/vis_type_timeseries/public/application/components/vis_types/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ export interface TimeseriesVisProps {
6464
) => void;
6565
uiState: PersistedState;
6666
visData: TimeseriesVisData;
67-
dateFormat: string;
6867
getConfig: IUiSettingsClient['get'];
6968
}

src/plugins/vis_type_timeseries/public/application/components/vis_types/markdown/vis.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import { isBackgroundInverted } from '../../../lib/set_is_reversed';
3131
const getMarkdownId = (id) => `markdown-${id}`;
3232

3333
function MarkdownVisualization(props) {
34-
const { backgroundColor, model, visData, dateFormat } = props;
34+
const { backgroundColor, model, visData, getConfig } = props;
3535
const series = get(visData, `${model.id}.series`, []);
36-
const variables = convertSeriesToVars(series, model, dateFormat, props.getConfig);
36+
const variables = convertSeriesToVars(series, model, getConfig('dateFormat'), props.getConfig);
3737
const markdownElementId = getMarkdownId(uuid.v1());
3838

3939
const panelBackgroundColor = model.background_color || backgroundColor;
@@ -103,7 +103,6 @@ MarkdownVisualization.propTypes = {
103103
onBrush: PropTypes.func,
104104
onChange: PropTypes.func,
105105
visData: PropTypes.object,
106-
dateFormat: PropTypes.string,
107106
getConfig: PropTypes.func,
108107
};
109108

src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,18 @@ class TimeseriesVisualization extends Component {
3939
model: PropTypes.object,
4040
onBrush: PropTypes.func,
4141
visData: PropTypes.object,
42-
dateFormat: PropTypes.string,
4342
getConfig: PropTypes.func,
4443
};
4544

46-
xAxisFormatter = (interval) => (val) => {
47-
const scaledDataFormat = this.props.getConfig('dateFormat:scaled');
48-
const { dateFormat } = this.props;
45+
scaledDataFormat = this.props.getConfig('dateFormat:scaled');
46+
dateFormat = this.props.getConfig('dateFormat');
4947

50-
if (!scaledDataFormat || !dateFormat) {
48+
xAxisFormatter = (interval) => (val) => {
49+
if (!this.scaledDataFormat || !this.dateFormat) {
5150
return val;
5251
}
5352

54-
const formatter = createXaxisFormatter(interval, scaledDataFormat, dateFormat);
55-
53+
const formatter = createXaxisFormatter(interval, this.scaledDataFormat, this.dateFormat);
5654
return formatter(val);
5755
};
5856

0 commit comments

Comments
 (0)