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

use singlestat base where appropriate

Browse Source
This commit is contained in:
ryan
2019-03-15 08:38:29 -07:00
parent 77b78e36e5
commit b1b5e8d74c
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-ui/src/utils/displayValue.test.ts
View File

@@ -1,8 +1,8 @@
import { getDisplayProcessor, getColorFromThreshold, DisplayProcessor, DisplayValue } from './displayValue'; import { getDisplayProcessor, getColorFromThreshold, DisplayProcessor, DisplayValue } from './displayValue';
import { MappingType, ValueMapping } from '../types/panel'; import { MappingType, ValueMapping } from '../types/panel';
function assertSame(input: any, processorss: DisplayProcessor[], match: DisplayValue) { function assertSame(input: any, processors: DisplayProcessor[], match: DisplayValue) {
processorss.forEach(processor => { processors.forEach(processor => {
const value = processor(input); const value = processor(input);
expect(value.text).toEqual(match.text); expect(value.text).toEqual(match.text);
if (match.hasOwnProperty('numeric')) { if (match.hasOwnProperty('numeric')) {

4
public/app/plugins/panel/bargauge/module.tsx
View File

@@ -3,10 +3,10 @@ import { ReactPanelPlugin } from '@grafana/ui';
import { BarGaugePanel } from './BarGaugePanel'; import { BarGaugePanel } from './BarGaugePanel';
import { BarGaugePanelEditor } from './BarGaugePanelEditor'; import { BarGaugePanelEditor } from './BarGaugePanelEditor';
import { BarGaugeOptions, defaults } from './types'; import { BarGaugeOptions, defaults } from './types';
import { singleStatOptionsCheck } from '../singlestat2/module'; import { singleStatBaseOptionsCheck } from '../singlestat2/module';
export const reactPanel = new ReactPanelPlugin<BarGaugeOptions>(BarGaugePanel); export const reactPanel = new ReactPanelPlugin<BarGaugeOptions>(BarGaugePanel);
reactPanel.setEditor(BarGaugePanelEditor); reactPanel.setEditor(BarGaugePanelEditor);
reactPanel.setDefaults(defaults); reactPanel.setDefaults(defaults);
reactPanel.setPanelTypeChangedHook(singleStatOptionsCheck); reactPanel.setPanelTypeChangedHook(singleStatBaseOptionsCheck);

4
public/app/plugins/panel/gauge/module.tsx
View File

@@ -3,10 +3,10 @@ import { ReactPanelPlugin } from '@grafana/ui';
import { GaugePanelEditor } from './GaugePanelEditor'; import { GaugePanelEditor } from './GaugePanelEditor';
import { GaugePanel } from './GaugePanel'; import { GaugePanel } from './GaugePanel';
import { GaugeOptions, defaults } from './types'; import { GaugeOptions, defaults } from './types';
import { singleStatOptionsCheck } from '../singlestat2/module'; import { singleStatBaseOptionsCheck } from '../singlestat2/module';
export const reactPanel = new ReactPanelPlugin<GaugeOptions>(GaugePanel); export const reactPanel = new ReactPanelPlugin<GaugeOptions>(GaugePanel);
reactPanel.setEditor(GaugePanelEditor); reactPanel.setEditor(GaugePanelEditor);
reactPanel.setDefaults(defaults); reactPanel.setDefaults(defaults);
reactPanel.setPanelTypeChangedHook(singleStatOptionsCheck); reactPanel.setPanelTypeChangedHook(singleStatBaseOptionsCheck);

8
public/app/plugins/panel/singlestat2/module.tsx
View File

@@ -1,5 +1,5 @@
import { ReactPanelPlugin } from '@grafana/ui'; import { ReactPanelPlugin } from '@grafana/ui';
import { SingleStatOptions, defaults } from './types'; import { SingleStatOptions, defaults, SingleStatBaseOptions } from './types';
import { SingleStatPanel } from './SingleStatPanel'; import { SingleStatPanel } from './SingleStatPanel';
import cloneDeep from 'lodash/cloneDeep'; import cloneDeep from 'lodash/cloneDeep';
import { SingleStatEditor } from './SingleStatEditor'; import { SingleStatEditor } from './SingleStatEditor';
@@ -8,8 +8,8 @@ export const reactPanel = new ReactPanelPlugin<SingleStatOptions>(SingleStatPane
const optionsToKeep = ['valueOptions', 'stat', 'maxValue', 'maxValue', 'thresholds', 'valueMappings']; const optionsToKeep = ['valueOptions', 'stat', 'maxValue', 'maxValue', 'thresholds', 'valueMappings'];
export const singleStatOptionsCheck = ( export const singleStatBaseOptionsCheck = (
options: Partial<SingleStatOptions>, options: Partial<SingleStatBaseOptions>,
prevPluginId?: string, prevPluginId?: string,
prevOptions?: any prevOptions?: any
) => { ) => {
@@ -26,4 +26,4 @@ export const singleStatOptionsCheck = (
reactPanel.setEditor(SingleStatEditor); reactPanel.setEditor(SingleStatEditor);
reactPanel.setDefaults(defaults); reactPanel.setDefaults(defaults);
reactPanel.setPanelTypeChangedHook(singleStatOptionsCheck); reactPanel.setPanelTypeChangedHook(singleStatBaseOptionsCheck);