Merge pull request #56 from briangann/20200418_refactor

refactor
briangann · Apr 18, 2020 · dca6eb4 · dca6eb4
2 parents ebda243 + 6956ae0
commit dca6eb4
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 122 deletions.
diff --git a/src/ctrl.ts b/src/ctrl.ts
@@ -5,130 +5,9 @@ import kbn from 'grafana/app/core/utils/kbn';
 import TimeSeries from 'grafana/app/core/time_series2';
 import * as d3 from 'd3';
 
-// @ts-ignore
+import { panelDefaults } from './defaults';
 import { DrawGauge } from './libs/d3gauge';
 
-const panelDefaults = {
-  fontSizes: [
-    4,
-    5,
-    6,
-    7,
-    8,
-    9,
-    10,
-    11,
-    12,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    22,
-    24,
-    26,
-    28,
-    30,
-    32,
-    34,
-    36,
-    38,
-    40,
-    42,
-    44,
-    46,
-    48,
-    50,
-    52,
-    54,
-    56,
-    58,
-    60,
-    62,
-    64,
-    66,
-    68,
-    70,
-  ],
-  fontTypes: [
-    'Arial',
-    'Avant Garde',
-    'Bookman',
-    'Consolas',
-    'Courier',
-    'Courier New',
-    'Garamond',
-    'Helvetica',
-    'Open Sans',
-    'Palatino',
-    'Times',
-    'Times New Roman',
-    'Verdana',
-  ],
-  unitFormats: kbn.getUnitFormats(),
-  operatorNameOptions: ['min', 'max', 'avg', 'current', 'total', 'name'],
-  valueMaps: [{ value: 'null', op: '=', text: 'N/A' }],
-  mappingTypes: [
-    { name: 'value to text', value: 1 },
-    { name: 'range to text', value: 2 },
-  ],
-  rangeMaps: [{ from: 'null', to: 'null', text: 'N/A' }],
-  tickMaps: [],
-  mappingType: 1,
-  thresholds: '',
-  colors: ['rgba(245, 54, 54, 0.9)', 'rgba(237, 129, 40, 0.89)', 'rgba(50, 172, 45, 0.97)'],
-  decimals: 2, // decimal precision
-  format: 'none', // unit format
-  operatorName: 'avg', // operator applied to time series
-  gauge: {
-    minValue: 0,
-    maxValue: 100,
-    tickSpaceMinVal: 1,
-    tickSpaceMajVal: 10,
-    gaugeUnits: '', // no units by default, this will be selected by user
-    gaugeRadius: 0, // 0 for auto-scale
-    pivotRadius: 0.1,
-    padding: 0.05,
-    edgeWidth: 0.05,
-    tickEdgeGap: 0.05,
-    tickLengthMaj: 0.15,
-    tickLengthMin: 0.05,
-    needleTickGap: 0.05,
-    needleLengthNeg: 0.2,
-    ticknessGaugeBasis: 200,
-    needleWidth: 5,
-    tickWidthMaj: 5,
-    tickWidthMin: 1,
-    unitsLabelFontSize: 22,
-    labelFontSize: 18,
-    zeroTickAngle: 60,
-    maxTickAngle: 300,
-    zeroNeedleAngle: 40,
-    maxNeedleAngle: 320,
-    outerEdgeCol: '#0099CC',
-    innerCol: '#fff',
-    pivotCol: '#999',
-    needleCol: '#0099CC',
-    unitsLabelCol: '#000',
-    tickLabelCol: '#000',
-    tickColMaj: '#0099CC',
-    tickColMin: '#000',
-    tickFont: 'Open Sans',
-    unitsFont: 'Open Sans',
-    valueYOffset: 0,
-    showThresholdOnGauge: false,
-    showThresholdColorOnValue: false,
-    showLowerThresholdRange: false,
-    showMiddleThresholdRange: true,
-    showUpperThresholdRange: true,
-    animateNeedleValueTransition: true,
-    animateNeedleValueTransitionSpeed: 100,
-  },
-};
-
 export class D3GaugePanelCtrl extends MetricsPanelCtrl {
   static templateUrl = 'partials/template.html';
 

diff --git a/src/defaults.ts b/src/defaults.ts
@@ -0,0 +1,122 @@
+import kbn from 'grafana/app/core/utils/kbn';
+
+export const panelDefaults = {
+  fontSizes: [
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14,
+    15,
+    16,
+    17,
+    18,
+    19,
+    20,
+    22,
+    24,
+    26,
+    28,
+    30,
+    32,
+    34,
+    36,
+    38,
+    40,
+    42,
+    44,
+    46,
+    48,
+    50,
+    52,
+    54,
+    56,
+    58,
+    60,
+    62,
+    64,
+    66,
+    68,
+    70,
+  ],
+  fontTypes: [
+    'Arial',
+    'Avant Garde',
+    'Bookman',
+    'Consolas',
+    'Courier',
+    'Courier New',
+    'Garamond',
+    'Helvetica',
+    'Open Sans',
+    'Palatino',
+    'Times',
+    'Times New Roman',
+    'Verdana',
+  ],
+  unitFormats: kbn.getUnitFormats(),
+  operatorNameOptions: ['min', 'max', 'avg', 'current', 'total', 'name'],
+  valueMaps: [{ value: 'null', op: '=', text: 'N/A' }],
+  mappingTypes: [
+    { name: 'value to text', value: 1 },
+    { name: 'range to text', value: 2 },
+  ],
+  rangeMaps: [{ from: 'null', to: 'null', text: 'N/A' }],
+  tickMaps: [],
+  mappingType: 1,
+  thresholds: '',
+  colors: ['rgba(245, 54, 54, 0.9)', 'rgba(237, 129, 40, 0.89)', 'rgba(50, 172, 45, 0.97)'],
+  decimals: 2, // decimal precision
+  format: 'none', // unit format
+  operatorName: 'avg', // operator applied to time series
+  gauge: {
+    minValue: 0,
+    maxValue: 100,
+    tickSpaceMinVal: 1,
+    tickSpaceMajVal: 10,
+    gaugeUnits: '', // no units by default, this will be selected by user
+    gaugeRadius: 0, // 0 for auto-scale
+    pivotRadius: 0.1,
+    padding: 0.05,
+    edgeWidth: 0.05,
+    tickEdgeGap: 0.05,
+    tickLengthMaj: 0.15,
+    tickLengthMin: 0.05,
+    needleTickGap: 0.05,
+    needleLengthNeg: 0.2,
+    ticknessGaugeBasis: 200,
+    needleWidth: 5,
+    tickWidthMaj: 5,
+    tickWidthMin: 1,
+    unitsLabelFontSize: 22,
+    labelFontSize: 18,
+    zeroTickAngle: 60,
+    maxTickAngle: 300,
+    zeroNeedleAngle: 40,
+    maxNeedleAngle: 320,
+    outerEdgeCol: '#0099CC',
+    innerCol: '#fff',
+    pivotCol: '#999',
+    needleCol: '#0099CC',
+    unitsLabelCol: '#000',
+    tickLabelCol: '#000',
+    tickColMaj: '#0099CC',
+    tickColMin: '#000',
+    tickFont: 'Open Sans',
+    unitsFont: 'Open Sans',
+    valueYOffset: 0,
+    showThresholdOnGauge: false,
+    showThresholdColorOnValue: false,
+    showLowerThresholdRange: false,
+    showMiddleThresholdRange: true,
+    showUpperThresholdRange: true,
+    animateNeedleValueTransition: true,
+    animateNeedleValueTransitionSpeed: 100,
+  },
+};