Check that variable isnt null when initializing ds reference

2025-12-31 09:59:55 +01:00
48 changed files with 273 additions and 590 deletions
@@ -501,6 +501,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/filter-annotations.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/frontend-sandbox-app.spec.ts @grafana/plugins-platform-frontend
 /e2e-playwright/various-suite/frontend-sandbox-datasource.spec.ts @grafana/plugins-platform-frontend
+/e2e-playwright/various-suite/gauge.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/grafana-datasource-random-walk.spec.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/graph-auto-migrate.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/inspect-drawer.spec.ts @grafana/dashboards-squad
@@ -180,15 +180,12 @@ func countAnnotationsV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if annotationList, ok := annotations["list"].([]interface{}); ok {
-		return len(annotationList)
-	}
-	if annotationList, ok := annotations["list"].([]map[string]interface{}); ok {
-		return len(annotationList)
+	annotationList, ok := annotations["list"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(annotationList)
 }

 // countLinksV0V1 counts dashboard links in v0alpha1 or v1beta1 dashboard spec
@@ -197,15 +194,12 @@ func countLinksV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if links, ok := spec["links"].([]interface{}); ok {
-		return len(links)
-	}
-	if links, ok := spec["links"].([]map[string]interface{}); ok {
-		return len(links)
+	links, ok := spec["links"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(links)
 }

 // countVariablesV0V1 counts template variables in v0alpha1 or v1beta1 dashboard spec
@@ -219,15 +213,12 @@ func countVariablesV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if variableList, ok := templating["list"].([]interface{}); ok {
-		return len(variableList)
-	}
-	if variableList, ok := templating["list"].([]map[string]interface{}); ok {
-		return len(variableList)
+	variableList, ok := templating["list"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(variableList)
 }

 // collectStatsV0V1 collects statistics from v0alpha1 or v1beta1 dashboard
@@ -628,20 +628,6 @@
        }
      ],
      "title": "Only nulls and no user set min \u0026 max",
-      "transformations": [
-        {
-          "id": "convertFieldType",
-          "options":  {
-            "conversions": [
-              {
-                "destinationType": "number",
-                "targetField": "A-series"
-              }
-            ],
-            "fields": {}
-          }
-        }
-      ],
      "type": "gauge"
    },
    {
@@ -1193,4 +1179,4 @@
  "title": "Panel Tests - Gauge",
  "uid": "_5rDmaQiz",
  "weekStart": ""
-}
+}
@@ -1760,22 +1760,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active gateways",
      "type": "radialbar"
    },
@@ -1859,22 +1843,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active pods",
      "type": "radialbar"
    },
@@ -485,7 +485,6 @@
      },
      "id": 12,
      "options": {
-        "displayName": "My gauge",
        "minVizHeight": 75,
        "minVizWidth": 75,
        "orientation": "auto",
@@ -600,20 +600,6 @@
          "stringInput": "null,null"
        }
      ],
-      "transformations": [
-        {
-          "id": "convertFieldType",
-          "options": {
-            "fields": {},
-            "conversions": [
-              {
-                "targetField": "A-series",
-                "destinationType": "number"
-              }
-            ]
-          }
-        }
-      ],
      "title": "Only nulls and no user set min & max",
      "type": "gauge"
    },
@@ -1718,22 +1718,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active gateways",
      "type": "radialbar"
    },
@@ -1815,22 +1799,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active pods",
      "type": "radialbar"
    },
