WIP/GraphNG: support soft min max axis

packages/grafana-ui/src/components/GraphNG/GraphNG.tsx

@@ -155,6 +155,8 @@ export const GraphNG: React.FC<GraphNGProps> = ({
           log: customConfig.scaleDistribution?.log,
           min: field.config.min,
           max: field.config.max,
+          softMin: customConfig.axisSoftMin,
+          softMax: customConfig.axisSoftMax,
         });
 
         builder.addAxis({

packages/grafana-ui/src/components/uPlot/config.ts

@@ -110,7 +110,9 @@ export interface ScaleDistributionConfig {
 export interface AxisConfig {
   axisPlacement?: AxisPlacement;
   axisLabel?: string;
-  axisWidth?: number; // pixels ideally auto?
+  axisWidth?: number;
+  axisSoftMin?: number;
+  axisSoftMax?: number;
   scaleDistribution?: ScaleDistributionConfig;
 }
 

packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts

@@ -9,18 +9,24 @@ export interface ScaleProps {
   max?: number | null;
   range?: () => number[]; // min/max
   distribution?: ScaleDistribution;
+  softMin?: number | null;
+  softMax?: number | null;
   log?: number;
 }
 
 export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
   merge(props: ScaleProps) {
     this.props.min = optMinMax('min', this.props.min, props.min);
     this.props.max = optMinMax('max', this.props.max, props.max);
+
+    // Soft varient
+    this.props.softMin = optMinMax('min', this.props.softMin, props.softMin);
+    this.props.softMax = optMinMax('max', this.props.softMax, props.softMax);
   }
 
   // uPlot range function
   range = (u: uPlot, dataMin: number, dataMax: number, scaleKey: string) => {
-    const { min, max } = this.props;
+    const { min, max, softMin, softMax } = this.props;
 
     const scale = u.scales[scaleKey];
 
@@ -33,6 +39,8 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
       [smin, smax] = uPlot.rangeLog(min ?? dataMin, max ?? dataMax, scale.log, true);
     }
 
+    console.log('TODO, use soft limits', softMin, softMax);
+
     return [min ?? smin, max ?? smax];
   };
 

public/app/plugins/panel/timeseries/config.ts

@@ -158,6 +158,22 @@ export function getGraphFieldConfig(cfg: GraphFieldConfig): SetFieldConfigOption
           },
           showIf: c => c.axisPlacement !== AxisPlacement.Hidden,
         })
+        .addNumberInput({
+          path: 'axisSoftMin',
+          name: 'Soft min',
+          category: ['Axis'],
+          settings: {
+            placeholder: 'See: Standard options > Min',
+          },
+        })
+        .addNumberInput({
+          path: 'axisSoftMax',
+          name: 'Soft max',
+          category: ['Axis'],
+          settings: {
+            placeholder: 'See: Standard options > Max',
+          },
+        })
         .addCustomEditor<void, ScaleDistributionConfig>({
           id: 'scaleDistribution',
           path: 'scaleDistribution',