From e91144950b019281bd4dc320b7c4da28d9b31941 Mon Sep 17 00:00:00 2001
From: Bogdan Matei <bogdan.matei@grafana.com>
Date: Mon, 27 Oct 2025 17:23:03 +0200
Subject: [PATCH] Dashboard: Fix eslint suppressions in conditional rendering
 (#113045)

---
 eslint-suppressions.json                          | 15 ---------------
 .../conditions/ConditionalRenderingData.tsx       |  2 +-
 .../ConditionalRenderingTimeRangeSize.tsx         |  2 +-
 .../conditions/ConditionalRenderingVariable.tsx   |  2 +-
 .../group/ConditionalRenderingGroup.tsx           |  2 +-
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index 7016dcf8169..364c4e1b646 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -2062,21 +2062,6 @@
       "count": 2
     }
   },
-  "public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx": {
-    "react-prefer-function-component/react-prefer-function-component": {
-      "count": 1
-    }
-  },
-  "public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx": {
-    "react-prefer-function-component/react-prefer-function-component": {
-      "count": 1
-    }
-  },
-  "public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx": {
-    "react-prefer-function-component/react-prefer-function-component": {
-      "count": 1
-    }
-  },
   "public/app/features/dashboard-scene/edit-pane/DashboardEditPaneRenderer.tsx": {
     "@typescript-eslint/consistent-type-assertions": {
       "count": 1
diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx
index bb366768d06..bc1078b7f1b 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx
@@ -133,7 +133,7 @@ export class ConditionalRenderingData extends SceneObjectBase<ConditionalRenderi
     }
   }
 
-  public render(): ReactElement {
+  public renderCmp(): ReactElement {
     return <this.Component model={this} key={this.state.key} />;
   }
 
diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx
index fadd4c623e0..a717b68ea79 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx
@@ -80,7 +80,7 @@ export class ConditionalRenderingTimeRangeSize extends SceneObjectBase<Condition
     }
   }
 
-  public render(): ReactElement {
+  public renderCmp(): ReactElement {
     return <this.Component model={this} key={this.state.key} />;
   }
 
diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx
index 39d81f80ef7..8f82b1f459f 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx
@@ -127,7 +127,7 @@ export class ConditionalRenderingVariable extends SceneObjectBase<ConditionalRen
     }
   }
 
-  public render(): ReactElement {
+  public renderCmp(): ReactElement {
     return <this.Component model={this} key={this.state.key} />;
   }
 
diff --git a/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx b/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx
index 37253e0e448..5f0b3319e25 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx
@@ -218,7 +218,7 @@ function ConditionalRenderingGroupRenderer({ model }: SceneComponentProps<Condit
           }}
         />
       )}
-      {conditions.map((currentCondition) => currentCondition.render())}
+      {conditions.map((currentCondition) => currentCondition.renderCmp())}
       <ConditionalRenderingGroupAdd
         objectType={objectType}
         hasVariables={variables.length > 0}