@@ -474,7 +474,6 @@
      },
      "id": 12,
      "options": {
-        "displayName": "My gauge",
        "minVizHeight": 75,
        "minVizWidth": 75,
        "orientation": "auto",
@@ -36,7 +36,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `awsAsyncQueryCaching`                | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled                            | Yes                |
 | `dashgpt`                             | Enable AI powered features in dashboards                                                                                                                      | Yes                |
 | `kubernetesDashboards`                | Use the kubernetes API in the frontend for dashboards                                                                                                         | Yes                |
-| `cloudWatchBatchQueries`              | Runs CloudWatch metrics queries as separate batches                                                                                                           | Yes                |
 | `annotationPermissionUpdate`          | Change the way annotation permissions work by scoping them to folders and dashboards.                                                                         | Yes                |
 | `dashboardSceneForViewers`            | Enables dashboard rendering using Scenes for viewer roles                                                                                                     | Yes                |
 | `dashboardSceneSolo`                  | Enables rendering dashboards using scenes for solo panels                                                                                                     | Yes                |
@@ -84,6 +83,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `enableDatagridEditing`           | Enables the edit functionality in the datagrid panel                                                   |
 | `reportingRetries`                | Enables rendering retries for the reporting feature                                                    |
 | `externalServiceAccounts`         | Automatic service account and token setup for plugins                                                  |
+| `cloudWatchBatchQueries`          | Runs CloudWatch metrics queries as separate batches                                                    |
 | `pdfTables`                       | Enables generating table data as PDF in reporting                                                      |
 | `canvasPanelPanZoom`              | Allow pan and zoom in canvas panel                                                                     |
 | `alertingSaveStateCompressed`     | Enables the compressed protobuf-based alert state storage. Default is enabled.                         |
@@ -1,101 +0,0 @@
-import { test, expect } from '@grafana/plugin-e2e';
-
-// this test requires a larger viewport so all gauge panels load properly
-test.use({
-  featureToggles: { newGauge: true },
-  viewport: { width: 1280, height: 3000 },
-});
-
-const OLD_GAUGES_DASHBOARD_UID = '_5rDmaQiz';
-const NEW_GAUGES_DASHBOARD_UID = 'panel-tests-gauge-new';
-
-test.describe(
-  'Gauge Panel',
-  {
-    tag: ['@panels', '@gauge'],
-  },
-  () => {
-    test('successfully migrates all gauge panels', async ({ gotoDashboardPage, selectors }) => {
-      const dashboardPage = await gotoDashboardPage({ uid: OLD_GAUGES_DASHBOARD_UID });
-
-      // check that gauges are rendered
-      const gaugeElements = dashboardPage.getByGrafanaSelector(
-        selectors.components.Panels.Visualization.Gauge.Container
-      );
-      await expect(gaugeElements).toHaveCount(16);
-
-      // check that no panel errors exist
-      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
-      await expect(errorInfo).toBeHidden();
-    });
-
-    test('renders new gauge panels', async ({ gotoDashboardPage, selectors }) => {
-      // open Panel Tests - Gauge
-      const dashboardPage = await gotoDashboardPage({ uid: NEW_GAUGES_DASHBOARD_UID });
-
-      // check that gauges are rendered
-      const gaugeElements = dashboardPage.getByGrafanaSelector(
-        selectors.components.Panels.Visualization.Gauge.Container
-      );
-      await expect(gaugeElements).toHaveCount(32);
-
-      // check that no panel errors exist
-      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
-      await expect(errorInfo).toBeHidden();
-    });
-
-    test('renders sparklines in gauge panels', async ({ gotoDashboardPage, page }) => {
-      await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '11' }),
-      });
-
-      await expect(page.locator('.uplot')).toHaveCount(5);
-    });
-
-    test('"no data"', async ({ gotoDashboardPage, selectors }) => {
-      const dashboardPage = await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '36' }),
-      });
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the gauge does not appear'
-      ).toBeHidden();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage),
-        'that the empty text appears'
-      ).toHaveText('No data');
-
-      // update the "No value" option and see if the panel updates
-      const noValueOption = dashboardPage
-        .getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Standard options No value'))
-        .locator('input');
-
-      await noValueOption.fill('My empty value');
-      await noValueOption.blur();
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the empty text shows up in an empty gauge'
-      ).toHaveText('My empty value');
-
-      // test the "no numeric fields" message on the next panel
-      const dashboardPage2 = await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '37' }),
-      });
-
-      await expect(
-        dashboardPage2.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the gauge does not appear'
-      ).toBeHidden();
-
-      await expect(
-        dashboardPage2.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage),
-        'that the empty text appears'
-      ).toHaveText('Data is missing a number field');
-    });
-  }
-);
@@ -0,0 +1,27 @@
+import { test, expect } from '@grafana/plugin-e2e';
+
+// this test requires a larger viewport so all gauge panels load properly
+test.use({
+  viewport: { width: 1280, height: 1080 },
+});
+
+test.describe(
+  'Gauge Panel',
+  {
+    tag: ['@various'],
+  },
+  () => {
+    test('Gauge rendering e2e tests', async ({ gotoDashboardPage, selectors, page }) => {
+      // open Panel Tests - Gauge
+      const dashboardPage = await gotoDashboardPage({ uid: '_5rDmaQiz' });
+
+      // check that gauges are rendered
+      const gaugeElements = page.locator('.flot-base');
+      await expect(gaugeElements).toHaveCount(16);
+
+      // check that no panel errors exist
+      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
+      await expect(errorInfo).toBeHidden();
+    });
+  }
+);
@@ -305,7 +305,6 @@ export interface FeatureToggles {
  queryServiceFromUI?: boolean;
  /**
  * Runs CloudWatch metrics queries as separate batches
-  * @default true
  */
  cloudWatchBatchQueries?: boolean;
  /**
@@ -535,11 +535,6 @@ export const versionedComponents = {
          '12.3.0': 'data-testid viz-tooltip-wrapper',
        },
      },
-      Gauge: {
-        Container: {
-          '12.4.0': 'data-testid gauge container',
-        },
-      },
    },
  },
  VizLegend: {
@@ -35,7 +35,6 @@ export interface Options extends common.SingleStatBaseOptions {
  showThresholdLabels: boolean;
  showThresholdMarkers: boolean;
  sparkline?: boolean;
-  textMode?: ('auto' | 'value_and_name' | 'value' | 'name' | 'none');
 }

 export const defaultOptions: Partial<Options> = {
@@ -49,5 +48,4 @@ export const defaultOptions: Partial<Options> = {
  showThresholdLabels: false,
  showThresholdMarkers: true,
  sparkline: true,
-  textMode: 'auto',
 };
@@ -248,17 +248,15 @@ export function PanelChrome({

  const onContentPointerDown = React.useCallback(
    (evt: React.PointerEvent) => {
-      // When selected, ignore clicks inside buttons, links, canvas and svg elments
+      // Ignore clicks inside buttons, links, canvas and svg elments
      // This does prevent a clicks inside a graphs from selecting panel as there is normal div above the canvas element that intercepts the click
-      if (isSelected && evt.target instanceof Element && evt.target.closest('button,a,canvas,svg')) {
-        // Stop propagation otherwise row config editor will get selected
-        evt.stopPropagation();
+      if (evt.target instanceof Element && evt.target.closest('button,a,canvas,svg')) {
        return;
      }

      onSelect?.(evt);
    },
-    [isSelected, onSelect]
+    [onSelect]
  );

  const headerContent = (
@@ -32,6 +32,24 @@ const meta: Meta<StoryProps> = {
    controls: {
      exclude: ['theme', 'values', 'vizCount'],
    },
+    a11y: {
+      config: {
+        rules: [
+          {
+            id: 'scrollable-region-focusable',
+            selector: 'body',
+            enabled: false,
+          },
+          // NOTE: this is necessary due to a false positive with the filered svg glow in one of the examples.
+          // The color-contrast in this component should be accessible!
+          {
+            id: 'color-contrast',
+            selector: 'text',
+            enabled: false,
+          },
+        ],
+      },
+    },
  },
  args: {
    barWidthFactor: 0.2,
@@ -2,7 +2,6 @@ import { css, cx } from '@emotion/css';
 import { useId } from 'react';

 import { DisplayValueAlignmentFactors, FALLBACK_COLOR, FieldDisplay, GrafanaTheme2, TimeRange } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';

 import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
@@ -276,11 +275,7 @@ export function RadialGauge(props: RadialGaugeProps) {
  }

  return (
-    <div
-      data-testid={selectors.components.Panels.Visualization.Gauge.Container}
-      className={styles.vizWrapper}
-      style={{ width, height }}
-    >
+    <div className={styles.vizWrapper} style={{ width, height }}>
      {body}
    </div>
  );
@@ -1,4 +1,4 @@
-import { colorManipulator, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';

 import { RadialGaugeDimensions } from './types';

@@ -25,14 +25,13 @@ export function GlowGradient({ id, barWidth }: GlowGradientProps) {
  );
 }

-const CENTER_GLOW_OPACITY = 0.25;
+const CENTER_GLOW_OPACITY = 0.15;

 export function CenterGlowGradient({ gaugeId, color }: { gaugeId: string; color: string }) {
-  const transparentColor = colorManipulator.alpha(color, CENTER_GLOW_OPACITY);
  return (
    <radialGradient id={`circle-glow-${gaugeId}`} r="50%" fr="0%">
-      <stop offset="0%" stopColor={transparentColor} />
-      <stop offset="90%" stopColor={'#ffffff00'} />
+      <stop offset="0%" stopColor={color} stopOpacity={CENTER_GLOW_OPACITY} />
+      <stop offset="90%" stopColor={color} stopOpacity={0} />
    </radialGradient>
  );
 }
@@ -45,14 +44,13 @@ export interface CenterGlowProps {

 export function MiddleCircleGlow({ dimensions, gaugeId, color }: CenterGlowProps) {
  const gradientId = `circle-glow-${gaugeId}`;
-  const transparentColor = color ? colorManipulator.alpha(color, CENTER_GLOW_OPACITY) : color;

  return (
    <>
      <defs>
        <radialGradient id={gradientId} r="50%" fr="0%">
-          <stop offset="0%" stopColor={transparentColor} />
-          <stop offset="90%" stopColor="#ffffff00" />
+          <stop offset="0%" stopColor={color} stopOpacity={CENTER_GLOW_OPACITY} />
+          <stop offset="90%" stopColor={color} stopOpacity={0} />
        </radialGradient>
      </defs>
      <g>
@@ -88,9 +86,9 @@ export function SpotlightGradient({

  return (
    <linearGradient x1={x1} y1={y1} x2={x2} y2={y2} id={id} gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stopColor="#ffffff00" />
-      <stop offset="95%" stopColor="#ffffff88" />
-      {roundedBars && <stop offset="100%" stopColor={roundedBars ? '#ffffffbb' : 'white'} />}
+      <stop offset="0%" stopColor={'white'} stopOpacity={0.0} />
+      <stop offset="95%" stopColor={'white'} stopOpacity={0.5} />
+      {roundedBars && <stop offset="100%" stopColor={'white'} stopOpacity={roundedBars ? 0.7 : 1} />}
    </linearGradient>
  );
 }
@@ -17,9 +17,8 @@ export interface SparklineProps extends Themeable2 {
  showHighlights?: boolean;
 }

-export const Sparkline: React.FC<SparklineProps> = memo((props) => {
+export const SparklineFn: React.FC<SparklineProps> = memo((props) => {
  const { sparkline, config: fieldConfig, theme, width, height, showHighlights } = props;
-
  const { frame: alignedDataFrame, warning } = prepareSeries(sparkline, theme, fieldConfig, showHighlights);
  if (warning) {
    return null;
@@ -31,4 +30,14 @@ export const Sparkline: React.FC<SparklineProps> = memo((props) => {
  return <UPlotChart data={data} config={configBuilder} width={width} height={height} />;
 });

-Sparkline.displayName = 'Sparkline';
+SparklineFn.displayName = 'Sparkline';
+
+// we converted to function component above, but some apps extend Sparkline, so we need
+// to keep exporting a class component until those apps are all rolled out.
+// see https://github.com/grafana/app-observability-plugin/pull/2079
+// eslint-disable-next-line react-prefer-function-component/react-prefer-function-component
+export class Sparkline extends React.PureComponent<SparklineProps> {
+  render() {
+    return <SparklineFn {...this.props} />;
+  }
+}
@@ -167,8 +167,7 @@ export class VizRepeater<V, D = {}> extends PureComponent<PropsWithDefaults<V, D

    const repeaterStyle: React.CSSProperties = {
      display: 'flex',
-      overflowX: `${minVizWidth ? 'auto' : 'hidden'}`,
-      overflowY: `${minVizHeight ? 'auto' : 'hidden'}`,
+      overflow: `${minVizWidth ? 'auto' : 'hidden'} ${minVizHeight ? 'auto' : 'hidden'}`,
    };

    let vizHeight = height;
@@ -490,9 +490,8 @@ var (
 		{
 			Name:        "cloudWatchBatchQueries",
 			Description: "Runs CloudWatch metrics queries as separate batches",
-			Stage:       FeatureStageGeneralAvailability,
+			Stage:       FeatureStagePublicPreview,
 			Owner:       awsDatasourcesSquad,
-			Expression:  "true",
 		},
 		{
 			Name:         "cachingOptimizeSerializationMemoryUsage",
@@ -67,7 +67,7 @@ queryService,experimental,@grafana/grafana-datasources-core-services,false,true,
 queryServiceWithConnections,experimental,@grafana/grafana-datasources-core-services,false,true,false
 queryServiceRewrite,experimental,@grafana/grafana-datasources-core-services,false,true,false
 queryServiceFromUI,experimental,@grafana/grafana-datasources-core-services,false,false,true
-cloudWatchBatchQueries,GA,@grafana/aws-datasources,false,false,false
+cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false
 cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false
 alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false
 alertingProvenanceLockWrites,experimental,@grafana/alerting-squad,false,false,false
@@ -874,17 +874,13 @@
    {
      "metadata": {
        "name": "cloudWatchBatchQueries",
-        "resourceVersion": "1767124751522",
-        "creationTimestamp": "2023-10-20T19:09:41Z",
-        "annotations": {
-          "grafana.app/updatedTimestamp": "2025-12-30 19:59:11.522773 +0000 UTC"
-        }
+        "resourceVersion": "1764664939750",
+        "creationTimestamp": "2023-10-20T19:09:41Z"
      },
      "spec": {
        "description": "Runs CloudWatch metrics queries as separate batches",
-        "stage": "GA",
-        "codeowner": "@grafana/aws-datasources",
-        "expression": "true"
+        "stage": "preview",
+        "codeowner": "@grafana/aws-datasources"
      }
    },
    {
@@ -24,7 +24,7 @@ func (e *elasticsearchDataQuery) processQuery(q *Query, ms *es.MultiSearchReques
 	filters.AddDateRangeFilter(defaultTimeField, to, from, es.DateFormatEpochMS)
 	filters.AddQueryStringFilter(q.RawQuery, true)

-	if q.EditorType != nil && *q.EditorType == "code" {
+	if q.EditorType != nil && *q.EditorType == "code" && q.RawDSLQuery != "" {
 		cfg := backend.GrafanaConfigFromContext(e.ctx)
 		if !cfg.FeatureToggles().IsEnabled("elasticsearchRawDSLQuery") {
 			return backend.DownstreamError(fmt.Errorf("raw DSL query feature is disabled. Enable the elasticsearchRawDSLQuery feature toggle to use this query type"))
@@ -7,7 +7,7 @@ import (
 // isQueryWithError validates the query and returns an error if invalid
 func isQueryWithError(query *Query) error {
 	// Skip validation for raw DSL queries because no easy way to see it is valid without just running it
-	if query.EditorType != nil && *query.EditorType == "code" {
+	if query.EditorType != nil && *query.EditorType == "code" && query.RawDSLQuery != "" {
 		return nil
 	}
 	if len(query.BucketAggs) == 0 {
@@ -4,7 +4,7 @@ import { DataFrame, DataTransformerID, standardTransformersRegistry, Transformer
 import { selectors } from '@grafana/e2e-selectors';
 import { t, Trans } from '@grafana/i18n';
 import { reportInteraction } from '@grafana/runtime';
-import { Box, Button, Stack, Text } from '@grafana/ui';
+import { Box, Button, Grid, Stack, Text } from '@grafana/ui';
 import config from 'app/core/config';

 import { SqlExpressionCard } from '../../../dashboard/components/TransformationsEditor/SqlExpressionCard';
@@ -26,6 +26,9 @@ const TRANSFORMATION_IDS = [
  DataTransformerID.filterByValue,
 ];

+const GRID_COLUMNS_WITH_SQL = 5;
+const GRID_COLUMNS_WITHOUT_SQL = 4;
+
 export function LegacyEmptyTransformationsMessage({ onShowPicker }: { onShowPicker: () => void }) {
  return (
    <Box alignItems="center" padding={4}>
@@ -91,25 +94,13 @@ export function NewEmptyTransformationsMessage(props: EmptyTransformationsProps)
  };

  const showSqlCard = hasGoToQueries && config.featureToggles.sqlExpressions;
+  const gridColumns = showSqlCard ? GRID_COLUMNS_WITH_SQL : GRID_COLUMNS_WITHOUT_SQL;

  return (
-    <Box padding={2}>
-      <Stack direction="column" alignItems="start" gap={2}>
-        <Stack direction="column" alignItems="start" gap={1}>
-          <Text element="h3" textAlignment="start">
-            <Trans i18nKey="transformations.empty.add-transformation-header">Add a Transformation</Trans>
-          </Text>
-          <Text element="p" textAlignment="start" color="secondary">
-            <Trans i18nKey="transformations.empty.add-transformation-body">
-              Transformations allow data to be changed in various ways before your visualization is shown.
-              <br />
-              This includes joining data together, renaming fields, making calculations, formatting data for display,
-              and more.
-            </Trans>
-          </Text>
-        </Stack>
+    <Box alignItems="center" padding={4}>
+      <Stack direction="column" alignItems="center" gap={4}>
        {(hasAddTransformation || hasGoToQueries) && (
-          <Stack direction="row" gap={1} wrap>
+          <Grid columns={gridColumns} gap={1}>
            {showSqlCard && (
              <SqlExpressionCard
                name={t('dashboard-scene.empty-transformations-message.sql-name', 'Transform with SQL')}
@@ -134,17 +125,19 @@ export function NewEmptyTransformationsMessage(props: EmptyTransformationsProps)
                  data={props.data}
                />
              ))}
-          </Stack>
+          </Grid>
        )}
-        <Button
-          icon="plus"
-          variant="primary"
-          size="md"
-          onClick={handleShowMoreClick}
-          data-testid={selectors.components.Transforms.addTransformationButton}
-        >
-          <Trans i18nKey="dashboard-scene.empty-transformations-message.show-more">Show more</Trans>
-        </Button>
+        <Stack direction="row" gap={2}>
+          <Button
+            icon="plus"
+            variant="primary"
+            size="md"
+            onClick={handleShowMoreClick}
+            data-testid={selectors.components.Transforms.addTransformationButton}
+          >
+            <Trans i18nKey="dashboard-scene.empty-transformations-message.show-more">Show more</Trans>
+          </Button>
+        </Stack>
      </Stack>
    </Box>
  );
@@ -112,37 +112,6 @@ describe('PanelEditor', () => {
    });
  });

-  describe('Entering panel edit', () => {
-    it('should clear edit pane selection', () => {
-      pluginPromise = Promise.resolve(getPanelPlugin({ id: 'text', skipDataQuery: true }));
-
-      const panel = new VizPanel({
-        key: 'panel-1',
-        pluginId: 'text',
-        title: 'original title',
-      });
-      const gridItem = new DashboardGridItem({ body: panel });
-      const panelEditor = buildPanelEditScene(panel);
-      const dashboard = new DashboardScene({
-        editPanel: panelEditor,
-        isEditing: true,
-        $timeRange: new SceneTimeRange({ from: 'now-6h', to: 'now' }),
-        body: new DefaultGridLayoutManager({
-          grid: new SceneGridLayout({
-            children: [gridItem],
-          }),
-        }),
-      });
-
-      dashboard.state.editPane.selectObject(panel, panel.state.key!, { force: true });
-      expect(dashboard.state.editPane.getSelection()).toBe(panel);
-
-      deactivate = activateFullSceneTree(dashboard);
-
-      expect(dashboard.state.editPane.getSelection()).toBeUndefined();
-    });
-  });
-
  describe('When discarding', () => {
    it('should discard changes revert all changes', async () => {
      const { panelEditor, panel, dashboard } = await setup();
@@ -84,11 +84,6 @@ export class PanelEditor extends SceneObjectBase<PanelEditorState> {

  private _activationHandler() {
    const panel = this.state.panelRef.resolve();
-    const dashboard = getDashboardSceneFor(this);
-
-    // Clear any panel selection when entering panel edit mode.
-    // Need to clear selection here since selection is activated when panel edit mode is entered through the panel actions menu. This causes sidebar panel editor to be open when exiting panel edit mode
-    dashboard.state.editPane.clearSelection();

    if (panel.state.pluginId === UNCONFIGURED_PANEL_PLUGIN_ID) {
      if (config.featureToggles.newVizSuggestions) {
@@ -59,11 +59,7 @@ export function CanvasGridAddActions({ layoutManager }: Props) {
  }, [layoutManager]);

  return (
-    <div
-      className={cx(styles.addAction, 'dashboard-canvas-add-button')}
-      onPointerUp={(evt) => evt.stopPropagation()}
-      onPointerDown={(evt) => evt.stopPropagation()}
-    >
+    <div className={cx(styles.addAction, 'dashboard-canvas-add-button')}>
      <Button
        variant="primary"
        fill="text"
@@ -193,6 +189,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
    height: theme.spacing(5),
    bottom: 0,
    left: 0,
+    right: 0,
    opacity: 0,
    [theme.transitions.handleMotion('no-preference', 'reduce')]: {
      transition: theme.transitions.create('opacity'),
@@ -345,10 +345,12 @@ export class V2DashboardSerializer
    // initialize autossigned variable ds references map
    if (saveModel?.variables) {
      for (const variable of saveModel.variables) {
-        // for query variables that dont have a ds defined add them to the list
-        if (variable.kind === 'QueryVariable' && !variable.spec.query.datasource?.name) {
-          const datasourceType = variable.spec.query.group || undefined;
-          this.defaultDsReferencesMap.variables.set(variable.spec.name, datasourceType);
+        if (variable) {
+          // for query variables that dont have a ds defined add them to the list
+          if (variable.kind === 'QueryVariable' && !variable.spec.query.datasource?.name) {
+            const datasourceType = variable.spec.query.group || undefined;
+            this.defaultDsReferencesMap.variables.set(variable.spec.name, datasourceType);
+          }
        }
      }
    }
@@ -1,6 +1,7 @@
-import { Card, Text, useStyles2 } from '@grafana/ui';
+import { css } from '@emotion/css';

-import { getCardStyles } from './getCardStyles';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Card, useStyles2 } from '@grafana/ui';

 export interface SqlExpressionCardProps {
  name: string;
@@ -11,15 +12,60 @@ export interface SqlExpressionCardProps {
 }

 export function SqlExpressionCard({ name, description, imageUrl, onClick, testId }: SqlExpressionCardProps) {
-  const styles = useStyles2(getCardStyles);
+  const styles = useStyles2(getSqlExpressionCardStyles);

  return (
-    <Card className={styles.baseCard} data-testid={testId} onClick={onClick} noMargin>
-      <Card.Heading>{name}</Card.Heading>
-      <Card.Description>
-        <Text variant="bodySmall">{description}</Text>
-        {imageUrl && <img className={styles.image} src={imageUrl} alt={name} />}
+    <Card className={styles.card} data-testid={testId} onClick={onClick} noMargin>
+      <Card.Heading className={styles.heading}>
+        <div className={styles.titleRow}>
+          <span>{name}</span>
+        </div>
+      </Card.Heading>
+      <Card.Description className={styles.description}>
+        <span>{description}</span>
+        {imageUrl && (
+          <span>
+            <img className={styles.image} src={imageUrl} alt={name} />
+          </span>
+        )}
      </Card.Description>
    </Card>
  );
 }
+
+function getSqlExpressionCardStyles(theme: GrafanaTheme2) {
+  return {
+    card: css({
+      gridTemplateRows: 'min-content 0 1fr 0',
+      marginBottom: 0,
+    }),
+    heading: css({
+      fontWeight: 400,
+      '> button': {
+        width: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'flex-start',
+        gap: theme.spacing(1),
+      },
+    }),
+    titleRow: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      flexWrap: 'nowrap',
+      width: '100%',
+    }),
+    description: css({
+      fontSize: theme.typography.bodySmall.fontSize,
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'space-between',
+    }),
+    image: css({
+      display: 'block',
+      maxWidth: '100%',
+      marginTop: theme.spacing(2),
+    }),
+  };
+}
@@ -1,38 +1,35 @@
-import { cx } from '@emotion/css';
+import { cx, css } from '@emotion/css';

 import {
  DataFrame,
+  GrafanaTheme2,
  TransformerRegistryItem,
  TransformationApplicabilityLevels,
  standardTransformersRegistry,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Badge, Card, IconButton, Stack, Text, useStyles2, useTheme2 } from '@grafana/ui';
+import { Badge, Card, IconButton, useStyles2, useTheme2 } from '@grafana/ui';
 import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';

-import { getCardStyles } from './getCardStyles';
-
 export interface TransformationCardProps {
-  data?: DataFrame[];
-  fullWidth?: boolean;
+  transform: TransformerRegistryItem;
  onClick: (id: string) => void;
  showIllustrations?: boolean;
+  data?: DataFrame[];
  showPluginState?: boolean;
  showTags?: boolean;
-  transform: TransformerRegistryItem;
 }

 export function TransformationCard({
-  data = [],
-  fullWidth = false,
-  onClick,
+  transform,
  showIllustrations,
+  onClick,
+  data = [],
  showPluginState = true,
  showTags = true,
-  transform,
 }: TransformationCardProps) {
  const theme = useTheme2();
-  const styles = useStyles2(getCardStyles, fullWidth);
+  const styles = useStyles2(getTransformationCardStyles);

  // Check to see if the transform is applicable to the given data
  let applicabilityScore = TransformationApplicabilityLevels.Applicable;
@@ -50,7 +47,7 @@ export function TransformationCard({
    }
  }

-  const cardClasses = cx(styles.baseCard, { [styles.cardDisabled]: !isApplicable });
+  const cardClasses = !isApplicable && data.length > 0 ? cx(styles.newCard, styles.cardDisabled) : styles.newCard;
  const imageUrl = theme.isDark ? transform.imageDark : transform.imageLight;
  const description = standardTransformersRegistry.getIfExists(transform.id)?.description;

@@ -61,11 +58,15 @@ export function TransformationCard({
      onClick={() => onClick(transform.id)}
      noMargin
    >
-      <Card.Heading>
-        <Stack alignItems="center" justifyContent="space-between">
-          {transform.name}
-          {showPluginState && <PluginStateInfo state={transform.state} />}
-        </Stack>
+      <Card.Heading className={styles.heading}>
+        <div className={styles.titleRow}>
+          <span>{transform.name}</span>
+          {showPluginState && (
+            <span className={styles.pluginStateInfoWrapper}>
+              <PluginStateInfo state={transform.state} />
+            </span>
+          )}
+        </div>
        {showTags && transform.tags && transform.tags.size > 0 && (
          <div className={styles.tagsWrapper}>
            {Array.from(transform.tags).map((tag) => (
@@ -74,13 +75,74 @@ export function TransformationCard({
          </div>
        )}
      </Card.Heading>
-      <Card.Description>
-        <Text variant="bodySmall">{description || ''}</Text>
-        {showIllustrations && imageUrl && <img className={styles.image} src={imageUrl} alt={transform.name} />}
+      <Card.Description className={styles.description}>
+        <span>{description}</span>
+        {showIllustrations && imageUrl && (
+          <span>
+            <img className={styles.image} src={imageUrl} alt={transform.name} />
+          </span>
+        )}
        {!isApplicable && applicabilityDescription !== null && (
-          <IconButton className={styles.applicableInfoButton} name="info-circle" tooltip={applicabilityDescription} />
+          <IconButton className={styles.cardApplicableInfo} name="info-circle" tooltip={applicabilityDescription} />
        )}
      </Card.Description>
    </Card>
  );
 }
+
+function getTransformationCardStyles(theme: GrafanaTheme2) {
+  return {
+    heading: css({
+      fontWeight: 400,
+      '> button': {
+        width: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'flex-start',
+        gap: theme.spacing(1),
+      },
+    }),
+    titleRow: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      flexWrap: 'nowrap',
+      width: '100%',
+    }),
+    description: css({
+      fontSize: theme.typography.bodySmall.fontSize,
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'space-between',
+    }),
+    image: css({
+      display: 'block',
+      maxWidth: '100%',
+      marginTop: theme.spacing(2),
+    }),
+    cardDisabled: css({
+      backgroundColor: theme.colors.action.disabledBackground,
+      img: {
+        filter: 'grayscale(100%)',
+        opacity: 0.33,
+      },
+    }),
+    cardApplicableInfo: css({
+      position: 'absolute',
+      bottom: theme.spacing(1),
+      right: theme.spacing(1),
+    }),
+    newCard: css({
+      gridTemplateRows: 'min-content 0 1fr 0',
+      marginBottom: 0,
+    }),
+    pluginStateInfoWrapper: css({
+      marginLeft: theme.spacing(0.5),
+    }),
+    tagsWrapper: css({
+      display: 'flex',
+      flexWrap: 'wrap',
+      gap: theme.spacing(0.5),
+    }),
+  };
+}
@@ -165,12 +165,11 @@ function TransformationsGrid({ showIllustrations, transformations, onClick, data
    <Grid columns={3} gap={1}>
      {transformations.map((transform) => (
        <TransformationCard
-          data={data}
-          fullWidth
          key={transform.id}
-          onClick={onClick}
-          showIllustrations={showIllustrations}
          transform={transform}
+          showIllustrations={showIllustrations}
+          onClick={onClick}
+          data={data}
        />
      ))}
    </Grid>
@@ -1,34 +0,0 @@
-import { css } from '@emotion/css';
-
-import { GrafanaTheme2 } from '@grafana/data';
-
-export const getCardStyles = (theme: GrafanaTheme2, fullWidth?: boolean) => ({
-  baseCard: css({
-    maxWidth: fullWidth ? 'none' : '200px',
-    width: fullWidth ? '100%' : 'auto',
-    marginBottom: 0,
-  }),
-  image: css({
-    display: 'block',
-    maxWidth: '100%',
-    marginTop: theme.spacing(2),
-  }),
-  cardDisabled: css({
-    backgroundColor: theme.colors.action.disabledBackground,
-    img: {
-      filter: 'grayscale(100%)',
-      opacity: 0.33,
-    },
-  }),
-  applicableInfoButton: css({
-    position: 'absolute',
-    bottom: theme.spacing(1),
-    right: theme.spacing(1),
-  }),
-  tagsWrapper: css({
-    display: 'flex',
-    flexWrap: 'wrap',
-    gap: theme.spacing(0.5),
-    marginTop: theme.spacing(0.5),
-  }),
-});
@@ -7,7 +7,7 @@ import {
 import { defaultBucketAgg } from '../../../../queryDef';
 import { reducerTester } from '../../../reducerTester';
 import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
-import { changeEditorTypeAndResetQuery, initQuery } from '../../state';
+import { initQuery } from '../../state';
 import { bucketAggregationConfig } from '../utils';

 import {
@@ -180,27 +180,4 @@ describe('Bucket Aggregations Reducer', () => {
        .thenStateShouldEqual([bucketAgg]);
    });
  });
-
-  describe('When switching editor type', () => {
-    it('Should reset bucket aggregations to default when switching editor types', () => {
-      const defaultTimeField = '@timestamp';
-      const initialState: BucketAggregation[] = [
-        {
-          id: '1',
-          type: 'date_histogram',
-          field: '@timestamp',
-        },
-        {
-          id: '2',
-          type: 'terms',
-          field: 'status',
-        },
-      ];
-
-      reducerTester<ElasticsearchDataQuery['bucketAggs']>()
-        .givenReducer(createReducer(defaultTimeField), initialState)
-        .whenActionIsDispatched(changeEditorTypeAndResetQuery('code'))
-        .thenStateShouldEqual([{ ...defaultBucketAgg('2'), field: defaultTimeField }]);
-    });
-  });
 });
@@ -6,7 +6,7 @@ import { defaultBucketAgg } from '../../../../queryDef';
 import { removeEmpty } from '../../../../utils';
 import { changeMetricType } from '../../MetricAggregationsEditor/state/actions';
 import { metricAggregationConfig } from '../../MetricAggregationsEditor/utils';
-import { changeEditorTypeAndResetQuery, initQuery } from '../../state';
+import { initQuery } from '../../state';
 import { bucketAggregationConfig } from '../utils';

 import {
@@ -87,11 +87,6 @@ export const createReducer =
      return state;
    }

-    if (changeEditorTypeAndResetQuery.match(action)) {
-      // Returns the default bucket agg. We will always want to set the default when switching types
-      return [{ ...defaultBucketAgg('2'), field: defaultTimeField }];
-    }
-
    if (changeBucketAggregationSetting.match(action)) {
      return state!.map((bucketAgg) => {
        if (bucketAgg.id !== action.payload.bucketAgg.id) {
@@ -7,7 +7,7 @@ import {

 import { defaultMetricAgg } from '../../../../queryDef';
 import { reducerTester } from '../../../reducerTester';
-import { changeEditorTypeAndResetQuery, initQuery } from '../../state';
+import { initQuery } from '../../state';
 import { metricAggregationConfig } from '../utils';

 import {
@@ -248,26 +248,4 @@ describe('Metric Aggregations Reducer', () => {
      .whenActionIsDispatched(initQuery())
      .thenStateShouldEqual([defaultMetricAgg('1')]);
  });
-
-  describe('When switching editor type', () => {
-    it('Should reset to single default metric when switching to code editor', () => {
-      const initialState: MetricAggregation[] = [
-        {
-          id: '1',
-          type: 'avg',
-          field: 'value',
-        },
-        {
-          id: '2',
-          type: 'max',
-          field: 'value',
-        },
-      ];
-
-      reducerTester<ElasticsearchDataQuery['metrics']>()
-        .givenReducer(reducer, initialState)
-        .whenActionIsDispatched(changeEditorTypeAndResetQuery('code'))
-        .thenStateShouldEqual([defaultMetricAgg('1')]);
-    });
-  });
 });
@@ -4,7 +4,7 @@ import { ElasticsearchDataQuery, MetricAggregation } from 'app/plugins/datasourc

 import { defaultMetricAgg, queryTypeToMetricType } from '../../../../queryDef';
 import { removeEmpty } from '../../../../utils';
-import { changeEditorTypeAndResetQuery, initQuery } from '../../state';
+import { initQuery } from '../../state';
 import { isMetricAggregationWithMeta, isMetricAggregationWithSettings, isPipelineAggregation } from '../aggregations';
 import { getChildren, metricAggregationConfig } from '../utils';

@@ -65,11 +65,6 @@ export const reducer = (
      });
  }

-  if (changeEditorTypeAndResetQuery.match(action)) {
-    // Reset to default metric when switching to editor types
-    return [defaultMetricAgg('1')];
-  }
-
  if (changeMetricField.match(action)) {
    return state!.map((metric) => {
      if (metric.id !== action.payload.id) {
@@ -1,15 +1,7 @@
 import { ElasticsearchDataQuery } from '../../dataquery.gen';
 import { reducerTester } from '../reducerTester';

-import {
-  aliasPatternReducer,
-  changeAliasPattern,
-  changeEditorTypeAndResetQuery,
-  changeQuery,
-  initQuery,
-  queryReducer,
-  rawDSLQueryReducer,
-} from './state';
+import { aliasPatternReducer, changeAliasPattern, changeQuery, initQuery, queryReducer } from './state';

 describe('Query Reducer', () => {
  describe('On Init', () => {
@@ -50,17 +42,6 @@ describe('Query Reducer', () => {
      .whenActionIsDispatched({ type: 'THIS ACTION SHOULD NOT HAVE ANY EFFECT IN THIS REDUCER' })
      .thenStateShouldEqual(initialState);
  });
-
-  describe('When switching editor type', () => {
-    it('Should clear query when switching editor types', () => {
-      const initialQuery: ElasticsearchDataQuery['query'] = 'Some lucene query';
-
-      reducerTester<ElasticsearchDataQuery['query']>()
-        .givenReducer(queryReducer, initialQuery)
-        .whenActionIsDispatched(changeEditorTypeAndResetQuery('code'))
-        .thenStateShouldEqual('');
-    });
-  });
 });

 describe('Alias Pattern Reducer', () => {
@@ -81,26 +62,4 @@ describe('Alias Pattern Reducer', () => {
      .whenActionIsDispatched({ type: 'THIS ACTION SHOULD NOT HAVE ANY EFFECT IN THIS REDUCER' })
      .thenStateShouldEqual(initialState);
  });
-
-  describe('When switching editor type', () => {
-    it('Should clear alias when switching editor types', () => {
-      const initialAlias: ElasticsearchDataQuery['alias'] = 'Some alias pattern';
-
-      reducerTester<ElasticsearchDataQuery['alias']>()
-        .givenReducer(aliasPatternReducer, initialAlias)
-        .whenActionIsDispatched(changeEditorTypeAndResetQuery('code'))
-        .thenStateShouldEqual('');
-    });
-  });
-});
-
-describe('Raw DSL Query Reducer', () => {
-  it('Should clear raw DSL query when switching editor types', () => {
-    const initialRawQuery: ElasticsearchDataQuery['rawDSLQuery'] = '{"query": {"match_all": {}}}';
-
-    reducerTester<ElasticsearchDataQuery['rawDSLQuery']>()
-      .givenReducer(rawDSLQueryReducer, initialRawQuery)
-      .whenActionIsDispatched(changeEditorTypeAndResetQuery('builder'))
-      .thenStateShouldEqual('');
-  });
 });
@@ -58,10 +58,6 @@ export const aliasPatternReducer = (prevAliasPattern: ElasticsearchDataQuery['al
    return action.payload;
  }

-  if (changeEditorTypeAndResetQuery.match(action)) {
-    return '';
-  }
-
  if (initQuery.match(action)) {
    return prevAliasPattern || '';
  }
@@ -1,7 +1,7 @@
 import { PanelModel } from '@grafana/data';
 import { FieldColorModeId } from '@grafana/schema/dist/esm/index.gen';

-import { gaugePanelMigrationHandler, gaugePanelChangedHandler } from './migrations';
+import { gaugePanelMigrationHandler, gaugePanelChangedHandler } from './GaugeMigrations';

 describe('Gauge Panel Migrations', () => {
  it('from old gauge', () => {
@@ -32,51 +32,6 @@ describe('Gauge Panel Migrations', () => {
    expect(result.sparkline).toBe(false);
  });

-  it.each([
-    {
-      textMode: 'value_and_name',
-      displayName: 'My gauge',
-    },
-    {
-      textMode: undefined,
-      displayName: '',
-    },
-    {
-      textMode: undefined,
-      displayName: null,
-    },
-    {
-      textMode: undefined,
-      displayName: undefined,
-    },
-  ])('sets the the text mode to "$textMode" for "$displayName"', ({ textMode, displayName }) => {
-    const panel = {
-      id: 2,
-      options: {
-        displayName,
-        reduceOptions: {
-          calcs: ['lastNotNull'],
-        },
-        showThresholdLabels: false,
-        showThresholdMarkers: true,
-      },
-      fieldConfig: {
-        defaults: {
-          color: {
-            mode: FieldColorModeId.Fixed,
-            fixedColor: 'blue',
-          },
-        },
-        overrides: [],
-      },
-      pluginVersion: '12.3.0',
-      type: 'gauge',
-    } as Omit<PanelModel, 'fieldConfig'>;
-
-    const result = gaugePanelMigrationHandler(panel as PanelModel);
-    expect(result.textMode).toEqual(textMode);
-  });
-
  it('does not overwrite new gauge', () => {
    const panel = {
      id: 2,
@@ -21,11 +21,6 @@ export function gaugePanelMigrationHandler(panel: PanelModel<Options>): Partial<
    newOptions.sparkline = false;
    newOptions.effects = { gradient: false };

-    // if a display name is set, set the appropriate text mode
-    if ('displayName' in newOptions && newOptions.displayName && newOptions.displayName !== '') {
-      newOptions.textMode = 'value_and_name';
-    }
-
    // Remove deprecated sizing options
    if ('sizing' in newOptions) {
      delete newOptions.sizing;
@@ -52,7 +52,6 @@ export function RadialBarPanel({
        nameManualFontSize={options.text?.titleSize}
        endpointMarker={options.endpointMarker !== 'none' ? options.endpointMarker : undefined}
        onClick={menuProps.openMenu}
-        textMode={options.textMode}
      />
    );
  }
@@ -66,7 +65,9 @@ export function RadialBarPanel({
    if (hasLinks && getLinks) {
      return (
        <DataLinksContextMenu links={getLinks} style={{ flexGrow: 1 }}>
-          {(api) => renderComponent(valueProps, api)}
+          {(api) => {
+            return renderComponent(valueProps, api);
+          }}
        </DataLinksContextMenu>
      );
    }
@@ -5,8 +5,8 @@ import { commonOptionsBuilder } from '@grafana/ui';
 import { addOrientationOption, addStandardDataReduceOptions } from '../stat/common';

 import { EffectsEditor } from './EffectsEditor';
+import { gaugePanelChangedHandler, gaugePanelMigrationHandler, shouldMigrateGauge } from './GaugeMigrations';
 import { RadialBarPanel } from './RadialBarPanel';
-import { gaugePanelChangedHandler, gaugePanelMigrationHandler, shouldMigrateGauge } from './migrations';
 import { defaultGaugePanelEffects, defaultOptions, Options } from './panelcfg.gen';
 import { radialBarSuggestionsSupplier } from './suggestions';

@@ -99,22 +99,6 @@ export const plugin = new PanelPlugin<Options>(RadialBarPanel)
      showIf: (options) => options.barShape === 'rounded' && options.segmentCount === 1,
    });

-    builder.addSelect({
-      path: 'textMode',
-      name: t('radialbar.config.text-mode', 'Text mode'),
-      category,
-      settings: {
-        options: [
-          { value: 'auto', label: t('radialbar.config.text-mode-auto', 'Auto') },
-          { value: 'value_and_name', label: t('radialbar.config.text-mode-value-and-name', 'Value and Name') },
-          { value: 'value', label: t('radialbar.config.text-mode-value', 'Value') },
-          { value: 'name', label: t('radialbar.config.text-mode-name', 'Name') },
-          { value: 'none', label: t('radialbar.config.text-mode-none', 'None') },
-        ],
-      },
-      defaultValue: defaultOptions.textMode,
-    });
-
    builder.addBooleanSwitch({
      path: 'sparkline',
      name: t('radialbar.config.sparkline', 'Show sparkline'),
@@ -42,7 +42,6 @@ composableKinds: PanelCfg: {
 					barWidthFactor: number | *0.5
 					barShape: "flat" | "rounded" | *"flat"
 					endpointMarker?: "point" | "glow" | "none" | *"point"
-          textMode?: "auto" | "value_and_name" | "value" | "name" | "none" | *"auto"
 					effects: GaugePanelEffects | *{}
 				} @cuetsy(kind="interface")
 			}
@@ -33,7 +33,6 @@ export interface Options extends common.SingleStatBaseOptions {
  showThresholdLabels: boolean;
  showThresholdMarkers: boolean;
  sparkline?: boolean;
-  textMode?: ('auto' | 'value_and_name' | 'value' | 'name' | 'none');
 }

 export const defaultOptions: Partial<Options> = {
@@ -47,5 +46,4 @@ export const defaultOptions: Partial<Options> = {
  showThresholdLabels: false,
  showThresholdMarkers: true,
  sparkline: true,
-  textMode: 'auto',
 };
@@ -12519,12 +12519,6 @@
      "shape-circle": "Circle",
      "shape-gauge": "Arc",
      "sparkline": "Show sparkline",
-      "text-mode": "Text mode",
-      "text-mode-auto": "Auto",
-      "text-mode-name": "Name",
-      "text-mode-none": "None",
-      "text-mode-value": "Value",
-      "text-mode-value-and-name": "Value and Name",
      "threshold-labels": "Show threshold labels",
      "threshold-markers": "Show thresholds"
    }