From 78746994592214b6035087ec561b7b0f081053b9 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 3 May 2019 09:27:52 -0700 Subject: [PATCH] change stats to calcs in config --- .../SingleStatShared/FieldDisplayEditor.tsx | 10 +++++----- .../SingleStatShared/SingleStatBaseOptions.ts | 2 +- packages/grafana-ui/src/utils/fieldDisplay.ts | 16 ++++++++-------- .../app/plugins/panel/gauge/GaugeMigrations.ts | 2 +- .../__snapshots__/GaugeMigrations.test.ts.snap | 6 +++--- public/app/plugins/panel/piechart/types.ts | 2 +- public/app/plugins/panel/singlestat2/types.ts | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx index f540005a21f40..dd0ab86169f6f 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx +++ b/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx @@ -44,8 +44,8 @@ export class FieldDisplayEditor extends PureComponent { this.props.onChange({ ...this.props.options, values: val }); }; - onStatsChange = (stats: string[]) => { - this.props.onChange({ ...this.props.options, stats }); + onCalcsChange = (calcs: string[]) => { + this.props.onChange({ ...this.props.options, calcs }); }; onTitleChange = (event: ChangeEvent) => @@ -70,7 +70,7 @@ export class FieldDisplayEditor extends PureComponent { render() { const { showPrefixSuffix, options, children } = this.props; - const { title, stats, prefix, suffix, values, limit } = options; + const { title, calcs, prefix, suffix, values, limit } = options; const titleTooltip = (
@@ -122,8 +122,8 @@ export class FieldDisplayEditor extends PureComponent { placeholder="Choose Stat" defaultStat={StatID.mean} allowMultiple={false} - stats={stats} - onChange={this.onStatsChange} + stats={calcs} + onChange={this.onCalcsChange} />
)} diff --git a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts index 56e24bc312570..ece7cc1c19cc5 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts +++ b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts @@ -54,7 +54,7 @@ export const sharedSingleStatMigrationCheck = (panel: PanelModel s.id); + fieldOptions.calcs = getStatsCalculators([valueOptions.stat]).map(s => s.id); } } field.min = old.minValue; diff --git a/packages/grafana-ui/src/utils/fieldDisplay.ts b/packages/grafana-ui/src/utils/fieldDisplay.ts index a1b1248b78898..04e6dd62a3c44 100644 --- a/packages/grafana-ui/src/utils/fieldDisplay.ts +++ b/packages/grafana-ui/src/utils/fieldDisplay.ts @@ -23,9 +23,9 @@ export interface FieldDisplayOptions { prefix?: string; suffix?: string; - values: boolean; // If true show each row value + values?: boolean; // If true show each row value limit?: number; // if showing all values limit - stats: string[]; // when !values, pick one value for the whole field + calcs: string[]; // when !values, pick one value for the whole field defaults: Partial; // Use these values unless otherwise stated override: Partial; // Set these values regardless of the source @@ -90,13 +90,13 @@ export const DEFAULT_FIELD_DISPLAY_VALUES_LIMIT = 25; export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): FieldDisplay[] => { const { data, replaceVariables, fieldOptions, sparkline } = options; const { defaults, override } = fieldOptions; - const stats = fieldOptions.stats.length ? fieldOptions.stats : [StatID.last]; + const calcs = fieldOptions.calcs.length ? fieldOptions.calcs : [StatID.last]; const values: FieldDisplay[] = []; if (data) { const limit = fieldOptions.limit ? fieldOptions.limit : DEFAULT_FIELD_DISPLAY_VALUES_LIMIT; - const title = getTitleTemplate(fieldOptions.title, stats, data); + const title = getTitleTemplate(fieldOptions.title, calcs, data); const usesCellValues = title.indexOf(VAR_CELL_PREFIX) >= 0; const scopedVars: ScopedVars = {}; @@ -172,7 +172,7 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi const results = calculateStats({ series, fieldIndex: i, - stats, // The stats to calculate + stats: calcs, // The stats to calculate nullValueMode: NullValueMode.Null, }); @@ -187,9 +187,9 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi nullValueMode: NullValueMode.Null, }); - for (const stat of stats) { - scopedVars[VAR_CALC] = { value: stat, text: stat }; - const displayValue = display(results[stat]); + for (const calc of calcs) { + scopedVars[VAR_CALC] = { value: calc, text: calc }; + const displayValue = display(results[calc]); displayValue.title = replaceVariables(title, scopedVars); values.push({ field, diff --git a/public/app/plugins/panel/gauge/GaugeMigrations.ts b/public/app/plugins/panel/gauge/GaugeMigrations.ts index 6d8a3331db068..ace2ccbea9639 100644 --- a/public/app/plugins/panel/gauge/GaugeMigrations.ts +++ b/public/app/plugins/panel/gauge/GaugeMigrations.ts @@ -33,7 +33,7 @@ export const gaugePanelMigrationCheck = (panel: PanelModel): Parti // Make sure the stats have a valid name if (valueOptions.stat) { - fieldOptions.stats = getStatsCalculators([valueOptions.stat]).map(s => s.id); + fieldOptions.calcs = getStatsCalculators([valueOptions.stat]).map(s => s.id); } } field.min = old.minValue; diff --git a/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap b/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap index 10bb410613e2a..6a3f412168a37 100644 --- a/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap +++ b/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap @@ -3,6 +3,9 @@ exports[`Gauge Panel Migrations from 6.1.1 1`] = ` Object { "fieldOptions": Object { + "calcs": Array [ + "last", + ], "defaults": Object { "decimals": 3, "max": "50", @@ -21,9 +24,6 @@ Object { }, ], "prefix": "XX", - "stats": Array [ - "last", - ], "suffix": "YY", "thresholds": Array [ Object { diff --git a/public/app/plugins/panel/piechart/types.ts b/public/app/plugins/panel/piechart/types.ts index 786d112b544dc..b1bb75804508f 100644 --- a/public/app/plugins/panel/piechart/types.ts +++ b/public/app/plugins/panel/piechart/types.ts @@ -12,7 +12,7 @@ export const defaults: PieChartOptions = { orientation: VizOrientation.Auto, fieldOptions: { ...standardFieldDisplayOptions, - stats: [StatID.last], + calcs: [StatID.last], defaults: { unit: 'short', }, diff --git a/public/app/plugins/panel/singlestat2/types.ts b/public/app/plugins/panel/singlestat2/types.ts index 1970da4df4f93..3503a73f5e3a5 100644 --- a/public/app/plugins/panel/singlestat2/types.ts +++ b/public/app/plugins/panel/singlestat2/types.ts @@ -24,7 +24,7 @@ export interface SingleStatOptions extends SingleStatBaseOptions { export const standardFieldDisplayOptions: FieldDisplayOptions = { title: '', // auto title values: false, - stats: [StatID.mean], + calcs: [StatID.mean], defaults: {}, override: {}, mappings: [],