Merge branch 'main' into astandrik.snippets-for-table-1299

astandrik · web-flow · commit df0abdec51fa · 2024-10-17T21:03:17.000+03:00
diff --git a/src/containers/Tenant/Diagnostics/Describe/Describe.tsx b/src/containers/Tenant/Diagnostics/Describe/Describe.tsx
@@ -1,14 +1,14 @@
 import {ClipboardButton} from '@gravity-ui/uikit';
-import {skipToken} from '@reduxjs/toolkit/query';
 import JSONTree from 'react-json-inspector';
 import {shallowEqual} from 'react-redux';
 
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {Loader} from '../../../../components/Loader';
-import {overviewApi} from '../../../../store/reducers/overview/overview';
-import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
+import {
+    selectSchemaMergedChildrenPaths,
+    useGetMultiOverviewQuery,
+} from '../../../../store/reducers/overview/overview';
 import type {EPathType} from '../../../../types/api/schema';
-import type {IDescribeData} from '../../../../types/store/describe';
 import {cn} from '../../../../utils/cn';
 import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
 import {isEntityWithMergedImplementation} from '../../utils/schema';
@@ -26,8 +26,6 @@ interface IDescribeProps {
     type?: EPathType;
 }
 
-const emptyObject: IDescribeData = {};
-
 const Describe = ({path, database, type}: IDescribeProps) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
@@ -44,37 +42,20 @@ const Describe = ({path, database, type}: IDescribeProps) => {
     } else if (mergedChildrenPaths) {
         paths = [path, ...mergedChildrenPaths];
     }
-    const {currentDescribe, currentData, isFetching, error} = overviewApi.useGetOverviewQuery(
-        paths.length ? {paths, database} : skipToken,
-        {
-            pollingInterval: autoRefreshInterval,
-            selectFromResult: (props) => {
-                const {currentData} = props;
-                if (!currentData) {
-                    return {currentDescribe: emptyObject, ...props};
-                }
-
-                const mergedData = [currentData.data, ...currentData.additionalData];
 
-                const data = mergedData.reduce<IDescribeData>((acc, item) => {
-                    if (item?.Path) {
-                        acc[item.Path] = item;
-                    }
-                    return acc;
-                }, {});
-                return {currentDescribe: data, ...props};
-            },
-        },
-    );
-    const loading = isFetching && currentData === undefined;
+    const {mergedDescribe, loading, error} = useGetMultiOverviewQuery({
+        paths,
+        autoRefreshInterval,
+        database,
+    });
 
     let preparedDescribeData: Object | undefined;
