From e443a88ae73bdd2b1d96009bb0dd8a30d9dc82d8 Mon Sep 17 00:00:00 2001
From: Alexey Potsetsuev <wrouds@gmail.com>
Date: Thu, 20 Nov 2025 15:43:49 +0800
Subject: [PATCH] dbeaver/pro#5818 fix: error message (#3920)

Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com>
---
 webapp/packages/core-blocks/src/DisplayError.tsx  |  9 ++++-----
 webapp/packages/core-blocks/src/ErrorBoundary.tsx | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/webapp/packages/core-blocks/src/DisplayError.tsx b/webapp/packages/core-blocks/src/DisplayError.tsx
index a097128f5c..44e83f6916 100644
--- a/webapp/packages/core-blocks/src/DisplayError.tsx
+++ b/webapp/packages/core-blocks/src/DisplayError.tsx
@@ -26,7 +26,7 @@ interface Props {
 
 export const DisplayError = observer<Props>(function DisplayError({ root, children, error, errorInfo, className }) {
   const styles = useS(style);
-  const stack = errorInfo?.componentStack || error?.stack;
+  const stack = error?.stack;
 
   return (
     <div role="alert" tabIndex={0} className={s(styles, { error: true, root }, className)}>
@@ -39,14 +39,13 @@ export const DisplayError = observer<Props>(function DisplayError({ root, childr
           <details className={s(styles, { details: true })}>
             <summary>Details</summary>
             <p>
-              {error.toString()}
-              {stack && (
+              {stack ? <code>{stack}</code> : error.toString()}
+              {errorInfo?.componentStack && (
                 <>
                   <br />
-                  <br />
+                  <code>{errorInfo.componentStack}</code>
                 </>
               )}
-              <code>{stack}</code>
             </p>
           </details>
         )}
diff --git a/webapp/packages/core-blocks/src/ErrorBoundary.tsx b/webapp/packages/core-blocks/src/ErrorBoundary.tsx
index 1266296151..bfa60b9b78 100644
--- a/webapp/packages/core-blocks/src/ErrorBoundary.tsx
+++ b/webapp/packages/core-blocks/src/ErrorBoundary.tsx
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ export class ErrorBoundary extends React.Component<React.PropsWithChildren<Props
 
     for (const errorData of this.state.exceptions) {
       if (this.props.simple) {
-        const stack = errorData.errorInfo?.componentStack || errorData.error.stack;
+        const stack = errorData.error.stack;
         return (
           <Suspense fallback={<>Loading...</>}>
             <div>
@@ -94,9 +94,14 @@ export class ErrorBoundary extends React.Component<React.PropsWithChildren<Props
                 </div>
               )}
               <div>
-                {errorData.error.toString()}
-                {stack && <br />}
-                {stack}
+                {stack ? stack : errorData.error.toString()}
+                {errorData.errorInfo?.componentStack && (
+                  <>
+                    <br />
+                    <br />
+                    {errorData.errorInfo.componentStack}
+                  </>
+                )}
               </div>
               {this.props.fallback}
             </div>