From 9dc0c8be116401d351b904c8b6433c9e39db0b38 Mon Sep 17 00:00:00 2001 From: Leon Sorokin Date: Tue, 19 Sep 2023 15:43:15 -0500 Subject: [PATCH] TimeSeries: Rename axisShow -> axisBorderShow (#75127) Co-authored-by: Ryan McKinley --- .../feature-templating/templating-repeating-panels.json | 4 ++-- .../feature-templating/templating-repeating-rows.json | 2 +- .../kinds/composable/barchart/panelcfg/schema-reference.md | 4 ++-- .../composable/candlestick/panelcfg/schema-reference.md | 4 ++-- .../kinds/composable/heatmap/panelcfg/schema-reference.md | 4 ++-- .../kinds/composable/histogram/panelcfg/schema-reference.md | 4 ++-- .../composable/timeseries/panelcfg/schema-reference.md | 4 ++-- .../kinds/composable/trend/panelcfg/schema-reference.md | 4 ++-- .../kinds/composable/xychart/panelcfg/schema-reference.md | 6 +++--- packages/grafana-schema/src/common/common.gen.ts | 2 +- packages/grafana-schema/src/common/mudball.cue | 2 +- packages/grafana-ui/src/components/TimeSeries/utils.ts | 4 ++-- packages/grafana-ui/src/options/builder/axis.tsx | 2 +- .../serialization/testfiles/repeating_rows_and_panels.json | 2 +- public/app/plugins/panel/timeseries/config.ts | 2 +- public/app/plugins/panel/xychart/scatter.ts | 4 ++-- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/devenv/dev-dashboards/feature-templating/templating-repeating-panels.json b/devenv/dev-dashboards/feature-templating/templating-repeating-panels.json index bb6cae08253..2bea5930a49 100644 --- a/devenv/dev-dashboards/feature-templating/templating-repeating-panels.json +++ b/devenv/dev-dashboards/feature-templating/templating-repeating-panels.json @@ -56,7 +56,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisShow": false, + "axisBorderShow": false, "barAlignment": 0, "drawStyle": "line", "fillOpacity": 0, @@ -174,7 +174,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisShow": false, + "axisBorderShow": false, "barAlignment": 0, "drawStyle": "line", "fillOpacity": 25, diff --git a/devenv/dev-dashboards/feature-templating/templating-repeating-rows.json b/devenv/dev-dashboards/feature-templating/templating-repeating-rows.json index f8939497d93..11c9733abd8 100644 --- a/devenv/dev-dashboards/feature-templating/templating-repeating-rows.json +++ b/devenv/dev-dashboards/feature-templating/templating-repeating-rows.json @@ -83,7 +83,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisShow": false, + "axisBorderShow": false, "barAlignment": 0, "drawStyle": "line", "fillOpacity": 0, diff --git a/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md index 402d178c3f3..e07747b77e6 100644 --- a/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/barchart/panelcfg/schema-reference.md @@ -29,12 +29,12 @@ It extends [AxisConfig](#axisconfig) and [HideableFieldConfig](#hideablefieldcon | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -51,12 +51,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | diff --git a/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md index 47dd7796615..75fe334da43 100644 --- a/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/candlestick/panelcfg/schema-reference.md @@ -54,12 +54,12 @@ It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsCo | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -92,12 +92,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | diff --git a/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md index 655aaa6ddc9..89412c56f27 100644 --- a/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/heatmap/panelcfg/schema-reference.md @@ -179,12 +179,12 @@ It extends [AxisConfig](#axisconfig). | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -201,12 +201,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | diff --git a/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md index 8698db12d2b..f3f0efe9234 100644 --- a/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/histogram/panelcfg/schema-reference.md @@ -29,12 +29,12 @@ It extends [AxisConfig](#axisconfig) and [HideableFieldConfig](#hideablefieldcon | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -50,12 +50,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | diff --git a/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md index cf668d7bf93..06347e81826 100644 --- a/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/timeseries/panelcfg/schema-reference.md @@ -31,12 +31,12 @@ It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsCo | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -69,12 +69,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | diff --git a/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md index 9dc180ae52b..73ec1cfc49c 100644 --- a/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/trend/panelcfg/schema-reference.md @@ -31,12 +31,12 @@ It extends [LineConfig](#lineconfig) and [FillConfig](#fillconfig) and [PointsCo | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -69,12 +69,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | diff --git a/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md index 58fb6b43152..9134117d461 100644 --- a/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md +++ b/docs/sources/developers/kinds/composable/xychart/panelcfg/schema-reference.md @@ -33,12 +33,12 @@ It extends [HideableFieldConfig](#hideablefieldconfig) and [AxisConfig](#axiscon | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisColorMode` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisLabel` | string | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisPlacement` | string | No | | *(Inherited from [AxisConfig](#axisconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | | `axisWidth` | number | No | | *(Inherited from [AxisConfig](#axisconfig))* | @@ -59,12 +59,12 @@ TODO docs | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | | | `axisCenteredZero` | boolean | No | | | | `axisColorMode` | string | No | | TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | | | `axisLabel` | string | No | | | | `axisPlacement` | string | No | | TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | | | `axisSoftMax` | number | No | | | | `axisSoftMin` | number | No | | | | `axisWidth` | number | No | | | @@ -203,12 +203,12 @@ It extends [FieldConfig](#fieldconfig). | Property | Type | Required | Default | Description | |---------------------|-----------------------------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------| +| `axisBorderShow` | boolean | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisCenteredZero` | boolean | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisColorMode` | string | No | | *(Inherited from [FieldConfig](#fieldconfig))*
TODO docs
Possible values are: `text`, `series`. | | `axisGridShow` | boolean | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisLabel` | string | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisPlacement` | string | No | | *(Inherited from [FieldConfig](#fieldconfig))*
TODO docs
Possible values are: `auto`, `top`, `right`, `bottom`, `left`, `hidden`. | -| `axisShow` | boolean | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisSoftMax` | number | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisSoftMin` | number | No | | *(Inherited from [FieldConfig](#fieldconfig))* | | `axisWidth` | number | No | | *(Inherited from [FieldConfig](#fieldconfig))* | diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts index 29ffda7e48e..4545daca2b7 100644 --- a/packages/grafana-schema/src/common/common.gen.ts +++ b/packages/grafana-schema/src/common/common.gen.ts @@ -353,12 +353,12 @@ export interface ScaleDistributionConfig { * TODO docs */ export interface AxisConfig { + axisBorderShow?: boolean; axisCenteredZero?: boolean; axisColorMode?: AxisColorMode; axisGridShow?: boolean; axisLabel?: string; axisPlacement?: AxisPlacement; - axisShow?: boolean; axisSoftMax?: number; axisSoftMin?: number; axisWidth?: number; diff --git a/packages/grafana-schema/src/common/mudball.cue b/packages/grafana-schema/src/common/mudball.cue index 4514929aeaa..3faecdc7cdc 100644 --- a/packages/grafana-schema/src/common/mudball.cue +++ b/packages/grafana-schema/src/common/mudball.cue @@ -95,7 +95,7 @@ AxisConfig: { axisGridShow?: bool scaleDistribution?: ScaleDistributionConfig axisCenteredZero?: bool - axisShow?: bool + axisBorderShow?: bool } @cuetsy(kind="interface") // TODO docs diff --git a/packages/grafana-ui/src/components/TimeSeries/utils.ts b/packages/grafana-ui/src/components/TimeSeries/utils.ts index b41d5b14762..bcb779194d7 100644 --- a/packages/grafana-ui/src/components/TimeSeries/utils.ts +++ b/packages/grafana-ui/src/components/TimeSeries/utils.ts @@ -296,12 +296,12 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{ const axisDisplayOptions = { border: { - show: customConfig.axisShow || false, + show: customConfig.axisBorderShow || false, width: 1, stroke: axisColor || theme.colors.text.primary, }, ticks: { - show: customConfig.axisShow || false, + show: customConfig.axisBorderShow || false, stroke: axisColor || theme.colors.text.primary, }, color: axisColor || theme.colors.text.primary, diff --git a/packages/grafana-ui/src/options/builder/axis.tsx b/packages/grafana-ui/src/options/builder/axis.tsx index 40f355ea12a..cf2b90aca21 100644 --- a/packages/grafana-ui/src/options/builder/axis.tsx +++ b/packages/grafana-ui/src/options/builder/axis.tsx @@ -81,7 +81,7 @@ export function addAxisConfig( showIf: (c) => c.axisPlacement !== AxisPlacement.Hidden, }) .addBooleanSwitch({ - path: 'axisShow', // TODO: rename to axisBorderShow + path: 'axisBorderShow', name: 'Show border', category, defaultValue: false, diff --git a/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json b/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json index 555e7b80bd1..66970624419 100644 --- a/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json +++ b/public/app/features/dashboard-scene/serialization/testfiles/repeating_rows_and_panels.json @@ -83,7 +83,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisShow": false, + "axisBorderShow": false, "barAlignment": 0, "drawStyle": "line", "fillOpacity": 0, diff --git a/public/app/plugins/panel/timeseries/config.ts b/public/app/plugins/panel/timeseries/config.ts index f18ae591639..a68b4572874 100644 --- a/public/app/plugins/panel/timeseries/config.ts +++ b/public/app/plugins/panel/timeseries/config.ts @@ -38,7 +38,7 @@ export const defaultGraphConfig: GraphFieldConfig = { }, axisGridShow: true, axisCenteredZero: false, - axisShow: false, + axisBorderShow: false, }; const categoryStyles = ['Graph styles']; diff --git a/public/app/plugins/panel/xychart/scatter.ts b/public/app/plugins/panel/xychart/scatter.ts index 848b97d4646..f112be980e8 100644 --- a/public/app/plugins/panel/xychart/scatter.ts +++ b/public/app/plugins/panel/xychart/scatter.ts @@ -623,7 +623,7 @@ const prepConfig = ( placement: customConfig?.axisPlacement !== AxisPlacement.Hidden ? AxisPlacement.Bottom : AxisPlacement.Hidden, show: customConfig?.axisPlacement !== AxisPlacement.Hidden, grid: { show: customConfig?.axisGridShow }, - border: { show: customConfig?.axisShow }, + border: { show: customConfig?.axisBorderShow }, theme, label: xAxisLabel == null || xAxisLabel === '' @@ -670,7 +670,7 @@ const prepConfig = ( placement: customConfig?.axisPlacement === AxisPlacement.Auto ? AxisPlacement.Left : customConfig?.axisPlacement, show: customConfig?.axisPlacement !== AxisPlacement.Hidden, grid: { show: customConfig?.axisGridShow }, - border: { show: customConfig?.axisShow }, + border: { show: customConfig?.axisBorderShow }, size: customConfig?.axisWidth, label: yAxisLabel == null || yAxisLabel === ''