Merge branch 'main' into 653-use-gravity-ui-browserslist-config

Author: NaiSidera

src/containers/App/Content.tsx

@@ -22,7 +22,7 @@ import type {RawBreadcrumbItem} from '../Header/breadcrumbs';
 import Node from '../Node/Node';
 import {PDiskPage} from '../PDiskPage/PDiskPage';
 import {Tablet} from '../Tablet';
-import TabletsFilters from '../TabletsFilters/TabletsFilters';
+import {TabletsFilters} from '../TabletsFilters/TabletsFilters';
 import Tenant from '../Tenant/Tenant';
 import {VDiskPage} from '../VDiskPage/VDiskPage';
 

src/containers/App/appSlots.tsx

@@ -6,7 +6,7 @@ import type {Clusters} from '../Clusters/Clusters';
 import type Node from '../Node/Node';
 import type {PDiskPage} from '../PDiskPage/PDiskPage';
 import type {Tablet} from '../Tablet';
-import type TabletsFilters from '../TabletsFilters/TabletsFilters';
+import type {TabletsFilters} from '../TabletsFilters/TabletsFilters';
 import type Tenant from '../Tenant/Tenant';
 import type {VDiskPage} from '../VDiskPage/VDiskPage';
 

src/containers/Heatmap/Heatmap.tsx

@@ -4,6 +4,7 @@ import {Checkbox, Select} from '@gravity-ui/uikit';
 
 import {ResponseError} from '../../components/Errors/ResponseError';
 import {Loader} from '../../components/Loader';
+import {selectAutoRefreshInterval} from '../../store/reducers/autoRefreshControl';
 import {heatmapApi, setHeatmapOptions} from '../../store/reducers/heatmap';
 import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
 import type {IHeatmapMetricValue} from '../../types/store/heatmap';
@@ -29,11 +30,11 @@ export const Heatmap = ({path}: HeatmapProps) => {
 
     const itemsContainer = React.createRef<HTMLDivElement>();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     const {currentData, isFetching, error} = heatmapApi.useGetHeatmapTabletsInfoQuery(
         {path},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
 
     const loading = isFetching && currentData === undefined;

src/containers/Nodes/Nodes.tsx

@@ -13,6 +13,7 @@ import {ResizeableDataTable} from '../../components/ResizeableDataTable/Resizeab
 import {Search} from '../../components/Search';
 import {TableWithControlsLayout} from '../../components/TableWithControlsLayout/TableWithControlsLayout';
 import {UptimeFilter} from '../../components/UptimeFIlter';
+import {selectAutoRefreshInterval} from '../../store/reducers/autoRefreshControl';
 import {nodesApi} from '../../store/reducers/nodes/nodes';
 import {filterNodes} from '../../store/reducers/nodes/selectors';
 import type {NodesSortParams} from '../../store/reducers/nodes/types';
@@ -58,7 +59,7 @@ export const Nodes = ({path, additionalNodesProps = {}}: NodesProps) => {
     const isClusterNodes = !path;
 
     const problemFilter = useTypedSelector((state) => state.settings.problemFilter);
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autorefresh = useTypedSelector(selectAutoRefreshInterval);
 
     const [useNodesEndpoint] = useSetting(USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY);
 

src/containers/Storage/Storage.tsx

@@ -5,6 +5,7 @@ import {ArrayParam, StringParam, useQueryParams, withDefault} from 'use-query-pa
 import {AccessDenied} from '../../components/Errors/403';
 import {ResponseError} from '../../components/Errors/ResponseError';
 import {TableWithControlsLayout} from '../../components/TableWithControlsLayout/TableWithControlsLayout';
+import {selectAutoRefreshInterval} from '../../store/reducers/autoRefreshControl';
 import type {NodesSortParams} from '../../store/reducers/nodes/types';
 import {selectNodesMap} from '../../store/reducers/nodesList';
 import {STORAGE_TYPES, VISIBLE_ENTITIES} from '../../store/reducers/storage/constants';
@@ -62,7 +63,7 @@ interface StorageProps {
 }
 
 export const Storage = ({additionalNodesProps, tenant, nodeId}: StorageProps) => {
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autorefresh = useTypedSelector(selectAutoRefreshInterval);
     const [queryParams, setQueryParams] = useQueryParams({
         type: StringParam,
         visible: StringParam,

src/containers/Tablets/Tablets.tsx

@@ -10,6 +10,7 @@ import {InternalLink} from '../../components/InternalLink';
 import {ResizeableDataTable} from '../../components/ResizeableDataTable/ResizeableDataTable';
 import {TableSkeleton} from '../../components/TableSkeleton/TableSkeleton';
 import routes, {createHref} from '../../routes';
+import {selectAutoRefreshInterval} from '../../store/reducers/autoRefreshControl';
 import {selectTabletsWithFqdn, tabletsApi} from '../../store/reducers/tablets';
 import {ETabletState} from '../../types/api/tablet';
 import type {TTabletStateInfo} from '../../types/api/tablet';
@@ -145,21 +146,24 @@ interface TabletsProps {
 }
 
 export function Tablets({nodeId, path, className}: TabletsProps) {
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
-    let params: TabletsApiRequestParams | typeof skipToken = skipToken;
+    let params: TabletsApiRequestParams = {};
     const node = nodeId === undefined ? undefined : String(nodeId);
     if (node !== undefined) {
         params = {nodes: [String(node)]};
     } else if (path) {
         params = {path};
     }
-    const {currentData, isFetching, error} = tabletsApi.useGetTabletsInfoQuery(params, {
-        pollingInterval: autorefresh,
-    });
+    const {currentData, isFetching, error} = tabletsApi.useGetTabletsInfoQuery(
+        Object.keys(params).length === 0 ? skipToken : params,
+        {
+            pollingInterval: autoRefreshInterval,
+        },
+    );
 
     const loading = isFetching && currentData === undefined;
-    const tablets = useTypedSelector((state) => selectTabletsWithFqdn(state, node, path));
+    const tablets = useTypedSelector((state) => selectTabletsWithFqdn(state, params));
 
     if (loading) {
         return <TableSkeleton />;