clean up

Author: KatrinaTurner

src/EsnetMatrix.tsx

@@ -8,10 +8,15 @@ import { useTheme2, CustomScrollbar } from '@grafana/ui';
 import * as Matrix from './matrix.js';
 // import * as Legend from 'matrixLegend.js';
 
-interface Props extends PanelProps<MatrixOptions> {}
+interface Props extends PanelProps<MatrixOptions> {
+  fieldConfig: any;
+  options: MatrixOptions;
+}
 
 export const EsnetMatrix: React.FC<Props> = ({ options, data, width, height, id }) => {
+  // console.log(data);
   const theme = useTheme2();
+  console.log(options);
   const parsedData = parseData(data, options, theme);
   try {
     if (parsedData.data === 'too many inputs') {

src/dataParser.ts

@@ -38,6 +38,7 @@ export function parseData(data: { series: any[] }, options: any, theme: any) {
   if (!targetKey) {
     targetKey = 1;
   }
+
   // assign valueField to the specified field or use the first number field by default
   const val = options.valueField;
   const valueField = val
@@ -105,6 +106,7 @@ export function parseData(data: { series: any[] }, options: any, theme: any) {
 
   ////////////////////////////
 
+  // console.log(options);
   // create data matrix
   let dataMatrix: any[][] = [];
   for (let i = 0; i < rowNames.length; i++) {
@@ -128,9 +130,10 @@ export function parseData(data: { series: any[] }, options: any, theme: any) {
   // parse data for legend
   let legendData: any[] = [];
   if (options.showLegend) {
+    
     // let allVals = frame.fields[valKey].values;
     let tempValues: any[] = [];
-    if (options.legendType == 'range') { 
+    if (options.legendType === 'range') { 
       //get min & max, steps
       let allValues: number[] = Object.values(frame.fields[valKey].values);
       let thisMin = Math.min(...allValues);
@@ -160,8 +163,8 @@ export function parseData(data: { series: any[] }, options: any, theme: any) {
         });
     });
   }
-  console.log(legendData);
+  // console.log(legendData);
 
-  var dataObject = { rows: rowNames, columns: colNames, data: dataMatrix, legend: legendData };
+  let dataObject = { rows: rowNames, columns: colNames, data: dataMatrix, legend: legendData };
   return dataObject;
 }

src/matrix.js

@@ -24,6 +24,7 @@ function createViz(elem, id, height, rowNames, colNames, matrix, options, theme,
     urlVar1 = options.urlVar1,
     urlVar2 = options.urlVar2,
     defaultColor = theme.visualization.getColorByName(options.defaultColor);
+
   // urlOther = options.urlOther,
   // urlOtherText = options.urlOtherText;
 
@@ -250,6 +251,7 @@ function createViz(elem, id, height, rowNames, colNames, matrix, options, theme,
       .append('svg')
       .attr('id', legendClass);
 
+////////////// range - bar //////////////////////
     if (options.legendType == 'range') {
       var svg = d3.select(`#${legendClass}`);
       svg
@@ -287,7 +289,7 @@ function createViz(elem, id, height, rowNames, colNames, matrix, options, theme,
         })
         .attr('fill', theme.colors.text.primary);
     } else {
-      // categorical
+/////////// categorical - circles ////////////////////////////
       var svg = d3.select(`#${legendClass}`);
       svg
         .append('g')

src/module.ts

@@ -1,7 +1,8 @@
 import { FieldOverrideContext, getFieldDisplayName, PanelPlugin, FieldConfigProperty } from '@grafana/data';
-import { standardOptionsCompat } from 'grafana-plugin-support';
+// import { standardOptionsCompat } from 'grafana-plugin-support';
 import { MatrixOptions } from './types';
 import { EsnetMatrix } from './EsnetMatrix';
+// import { FieldConfig } from './panelcfg.gen';
 
 /**
  * Grafana panel plugin main module
@@ -20,15 +21,28 @@ const urlBool = (addUrl: boolean) => (config: MatrixOptions) => config.addUrl ==
 const staticBool = (inputList: boolean) => (config: MatrixOptions) => config.inputList === inputList;
 const legendBool = (showLegend: boolean) => (config: MatrixOptions) => config.showLegend === showLegend;
 
-const buildStandardOptions = (): any => {
-  const options = [FieldConfigProperty.Unit, FieldConfigProperty.Color, FieldConfigProperty.Thresholds];
-  return standardOptionsCompat(options);
-};
+// const buildStandardOptions = (): any => {
+//   const options = [FieldConfigProperty.Unit, FieldConfigProperty.Color, FieldConfigProperty.Thresholds];
+//   return standardOptionsCompat(options);
+// };
 
 export const plugin = new PanelPlugin<MatrixOptions>(EsnetMatrix);
+
 plugin.useFieldConfig({
-  standardOptions: buildStandardOptions(),
+  standardOptions: {
+    [FieldConfigProperty.Thresholds]: {},
+    [FieldConfigProperty.Color]: {
+      settings: {
+        preferThresholdMode: true,
+      }
+    }
+  },
+  disableStandardOptions: [
+    FieldConfigProperty.NoValue,
+    FieldConfigProperty.Links,
+  ]
 });
+
 plugin.setPanelOptions((builder) => {
   /////////--------- Row and Column options ---------////////////////
   builder.addBooleanSwitch({
@@ -283,5 +297,3 @@ plugin.setPanelOptions((builder) => {
   //   showIf: urlOtherBool(true),
   // });
 });
-
-// .useFieldConfig({});

src/types.ts

@@ -22,4 +22,5 @@ export interface MatrixOptions {
   staticColumns: string[];
   showLegend: boolean;
   legendType: string;
+  thresholds: any[];
 }