From b78044511f795e897abee921dc6c98a2f171a076 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Tue, 6 May 2025 15:45:44 +0200
Subject: [PATCH] Extension Sidebar: Prevent plugin errors from breaking
 Grafana (#104983)

feat(extensionsidebar): add an errorboundary to prevent crashing entire app if plugin goes pop
---
 .../AppChrome/ExtensionSidebar/ExtensionSidebar.tsx         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebar.tsx b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebar.tsx
index 9c1c08eb578..fd77743f206 100644
--- a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebar.tsx
+++ b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebar.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { usePluginComponents } from '@grafana/runtime';
-import { useTheme2 } from '@grafana/ui';
+import { ErrorBoundaryAlert, useTheme2 } from '@grafana/ui';
 
 import {
   EXTENSION_SIDEBAR_EXTENSION_POINT_ID,
@@ -45,7 +45,9 @@ export function ExtensionSidebar() {
   return (
     <div className={styles.sidebarWrapper}>
       <div className={styles.content}>
-        <ExtensionComponent {...props} />
+        <ErrorBoundaryAlert>
+          <ExtensionComponent {...props} />
+        </ErrorBoundaryAlert>
       </div>
     </div>
   );