-    if (currentDescribe) {
-        const paths = Object.keys(currentDescribe);
+    if (mergedDescribe) {
+        const paths = Object.keys(mergedDescribe);
         if (paths.length === 1) {
-            preparedDescribeData = currentDescribe[paths[0]];
+            preparedDescribeData = mergedDescribe[paths[0]];
         } else {
-            preparedDescribeData = currentDescribe;
+            preparedDescribeData = mergedDescribe;
         }
     }
 
diff --git a/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx b/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx
@@ -62,16 +62,15 @@ export function HotKeys({path, database}: HotKeysProps) {
     const {currentData: data, isFetching, error} = hotKeysApi.useGetHotKeysQuery({path, database});
     const loading = isFetching && data === undefined;
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    const {currentData, isLoading: schemaLoading} = overviewApi.useGetOverviewQuery(
+    const {currentData: schemaData, isLoading: schemaLoading} = overviewApi.useGetOverviewQuery(
         {
-            paths: [path],
+            path,
             database,
         },
         {
             pollingInterval: autoRefreshInterval,
         },
     );
-    const {data: schemaData} = currentData ?? {};
     const keyColumnsIds = schemaData?.PathDescription?.Table?.KeyColumnNames;
 
     const tableColumns = React.useMemo(() => {
diff --git a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
 
-import {skipToken} from '@reduxjs/toolkit/query';
 import {shallowEqual} from 'react-redux';
 
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {TableIndexInfo} from '../../../../components/InfoViewer/schemaInfo';
 import {Loader} from '../../../../components/Loader';
-import {overviewApi} from '../../../../store/reducers/overview/overview';
-import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
+import {
+    selectSchemaMergedChildrenPaths,
+    useGetMultiOverviewQuery,
+} from '../../../../store/reducers/overview/overview';
 import {EPathType} from '../../../../types/api/schema';
 import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
 import {ExternalDataSourceInfo} from '../../Info/ExternalDataSource/ExternalDataSource';
@@ -45,16 +46,17 @@ function Overview({type, path, database}: OverviewProps) {
     }
 
     const {
-        currentData,
-        isFetching,
-        error: overviewError,
-    } = overviewApi.useGetOverviewQuery(paths.length ? {paths, database} : skipToken, {
-        pollingInterval: autoRefreshInterval,
+        mergedDescribe,
+        loading: entityLoading,
+        error,
+    } = useGetMultiOverviewQuery({
+        paths,
+        database,
+        autoRefreshInterval,
     });
-    const overviewLoading = isFetching && currentData === undefined;
-    const {data: rawData, additionalData} = currentData || {};
 
-    const entityLoading = overviewLoading;
+    const rawData = mergedDescribe[path];
+
     const entityNotReady = isEntityWithMergedImpl && !mergedChildrenPaths;
 
     const renderContent = () => {
@@ -70,14 +72,20 @@ function Overview({type, path, database}: OverviewProps) {
             [EPathType.EPathTypeExtSubDomain]: undefined,
             [EPathType.EPathTypeColumnStore]: undefined,
             [EPathType.EPathTypeColumnTable]: undefined,
-            [EPathType.EPathTypeCdcStream]: () => (
-                <ChangefeedInfo
-                    path={path}
-                    database={database}
-                    data={data}
-                    topic={additionalData?.[0] ?? undefined}
-                />
-            ),
+            [EPathType.EPathTypeCdcStream]: () => {
+                const topicPath = mergedChildrenPaths?.[0];
+                if (topicPath) {
+                    return (
+                        <ChangefeedInfo
+                            path={path}
+                            database={database}
+                            data={data}
+                            topic={mergedDescribe?.[topicPath] ?? undefined}
+                        />
+                    );
+                }
+                return undefined;
+            },
             [EPathType.EPathTypePersQueueGroup]: () => (
                 <TopicInfo data={data} path={path} database={database} />
             ),
@@ -96,8 +104,8 @@ function Overview({type, path, database}: OverviewProps) {
 
     return (
         <React.Fragment>
-            {overviewError ? <ResponseError error={overviewError} /> : null}
-            {overviewError && !rawData ? null : renderContent()}
+            {error ? <ResponseError error={error} /> : null}
+            {error && !rawData ? null : renderContent()}
         </React.Fragment>
     );
 }
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
@@ -45,16 +45,15 @@ export function TenantOverview({
 
     const tenantType = mapDatabaseTypeToDBName(Type);
     // FIXME: remove after correct data is added to tenantInfo
-    const {currentData} = overviewApi.useGetOverviewQuery(
+    const {currentData: tenantSchemaData} = overviewApi.useGetOverviewQuery(
         {
-            paths: [tenantName],
+            path: tenantName,
             database: tenantName,
         },
         {
             pollingInterval: autoRefreshInterval,
         },
     );
-    const {data: tenantSchemaData} = currentData ?? {};
     const {Tables, Topics} =
         tenantSchemaData?.PathDescription?.DomainDescription?.DiskSpaceUsage || {};
 
diff --git a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
@@ -93,16 +93,15 @@ export function ObjectSummary({
         ignoreQueryPrefix: true,
     });
 
-    const {currentData} = overviewApi.useGetOverviewQuery(
+    const {currentData: currentObjectData} = overviewApi.useGetOverviewQuery(
         {
-            paths: [path],
+            path,
             database: tenantName,
         },
         {
             pollingInterval: autoRefreshInterval,
         },
     );
-    const {data: currentObjectData} = currentData ?? {};
     const currentSchemaData = currentObjectData?.PathDescription?.Self;
 
     React.useEffect(() => {
diff --git a/src/containers/Tenant/Schema/SchemaViewer/SchemaViewer.tsx b/src/containers/Tenant/Schema/SchemaViewer/SchemaViewer.tsx
@@ -38,18 +38,16 @@ interface SchemaViewerProps {
 
 export const SchemaViewer = ({type, path, tenantName, extended = false}: SchemaViewerProps) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    const {currentData, isLoading: loading} = overviewApi.useGetOverviewQuery(
+    const {currentData: schemaData, isLoading: loading} = overviewApi.useGetOverviewQuery(
         {
-            paths: [path],
+            path,
             database: tenantName,
         },
         {
             pollingInterval: autoRefreshInterval,
         },
     );
 
-    const {data: schemaData} = currentData ?? {};
-
     const viewSchemaRequestParams = isViewType(type) ? {path, database: tenantName} : skipToken;
 
     const {data: viewColumnsData, isLoading: isViewSchemaLoading} =
diff --git a/src/containers/Tenant/Tenant.tsx b/src/containers/Tenant/Tenant.tsx
@@ -75,13 +75,16 @@ export function Tenant(props: TenantProps) {
 
     const path = schema ?? tenantName;
 
-    const {currentData, error, isLoading} = overviewApi.useGetOverviewQuery(
-        {paths: [path], database: tenantName},
+    const {
+        currentData: currentItem,
+        error,
+        isLoading,
+    } = overviewApi.useGetOverviewQuery(
+        {path, database: tenantName},
         {
             pollingInterval: autoRefreshInterval,
         },
     );
-    const {data: currentItem} = currentData ?? {};
     const {PathType: currentPathType, PathSubType: currentPathSubType} =
         currentItem?.PathDescription?.Self || {};
 
diff --git a/src/store/reducers/executeTopQueries/executeTopQueries.ts b/src/store/reducers/executeTopQueries/executeTopQueries.ts
@@ -10,6 +10,8 @@ import {getFiltersConditions} from './utils';
 
 const initialState: TopQueriesFilters = {};
 
+const QUERY_TECHNICAL_MARK = '/*UI-QUERY-EXCLUDE*/';
+
 const slice = createSlice({
     name: 'executeTopQueries',
     initialState,
@@ -26,7 +28,7 @@ export default slice.reducer;
 const getQueryText = (path: string, filters?: TopQueriesFilters) => {
     const filterConditions = getFiltersConditions(path, filters);
     return `
-SELECT
+SELECT ${QUERY_TECHNICAL_MARK}
     CPUTime as CPUTimeUs,
     QueryText,
     IntervalEnd,
@@ -36,7 +38,7 @@ SELECT
     UserSID,
     Duration
 FROM \`${path}/.sys/top_queries_by_cpu_time_one_hour\`
-WHERE ${filterConditions || 'true'}
+WHERE ${filterConditions || 'true'} AND QueryText NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
 ORDER BY CPUTimeUs DESC
 `;
 };
@@ -98,7 +100,15 @@ export const topQueriesApi = api.injectEndpoints({
                         ? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
                         : '';
 
-                    const queryText = `SELECT UserSID, QueryStartAt, Query as QueryText, ApplicationName from \`.sys/query_sessions\` WHERE ${filterConditions || 'true'}  ORDER BY SessionStartAt limit 100`;
+                    const queryText = `SELECT ${QUERY_TECHNICAL_MARK}
+                        UserSID, QueryStartAt, Query as QueryText, ApplicationName
+                    FROM
+                        \`.sys/query_sessions\`
+                    WHERE
+                        ${filterConditions || 'true'} AND Query NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
+                    ORDER BY
+                        SessionStartAt
+                    LIMIT 100`;
 
                     const response = await window.api.sendQuery(
                         {
@@ -115,13 +125,6 @@ export const topQueriesApi = api.injectEndpoints({
 
                     const data = parseQueryAPIExecuteResponse(response);
 
-                    /* filter running queries query itself */
-                    if (data?.resultSets?.[0]?.result) {
-                        data.resultSets[0].result = data.resultSets[0].result.filter(
-                            (item) => item.QueryText !== queryText,
-                        );
-                    }
-
                     return {data};
                 } catch (error) {
                     return {error};
diff --git a/src/store/reducers/overview/overview.ts b/src/store/reducers/overview/overview.ts
diff --git a/src/store/reducers/schema/schema.ts b/src/store/reducers/schema/schema.ts
