fix: code-review

Author: Raubzeug

src/containers/Tenant/Diagnostics/HotKeys/HotKeys.js

@@ -8,9 +8,10 @@ import Icon from '../../../../components/Icon/Icon';
 
 import {AutoFetcher} from '../../../../utils/autofetcher';
 import {getHotKeys, setHotKeysOptions} from '../../../../store/reducers/hotKeys';
+import {TABLE_TYPE} from '../../Tenant';
+import {prepareQueryError} from '../../../../utils';
 
 import './HotKeys.scss';
-import {TABLE_TYPE} from '../../Tenant';
 
 const b = cn('hot-keys');
 
@@ -105,7 +106,7 @@ function HotKeys({
 
     const renderContent = () => {
         if (error) {
-            return error.data?.error?.message || error.data || error;
+            return prepareQueryError(error);
         }
         return data !== null ? (
             <div className={b('table-content')}>

src/containers/Tenant/Diagnostics/TopQueries/TopQueries.js

@@ -3,18 +3,19 @@ import PropTypes from 'prop-types';
 import cn from 'bem-cn-lite';
 import {connect} from 'react-redux';
 import DataTable from '@yandex-cloud/react-data-table';
+import {Loader} from '@yandex-cloud/uikit';
 
 import {changeUserInput} from '../../../../store/reducers/executeQuery';
 import {sendQuery, setQueryOptions} from '../../../../store/reducers/executeTopQueries';
 import TruncatedQuery from '../../../../components/TruncatedQuery/TruncatedQuery';
 import {AutoFetcher} from '../../../../utils/autofetcher';
 import {OLAP_STORE_TYPE, OLAP_TABLE_TYPE} from '../../Tenant';
 
-import './TopQueries.scss';
 import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
 import {TenantGeneralTabsIds} from '../../TenantPages';
-import {Loader} from '@yandex-cloud/uikit';
+import {prepareQueryError} from '../../../../utils';
 
+import './TopQueries.scss';
 
 const b = cn('kv-top-queries');
 
@@ -151,7 +152,7 @@ class TopQueries extends React.Component {
         if (type === OLAP_STORE_TYPE || type === OLAP_TABLE_TYPE) {
             message = 'No data';
         } else if (error && !error.isCancelled) {
-            message = (error.data?.error?.message || error.data || error).slice(0, 300);
+            message = prepareQueryError(error).slice(0, 300);
         } else if (!loading && !data) {
             message = 'No data';
         }

src/containers/Tenant/Diagnostics/TopShards/TopShards.js

@@ -1,20 +1,21 @@
 import {useContext, useEffect, useMemo} from 'react';
 import cn from 'bem-cn-lite';
 import {connect} from 'react-redux';
-import InternalLink from '../../../../components/InternalLink/InternalLink';
+import {Loader} from '@yandex-cloud/uikit';
 import DataTable from '@yandex-cloud/react-data-table';
-import routes, {createHref} from '../../../../routes';
 
+import InternalLink from '../../../../components/InternalLink/InternalLink';
+
+import routes, {createHref} from '../../../../routes';
 import {sendShardQuery, setShardQueryOptions} from '../../../../store/reducers/shardsWorkload';
 import {setCurrentSchemaPath, getSchema} from '../../../../store/reducers/schema';
 import {AutoFetcher} from '../../../../utils/autofetcher';
-
 import HistoryContext from '../../../../contexts/HistoryContext';
-
-import './TopShards.scss';
 import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
-import {Loader} from '@yandex-cloud/uikit';
 import {OLAP_STORE_TYPE, OLAP_TABLE_TYPE} from '../../Tenant';
+import {prepareQueryError} from '../../../../utils';
+
+import './TopShards.scss';
 
 const b = cn('top-shards');
 const bLink = cn('yc-link');
@@ -123,7 +124,7 @@ function TopShards({
             return 'No data';
         }
         if (error) {
-            return error.data?.error?.message || error.data || error;
+            return prepareQueryError(error);
         }
 
         return data && data.length > 0 ? (

src/containers/Tenant/Preview/Preview.js

@@ -11,7 +11,7 @@ import Fullscreen from '../../../components/Fullscreen/Fullscreen';
 
 import {sendQuery, setQueryOptions} from '../../../store/reducers/preview';
 import {showTooltip, hideTooltip} from '../../../store/reducers/tooltip';
-import {prepareQueryResponse} from '../../../utils/index';
+import {prepareQueryError, prepareQueryResponse} from '../../../utils/index';
 
 import {OLAP_TABLE_TYPE, TABLE_TYPE} from '../Tenant';
 import {AutoFetcher} from '../../../utils/autofetcher';
@@ -163,11 +163,7 @@ class Preview extends React.Component {
         }
 
         if (error) {
-            message = (
-                <div className={b('message-container')}>
-                    {error.data?.error?.message || error.data || error}
-                </div>
-            );
+            message = <div className={b('message-container')}>{prepareQueryError(error)}</div>;
         }
 
         if (!loading && data.length === 0) {

src/containers/Tenant/QueryEditor/Issues/Issues.tsx

@@ -40,7 +40,10 @@ export default function ResultIssues({data, className}: ResultIssuesProps) {
             const severity = getSeverity(data?.error?.severity);
             content = (
                 <React.Fragment>
-                    <IssueSeverity severity={severity} /> <span className={blockWrapper('error-message-text')}>{data?.error?.message}</span>
+                    <IssueSeverity severity={severity} />{' '}
+                    <span className={blockWrapper('error-message-text')}>
+                        {data?.error?.message}
+                    </span>
                 </React.Fragment>
             );
         }
@@ -71,9 +74,9 @@ interface IssuesProps {
 }
 export function Issues({issues, className}: IssuesProps) {
     const mostSevereIssue = issues.reduce((result, issue) => {
-        const severity = issue.severity ? issue.severity : 10;
-        return result < severity ? result : severity;
-    }, issues[0].severity ?? 10);
+        const severity = issue.severity ?? 10;
+        return Math.min(result, severity);
+    }, 10);
     return (
         <div className={blockIssues(null, className)}>
             {issues.map((issue, index) => (

src/utils/index.js

@@ -138,3 +138,7 @@ export const prepareQueryResponse = (data) => {
         return formattedData;
     });
 };
+
+export function prepareQueryError(error) {
+    return error.data?.error?.message || error.data || error
+}