Merge branch 'main' into 1362-fix-duplicating-vdisks

Author: astandrik

src/containers/AppWithClusters/ExtendedCluster/ExtendedCluster.tsx

@@ -5,14 +5,15 @@ import type {
     AdditionalClusterProps,
     AdditionalTenantsProps,
     AdditionalVersionsProps,
+    NodeAddress,
 } from '../../../types/additionalProps';
 import type {MetaClusterVersion} from '../../../types/api/meta';
 import type {ETenantType} from '../../../types/api/tenant';
 import {getVersionColors, getVersionMap} from '../../../utils/clusterVersionColors';
 import {cn} from '../../../utils/cn';
 import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../../utils/monitoring';
 import {getCleanBalancerValue, removeViewerPathname} from '../../../utils/parseBalancer';
-import {getBackendFromNodeHost} from '../../../utils/prepareBackend';
+import {getBackendFromNodeHost, getBackendFromRawNodeData} from '../../../utils/prepareBackend';
 import type {Cluster} from '../../Cluster/Cluster';
 import {useClusterData} from '../useClusterData';
 
@@ -76,7 +77,9 @@ const getAdditionalTenantsProps = (
 ) => {
     const additionalTenantsProps: AdditionalTenantsProps = {};
 
-    additionalTenantsProps.prepareTenantBackend = (nodeHost: string | undefined) => {
+    additionalTenantsProps.prepareTenantBackend = (
+        nodeHostOrAddress: string | NodeAddress | undefined,
+    ) => {
         // Proxy received from balancer value, so it's necessary
         if (!balancer) {
             return undefined;
@@ -86,11 +89,15 @@ const getAdditionalTenantsProps = (
             return removeViewerPathname(balancer);
         }
 
-        if (!nodeHost) {
+        if (!nodeHostOrAddress) {
             return undefined;
         }
 
-        return getBackendFromNodeHost(nodeHost, balancer);
+        if (typeof nodeHostOrAddress === 'string') {
+            return getBackendFromNodeHost(nodeHostOrAddress, balancer);
+        }
+
+        return getBackendFromRawNodeData(nodeHostOrAddress, balancer, true) ?? undefined;
     };
 
     if (monitoring && getMonitoringLink) {

src/containers/Storage/StorageGroups/columns/StorageGroupsColumns.scss

@@ -22,8 +22,17 @@
             }
         }
     }
+
     &__pool-name-wrapper {
-        width: 230px;
+        overflow: hidden;
+
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        direction: rtl;
+    }
+
+    &__pool-name {
+        unicode-bidi: plaintext;
     }
 
     &__group-id {

src/containers/Storage/StorageGroups/columns/columns.tsx

@@ -33,18 +33,17 @@ const poolNameColumn: StorageGroupsColumn = {
     header: STORAGE_GROUPS_COLUMNS_TITLES.PoolName,
     width: 250,
     render: ({row}) => {
-        const splitted = row.PoolName?.split('/');
-        return (
-            splitted && (
-                <CellWithPopover
-                    wrapperClassName={b('pool-name-wrapper')}
-                    content={row.PoolName}
-                    placement={['right']}
-                    behavior={PopoverBehavior.Immediate}
-                >
-                    {splitted[splitted.length - 1]}
-                </CellWithPopover>
-            )
+        return row.PoolName ? (
+            <CellWithPopover
+                content={row.PoolName}
+                placement={['right']}
+                behavior={PopoverBehavior.Immediate}
+                className={b('pool-name-wrapper')}
+            >
+                <span className={b('pool-name')}>{row.PoolName}</span>
+            </CellWithPopover>
+        ) : (
+            EMPTY_DATA_PLACEHOLDER
         );
     },
     align: DataTable.LEFT,

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx

@@ -46,7 +46,7 @@ export function TopQueries({tenantName}: TopQueriesProps) {
     );
 
     const loading = isFetching && currentData === undefined;
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const handleRowClick = React.useCallback(
         (row: any) => {

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx

@@ -32,7 +32,7 @@ export const TopShards = ({tenantName, path}: TopShardsProps) => {
     );
 
     const loading = isFetching && currentData === undefined;
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const columns = getTopShardsColumns(tenantName, location);
 

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx

@@ -32,7 +32,7 @@ export function TopTables({path}: TopTablesProps) {
     );
     const loading = isFetching && currentData === undefined;
 
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const formatSize = (value?: number) => {
         const size = getSizeWithSignificantDigits(data?.length ? Number(data[0].Size) : 0, 0);

src/containers/Tenant/Diagnostics/TopQueries/RunningQueriesData.tsx

@@ -21,18 +21,16 @@ interface Props {
 export const RunningQueriesData = ({database}: Props) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const filters = useTypedSelector((state) => state.executeTopQueries);
-    const {
-        currentData: data,
-        isFetching,
-        error,
-    } = topQueriesApi.useGetRunningQueriesQuery(
+    const {currentData, isFetching, error} = topQueriesApi.useGetRunningQueriesQuery(
         {
             database,
             filters,
         },
         {pollingInterval: autoRefreshInterval},
     );
 
+    const data = currentData?.resultSets?.[0].result || [];
+
     return (
         <React.Fragment>
             {error ? <ResponseError error={parseQueryErrorToString(error)} /> : null}
@@ -41,7 +39,7 @@ export const RunningQueriesData = ({database}: Props) => {
                     emptyDataMessage={i18n('no-data')}
                     columnsWidthLSKey={RUNNING_QUERIES_COLUMNS_WIDTH_LS_KEY}
                     columns={RUNNING_QUERIES_COLUMNS}
-                    data={data || []}
+                    data={data}
                     settings={QUERY_TABLE_SETTINGS}
                 />
             </TableWithControlsLayout.Table>

src/containers/Tenant/Diagnostics/TopQueries/TopQueriesData.tsx

@@ -31,7 +31,7 @@ export const TopQueriesData = ({database, onRowClick}: Props) => {
         },
         {pollingInterval: autoRefreshInterval},
     );
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const rawColumns = TOP_QUERIES_COLUMNS;
     const columns = rawColumns.map((column) => ({

src/containers/Tenant/Diagnostics/TopShards/TopShards.tsx

@@ -120,7 +120,7 @@ export const TopShards = ({tenantName, path, type}: TopShardsProps) => {
         {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && result === undefined;
-    const {result: data} = result ?? {};
+    const data = result?.resultSets?.[0]?.result || [];
 
     const onSort = (newSortOrder?: SortOrder | SortOrder[]) => {
         // omit information about sort order to disable ASC order, only DESC makes sense for top shards

src/containers/Tenant/Query/ExecuteResult/ExecuteResult.tsx

@@ -72,9 +72,8 @@ export function ExecuteResult({
     const {error, isLoading, queryId, data} = result;
 
     const stats: TKqpStatsQuery | undefined = data?.stats;
-    const resultsSetsCount = data?.resultSets?.length;
-    const isMulti = resultsSetsCount && resultsSetsCount > 0;
-    const currentResult = isMulti ? data?.resultSets?.[selectedResultSet] : data;
+    const resultsSetsCount = data?.resultSets?.length || 0;
+    const currentResult = data?.resultSets?.[selectedResultSet];
     const {plan, simplifiedPlan} = React.useMemo(() => getPlan(data), [data]);
 
     const resultOptions: ControlGroupOption<SectionID>[] = [
@@ -106,7 +105,7 @@ export function ExecuteResult({
     const renderResult = () => {
         return (
             <div className={b('result-wrapper')}>
-                {isMulti && resultsSetsCount > 1 && (
+                {resultsSetsCount > 1 && (
                     <div>
                         <Tabs
                             className={b('result-tabs')}