fix: better error handling

Author: astandrik

src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx

@@ -28,6 +28,7 @@ import {Ast} from './components/Ast/Ast';
 import {Graph} from './components/Graph/Graph';
 import {QueryInfoDropdown} from './components/QueryInfoDropdown/QueryInfoDropdown';
 import {QueryJSONViewer} from './components/QueryJSONViewer/QueryJSONViewer';
+import {QueryResultError} from './components/QueryResultError/QueryResultError';
 import {ResultSetsViewer} from './components/ResultSetsViewer/ResultSetsViewer';
 import {SimplifiedPlan} from './components/SimplifiedPlan/SimplifiedPlan';
 import {StubMessage} from './components/Stub/Stub';
@@ -254,7 +255,11 @@ export function QueryResultViewer({
         }
 
         if (error) {
-            return renderCommonErrorView(isStopped);
+            return isExecute || isStopped ? (
+                renderCommonErrorView(isStopped)
+            ) : (
+                <QueryResultError error={error} />
+            );
         }
 
         if (activeSection === RESULT_OPTIONS_IDS.schema) {

tests/suites/tenant/queryEditor/queryEditor.test.ts

@@ -74,7 +74,7 @@ test.describe('Test Query Editor', async () => {
         await expect(explainAST).toBeVisible({timeout: VISIBILITY_TIMEOUT});
     });
 
-    test('Error is displayed for invalid query', async ({page}) => {
+    test('Error is displayed for invalid query for run', async ({page}) => {
         const queryEditor = new QueryEditor(page);
 
         const invalidQuery = 'Select d';
@@ -86,6 +86,18 @@ test.describe('Test Query Editor', async () => {
         await expect(errorMessage).toContain('Column references are not allowed without FROM');
     });
 
+    test('Error is displayed for invalid query for explain', async ({page}) => {
+        const queryEditor = new QueryEditor(page);
+
+        const invalidQuery = 'Select d';
+        await queryEditor.setQuery(invalidQuery);
+        await queryEditor.clickExplainButton();
+
+        await expect(queryEditor.waitForStatus('Failed')).resolves.toBe(true);
+        const errorMessage = await queryEditor.getErrorMessage();
+        await expect(errorMessage).toContain('Column references are not allowed without FROM');
+    });
+
     test('Run and Explain buttons are disabled when query is empty', async ({page}) => {
         const queryEditor = new QueryEditor(page);