fix: better code

Author: astandrik

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

@@ -228,8 +228,8 @@ export function QueryResultViewer({
             return (
                 <ResultSetsViewer
                     resultSets={resultSets}
+                    error={error}
                     selectedResultSet={selectedResultSet}
-                    errorHeader={<QueryResultError error={error} />}
                     setSelectedResultSet={setSelectedResultSet}
                 />
             );

src/containers/Tenant/Query/QueryResult/components/ResultSetsViewer/ResultSetsViewer.tsx

@@ -5,6 +5,7 @@ import type {ParsedResultSet} from '../../../../../../types/store/query';
 import {getArray} from '../../../../../../utils';
 import {cn} from '../../../../../../utils/cn';
 import i18n from '../../i18n';
+import {QueryResultError} from '../QueryResultError/QueryResultError';
 
 import './ResultSetsViewer.scss';
 
@@ -13,12 +14,12 @@ const b = cn('ydb-query-result-sets-viewer');
 interface ResultSetsViewerProps {
     resultSets?: ParsedResultSet[];
     selectedResultSet: number;
-    errorHeader?: React.ReactNode;
+    error?: unknown;
     setSelectedResultSet: (resultSet: number) => void;
 }
 
 export function ResultSetsViewer(props: ResultSetsViewerProps) {
-    const {selectedResultSet, setSelectedResultSet, resultSets} = props;
+    const {selectedResultSet, setSelectedResultSet, resultSets, error} = props;
 
     const resultsSetsCount = resultSets?.length || 0;
     const currentResult = resultSets?.[selectedResultSet];
@@ -68,7 +69,7 @@ export function ResultSetsViewer(props: ResultSetsViewerProps) {
     return (
         <div className={b('result-wrapper')}>
             {renderTabs()}
-            {props.errorHeader ? props.errorHeader : null}
+            {props.error ? <QueryResultError error={error} /> : null}
             {currentResult ? (
                 <div className={b('result')}>
                     {renderResultHeadWithCount()}

src/containers/Tenant/Query/utils/isQueryCancelledError.ts

@@ -1,13 +1,30 @@
 import type {IResponseError} from '../../../../types/api/error';
-import {parseQueryError} from '../../../../utils/query';
+import {isQueryErrorResponse, parseQueryError} from '../../../../utils/query';
 
-export function isQueryCancelledError(error: unknown) {
-    const parsedError = parseQueryError(error);
+function isAbortError(error: unknown): error is {name: string} {
+    return (
+        typeof error === 'object' &&
+        error !== null &&
+        'name' in error &&
+        error.name === 'AbortError'
+    );
+}
 
+function isResponseError(error: unknown): error is IResponseError {
+    return typeof error === 'object' && error !== null && 'isCancelled' in error;
+}
+
+export function isQueryCancelledError(error: unknown): boolean {
+    if (isAbortError(error)) {
+        return true;
+    }
+
+    if (isResponseError(error) && error.isCancelled) {
+        return true;
+    }
+
+    const parsedError = parseQueryError(error);
     return (
-        (typeof error === 'object' &&
-            ((error as IResponseError)?.isCancelled ||
-                (error as {name: string}).name === 'AbortError')) ||
-        (typeof parsedError === 'object' && parsedError.error?.message === 'Query was cancelled')
+        isQueryErrorResponse(parsedError) && parsedError.error?.message === 'Query was cancelled'
     );
 }