From bad15fcd57d8517f11f60c21a01451ee97933b91 Mon Sep 17 00:00:00 2001
From: Valerii Sidorenko <balepas@nebius.com>
Date: Tue, 25 Jun 2024 13:23:32 +0200
Subject: [PATCH 1/2] feat(autoRefresh): move auto refresh to separate reducer

---
 src/containers/Heatmap/Heatmap.tsx            |  5 +--
 src/containers/Nodes/Nodes.tsx                |  3 +-
 src/containers/Storage/Storage.tsx            |  3 +-
 src/containers/Tablets/Tablets.tsx            |  5 +--
 .../Autorefresh/AutorefreshControl.tsx        | 11 ++++---
 .../Diagnostics/Consumers/Consumers.tsx       |  5 +--
 .../Tenant/Diagnostics/Describe/Describe.tsx  |  6 ++--
 .../Tenant/Diagnostics/Network/Network.tsx    |  5 +--
 .../Tenant/Diagnostics/Overview/Overview.tsx  |  8 +++--
 .../Overview/TopicStats/TopicStats.tsx        |  6 ++--
 .../Diagnostics/Partitions/Partitions.tsx     |  5 +--
 .../Healthcheck/HealthcheckDetails.tsx        |  7 +++--
 .../Healthcheck/HealthcheckPreview.tsx        |  5 +--
 .../TenantCpu/TopNodesByCpu.tsx               |  5 +--
 .../TenantCpu/TopNodesByLoad.tsx              |  5 +--
 .../TenantOverview/TenantCpu/TopQueries.tsx   |  5 +--
 .../TenantOverview/TenantCpu/TopShards.tsx    |  6 ++--
 .../TenantDashboard/TenantDashboard.tsx       |  5 +--
 .../TenantMemory/TopNodesByMemory.tsx         |  5 +--
 .../TenantOverview/TenantOverview.tsx         |  5 +--
 .../TenantStorage/TopGroups.tsx               |  5 +--
 .../TenantStorage/TopTables.tsx               |  5 +--
 .../Diagnostics/TopQueries/TopQueries.tsx     |  5 +--
 .../Diagnostics/TopShards/TopShards.tsx       |  6 ++--
 .../Tenant/Query/Preview/Preview.tsx          |  6 ++--
 src/store/reducers/autoRefreshControl.ts      | 31 +++++++++++++++++++
 src/store/reducers/index.ts                   |  2 ++
 src/store/reducers/schema/schema.ts           | 24 ++------------
 src/store/reducers/schema/types.ts            |  3 --
 29 files changed, 121 insertions(+), 76 deletions(-)
 create mode 100644 src/store/reducers/autoRefreshControl.ts

diff --git a/src/containers/Heatmap/Heatmap.tsx b/src/containers/Heatmap/Heatmap.tsx
index 671ffed8d2..30b182bbbb 100644
--- a/src/containers/Heatmap/Heatmap.tsx
+++ b/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;
diff --git a/src/containers/Nodes/Nodes.tsx b/src/containers/Nodes/Nodes.tsx
index 5f99b7737b..cadeb8845f 100644
--- a/src/containers/Nodes/Nodes.tsx
+++ b/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);
 
diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx
index 4e55b3c498..debbc249ca 100644
--- a/src/containers/Storage/Storage.tsx
+++ b/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,
diff --git a/src/containers/Tablets/Tablets.tsx b/src/containers/Tablets/Tablets.tsx
index 1eb9bf4c42..d6c0ebf841 100644
--- a/src/containers/Tablets/Tablets.tsx
+++ b/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,7 +146,7 @@ interface TabletsProps {
 }
 
 export function Tablets({nodeId, path, className}: TabletsProps) {
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     let params: TabletsApiRequestParams = {};
     const node = nodeId === undefined ? undefined : String(nodeId);
@@ -157,7 +158,7 @@ export function Tablets({nodeId, path, className}: TabletsProps) {
     const {currentData, isFetching, error} = tabletsApi.useGetTabletsInfoQuery(
         Object.keys(params).length === 0 ? skipToken : params,
         {
-            pollingInterval: autorefresh,
+            pollingInterval: autoRefreshInterval,
         },
     );
 
diff --git a/src/containers/Tenant/Diagnostics/Autorefresh/AutorefreshControl.tsx b/src/containers/Tenant/Diagnostics/Autorefresh/AutorefreshControl.tsx
index c46a40a899..40c75436b3 100644
--- a/src/containers/Tenant/Diagnostics/Autorefresh/AutorefreshControl.tsx
+++ b/src/containers/Tenant/Diagnostics/Autorefresh/AutorefreshControl.tsx
@@ -2,7 +2,10 @@ import {ArrowsRotateLeft} from '@gravity-ui/icons';
 import {Button, Select} from '@gravity-ui/uikit';
 
 import {api} from '../../../../store/reducers/api';
-import {setAutorefreshInterval} from '../../../../store/reducers/schema/schema';
+import {
+    selectAutoRefreshInterval,
+    setAutoRefreshInterval,
+} from '../../../../store/reducers/autoRefreshControl';
 import {cn} from '../../../../utils/cn';
 import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 
@@ -18,7 +21,7 @@ interface AutorefreshControlProps {
 
 export function AutorefreshControl({className}: AutorefreshControlProps) {
     const dispatch = useTypedDispatch();
-    const autorefresh = useTypedSelector((state) => state.schema.autorefresh);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     return (
         <div className={b(null, className)}>
             <Button
@@ -33,9 +36,9 @@ export function AutorefreshControl({className}: AutorefreshControlProps) {
                 </Button.Icon>
             </Button>
             <Select
-                value={[String(autorefresh)]}
+                value={[String(autoRefreshInterval)]}
                 onUpdate={(v) => {
-                    dispatch(setAutorefreshInterval(Number(v)));
+                    dispatch(setAutoRefreshInterval(Number(v)));
                 }}
                 width={85}
             >
diff --git a/src/containers/Tenant/Diagnostics/Consumers/Consumers.tsx b/src/containers/Tenant/Diagnostics/Consumers/Consumers.tsx
index 7f22914391..0651836242 100644
--- a/src/containers/Tenant/Diagnostics/Consumers/Consumers.tsx
+++ b/src/containers/Tenant/Diagnostics/Consumers/Consumers.tsx
@@ -6,6 +6,7 @@ import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {Loader} from '../../../../components/Loader';
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {Search} from '../../../../components/Search';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {
     selectPreparedConsumersData,
     selectPreparedTopicStats,
@@ -35,10 +36,10 @@ export const Consumers = ({path, type}: ConsumersProps) => {
 
     const [searchValue, setSearchValue] = React.useState('');
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const {currentData, isFetching, error} = topicApi.useGetTopicQuery(
         {path},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && currentData === undefined;
     const consumers = useTypedSelector((state) => selectPreparedConsumersData(state, path));
diff --git a/src/containers/Tenant/Diagnostics/Describe/Describe.tsx b/src/containers/Tenant/Diagnostics/Describe/Describe.tsx
index 630cf8962d..cec2f3ca43 100644
--- a/src/containers/Tenant/Diagnostics/Describe/Describe.tsx
+++ b/src/containers/Tenant/Diagnostics/Describe/Describe.tsx
@@ -4,6 +4,7 @@ import {shallowEqual} from 'react-redux';
 
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {Loader} from '../../../../components/Loader';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {describeApi} from '../../../../store/reducers/describe';
 import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
 import type {EPathType} from '../../../../types/api/schema';
@@ -24,7 +25,8 @@ interface IDescribeProps {
 }
 
 const Describe = ({tenant, type}: IDescribeProps) => {
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {currentSchemaPath} = useTypedSelector((state) => state.schema);
 
     const isEntityWithMergedImpl = isEntityWithMergedImplementation(type);
 
@@ -41,7 +43,7 @@ const Describe = ({tenant, type}: IDescribeProps) => {
         paths = [path, ...mergedChildrenPaths];
     }
     const {currentData, isFetching, error} = describeApi.useGetDescribeQuery(paths, {
-        pollingInterval: autorefresh,
+        pollingInterval: autoRefreshInterval,
     });
     const loading = isFetching && currentData === undefined;
     const currentDescribe = currentData;
diff --git a/src/containers/Tenant/Diagnostics/Network/Network.tsx b/src/containers/Tenant/Diagnostics/Network/Network.tsx
index 3b53288564..169c3c4aa6 100644
--- a/src/containers/Tenant/Diagnostics/Network/Network.tsx
+++ b/src/containers/Tenant/Diagnostics/Network/Network.tsx
@@ -6,6 +6,7 @@ import {Link} from 'react-router-dom';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {Illustration} from '../../../../components/Illustration';
 import {ProblemFilter} from '../../../../components/ProblemFilter';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {networkApi} from '../../../../store/reducers/network/network';
 import {
     ProblemFilterValues,
@@ -31,7 +32,7 @@ interface NetworkProps {
     path: string;
 }
 export function Network({path}: NetworkProps) {
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const filter = useTypedSelector(selectProblemFilter);
     const dispatch = useTypedDispatch();
 
@@ -40,7 +41,7 @@ export function Network({path}: NetworkProps) {
     const [showRacks, setShowRacks] = React.useState(false);
 
     const {currentData, isFetching, error} = networkApi.useGetNetworkInfoQuery(path, {
-        pollingInterval: autorefresh,
+        pollingInterval: autoRefreshInterval,
     });
     const loading = isFetching && currentData === undefined;
 
diff --git a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
index 32f272084c..ed3384d3dd 100644
--- a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
@@ -6,6 +6,7 @@ import {shallowEqual} from 'react-redux';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {TableIndexInfo} from '../../../../components/InfoViewer/schemaInfo';
 import {Loader} from '../../../../components/Loader';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {olapApi} from '../../../../store/reducers/olapStats';
 import {overviewApi} from '../../../../store/reducers/overview/overview';
 import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
@@ -31,14 +32,15 @@ interface OverviewProps {
 }
 
 function Overview({type, tenantName}: OverviewProps) {
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {currentSchemaPath} = useTypedSelector((state) => state.schema);
 
     const schemaPath = currentSchemaPath || tenantName;
     const olapParams =
         isTableType(type) && isColumnEntityType(type) ? {path: schemaPath} : skipToken;
     const {currentData: olapData, isFetching: olapIsFetching} = olapApi.useGetOlapStatsQuery(
         olapParams,
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const olapStatsLoading = olapIsFetching && olapData === undefined;
     const {result: olapStats} = olapData || {result: undefined};
@@ -65,7 +67,7 @@ function Overview({type, tenantName}: OverviewProps) {
         isFetching,
         error: overviewError,
     } = overviewApi.useGetOverviewQuery(paths, {
-        pollingInterval: autorefresh,
+        pollingInterval: autoRefreshInterval,
     });
     const overviewLoading = isFetching && currentData === undefined;
     const {data: rawData, additionalData} = currentData || {};
diff --git a/src/containers/Tenant/Diagnostics/Overview/TopicStats/TopicStats.tsx b/src/containers/Tenant/Diagnostics/Overview/TopicStats/TopicStats.tsx
index f496c44f59..e735c78c30 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TopicStats/TopicStats.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TopicStats/TopicStats.tsx
@@ -5,6 +5,7 @@ import {LabelWithPopover} from '../../../../../components/LabelWithPopover';
 import {LagPopoverContent} from '../../../../../components/LagPopoverContent';
 import {Loader} from '../../../../../components/Loader';
 import {SpeedMultiMeter} from '../../../../../components/SpeedMultiMeter';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {selectPreparedTopicStats, topicApi} from '../../../../../store/reducers/topic';
 import type {IPreparedTopicStats} from '../../../../../types/store/topic';
 import {cn} from '../../../../../utils/cn';
@@ -70,10 +71,11 @@ const prepareBytesWrittenInfo = (data: IPreparedTopicStats): Array<InfoViewerIte
 };
 
 export const TopicStats = () => {
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {currentSchemaPath} = useTypedSelector((state) => state.schema);
     const {currentData, isFetching, error} = topicApi.useGetTopicQuery(
         {path: currentSchemaPath},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && currentData === undefined;
     const data = useTypedSelector((state) => selectPreparedTopicStats(state, currentSchemaPath));
diff --git a/src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx b/src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx
index 07ace11a11..9afbb637fc 100644
--- a/src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx
+++ b/src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx
@@ -5,6 +5,7 @@ import {skipToken} from '@reduxjs/toolkit/query';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {TableSkeleton} from '../../../../components/TableSkeleton/TableSkeleton';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {nodesListApi, selectNodesMap} from '../../../../store/reducers/nodesList';
 import {partitionsApi, setSelectedConsumer} from '../../../../store/reducers/partitions/partitions';
 import {selectConsumersNames, topicApi} from '../../../../store/reducers/topic';
@@ -39,7 +40,7 @@ export const Partitions = ({path}: PartitionsProps) => {
     >([]);
 
     const consumers = useTypedSelector((state) => selectConsumersNames(state, path));
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const {selectedConsumer} = useTypedSelector((state) => state.partitions);
     const {
         currentData: topicData,
@@ -71,7 +72,7 @@ export const Partitions = ({path}: PartitionsProps) => {
         currentData: partitionsData,
         isFetching: partitionsIsFetching,
         error: partitionsError,
-    } = partitionsApi.useGetPartitionsQuery(params, {pollingInterval: autorefresh});
+    } = partitionsApi.useGetPartitionsQuery(params, {pollingInterval: autoRefreshInterval});
     const partitionsLoading = partitionsIsFetching && partitionsData === undefined;
     const rawPartitions = partitionsData;
 
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckDetails.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckDetails.tsx
index 53dc8928e5..f8d8938409 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckDetails.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckDetails.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import {ResponseError} from '../../../../../components/Errors/ResponseError';
 import {Loader} from '../../../../../components/Loader';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {cn} from '../../../../../utils/cn';
 import {useTypedSelector} from '../../../../../utils/hooks';
 import {useHealthcheck} from '../useHealthcheck';
@@ -18,8 +19,10 @@ interface HealthcheckDetailsProps {
 }
 
 export function HealthcheckDetails({tenantName}: HealthcheckDetailsProps) {
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-    const {issueTrees, loading, error} = useHealthcheck(tenantName, {autorefresh});
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {issueTrees, loading, error} = useHealthcheck(tenantName, {
+        autorefresh: autoRefreshInterval,
+    });
 
     const renderContent = () => {
         if (error) {
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx
index 368ec3452f..daa5378a39 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx
@@ -11,6 +11,7 @@ import {Icon} from '@gravity-ui/uikit';
 import {DiagnosticCard} from '../../../../../components/DiagnosticCard/DiagnosticCard';
 import {ResponseError} from '../../../../../components/Errors/ResponseError';
 import {Loader} from '../../../../../components/Loader';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {healthcheckApi} from '../../../../../store/reducers/healthcheckInfo/healthcheckInfo';
 import {SelfCheckResult} from '../../../../../types/api/healthcheck';
 import {cn} from '../../../../../utils/cn';
@@ -37,7 +38,7 @@ const icons: Record<SelfCheckResult, IconData> = {
 
 export function HealthcheckPreview(props: HealthcheckPreviewProps) {
     const {tenantName, active} = props;
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const {
         currentData: data,
         isFetching,
@@ -45,7 +46,7 @@ export function HealthcheckPreview(props: HealthcheckPreviewProps) {
     } = healthcheckApi.useGetHealthcheckInfoQuery(
         {database: tenantName},
         {
-            pollingInterval: autorefresh,
+            pollingInterval: autoRefreshInterval,
         },
     );
 
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx
index 1a1e0c6763..f90c0c3854 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx
@@ -1,3 +1,4 @@
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import {topNodesApi} from '../../../../../store/reducers/tenantOverview/topNodes/topNodes';
 import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
@@ -19,12 +20,12 @@ interface TopNodesByCpuProps {
 export function TopNodesByCpu({path, additionalNodesProps}: TopNodesByCpuProps) {
     const query = useSearchQuery();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const columns = getTopNodesByCpuColumns(additionalNodesProps?.getNodeRef);
 
     const {currentData, isFetching, error} = topNodesApi.useGetTopNodesQuery(
         {tenant: path, sortValue: 'CPU'},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
 
     const loading = isFetching && currentData === undefined;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx
index 1a0129b96f..83acafdbc6 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx
@@ -1,3 +1,4 @@
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import {topNodesApi} from '../../../../../store/reducers/tenantOverview/topNodes/topNodes';
 import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
@@ -19,12 +20,12 @@ interface TopNodesByLoadProps {
 export function TopNodesByLoad({path, additionalNodesProps}: TopNodesByLoadProps) {
     const query = useSearchQuery();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const columns = getTopNodesByLoadColumns(additionalNodesProps?.getNodeRef);
 
     const {currentData, isFetching, error} = topNodesApi.useGetTopNodesQuery(
         {tenant: path, sortValue: 'LoadAverage'},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
 
     const loading = isFetching && currentData === undefined;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx
index 5f71a9f39c..13d978e4e8 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import {useHistory, useLocation} from 'react-router';
 
 import {parseQuery} from '../../../../../routes';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {changeUserInput} from '../../../../../store/reducers/executeQuery';
 import {
     TENANT_DIAGNOSTICS_TABS_IDS,
@@ -34,12 +35,12 @@ export function TopQueries({path}: TopQueriesProps) {
 
     const query = parseQuery(location);
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const columns = getTenantOverviewTopQueriesColumns();
 
     const {currentData, isFetching, error} = topQueriesApi.useGetOverviewTopQueriesQuery(
         {database: path},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
 
     const loading = isFetching && currentData === undefined;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx
index 6dd2424939..a85edb8e69 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx
@@ -1,6 +1,7 @@
 import {useLocation} from 'react-router';
 
 import {parseQuery} from '../../../../../routes';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import {topShardsApi} from '../../../../../store/reducers/tenantOverview/topShards/tenantOverviewTopShards';
 import {useTypedSelector} from '../../../../../utils/hooks';
@@ -23,11 +24,12 @@ export const TopShards = ({path}: TopShardsProps) => {
 
     const query = parseQuery(location);
 
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {currentSchemaPath} = useTypedSelector((state) => state.schema);
 
     const {currentData, isFetching, error} = topShardsApi.useGetTopShardsQuery(
         {database: path, path: currentSchemaPath},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
 
     const loading = isFetching && currentData === undefined;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantDashboard/TenantDashboard.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantDashboard/TenantDashboard.tsx
index 2831523e44..f2afc8f6c1 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantDashboard/TenantDashboard.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantDashboard/TenantDashboard.tsx
@@ -9,6 +9,7 @@ import type {
     MetricDescription,
 } from '../../../../../components/MetricChart';
 import {TimeFrameSelector} from '../../../../../components/TimeFrameSelector/TimeFrameSelector';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {cn} from '../../../../../utils/cn';
 import {useTypedSelector} from '../../../../../utils/hooks';
 import type {TimeFrame} from '../../../../../utils/timeframes';
@@ -36,10 +37,10 @@ export const TenantDashboard = ({database, charts}: TenantDashboardProps) => {
 
     const [timeFrame = '1h', setTimeframe] = useQueryParam('timeframe', StringParam);
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     // Refetch data only if dashboard successfully loaded
-    const shouldRefresh = isDashboardHidden ? 0 : autorefresh;
+    const shouldRefresh = isDashboardHidden ? 0 : autoRefreshInterval;
 
     /**
      * Charts should be hidden, if they are not enabled:
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx
index 5c8796648d..44cd222ff8 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx
@@ -1,3 +1,4 @@
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import {topNodesApi} from '../../../../../store/reducers/tenantOverview/topNodes/topNodes';
 import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
@@ -19,14 +20,14 @@ interface TopNodesByMemoryProps {
 export function TopNodesByMemory({path, additionalNodesProps}: TopNodesByMemoryProps) {
     const query = useSearchQuery();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
     const columns = getTopNodesByMemoryColumns({
         getNodeRef: additionalNodesProps?.getNodeRef,
     });
 
     const {currentData, isFetching, error} = topNodesApi.useGetTopNodesQuery(
         {tenant: path, sortValue: 'Memory'},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
 
     const loading = isFetching && currentData === undefined;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
index 08b5a4795c..484b822cc8 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
@@ -1,6 +1,7 @@
 import {Loader} from '@gravity-ui/uikit';
 
 import {EntityStatus} from '../../../../components/EntityStatus/EntityStatus';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {TENANT_METRICS_TABS_IDS} from '../../../../store/reducers/tenant/constants';
 import {tenantApi} from '../../../../store/reducers/tenant/tenant';
 import {calculateTenantMetrics} from '../../../../store/reducers/tenants/utils';
@@ -31,12 +32,12 @@ export function TenantOverview({
     additionalNodesProps,
 }: TenantOverviewProps) {
     const {metricsTab} = useTypedSelector((state) => state.tenant);
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     const {currentData: tenant, isFetching} = tenantApi.useGetTenantInfoQuery(
         {path: tenantName},
         {
-            pollingInterval: autorefresh,
+            pollingInterval: autoRefreshInterval,
         },
     );
     const tenantLoading = isFetching && tenant === undefined;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopGroups.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopGroups.tsx
index 2dfbea04c7..a8b347a2d1 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopGroups.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopGroups.tsx
@@ -1,3 +1,4 @@
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import {topStorageGroupsApi} from '../../../../../store/reducers/tenantOverview/topStorageGroups/topStorageGroups';
 import {useSearchQuery, useTypedSelector} from '../../../../../utils/hooks';
@@ -17,13 +18,13 @@ interface TopGroupsProps {
 export function TopGroups({tenant}: TopGroupsProps) {
     const query = useSearchQuery();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     const columns = getStorageTopGroupsColumns();
 
     const {currentData, isFetching, error} = topStorageGroupsApi.useGetTopStorageGroupsQuery(
         {tenant},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && currentData === undefined;
     const topGroups = currentData;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx
index 06e8f935e2..51c486b029 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx
@@ -4,6 +4,7 @@ import {useLocation} from 'react-router';
 
 import {CellWithPopover} from '../../../../../components/CellWithPopover/CellWithPopover';
 import {LinkToSchemaObject} from '../../../../../components/LinkToSchemaObject/LinkToSchemaObject';
+import {selectAutoRefreshInterval} from '../../../../../store/reducers/autoRefreshControl';
 import {topTablesApi} from '../../../../../store/reducers/tenantOverview/executeTopTables/executeTopTables';
 import type {KeyValueRow} from '../../../../../types/api/query';
 import {formatBytes, getSizeWithSignificantDigits} from '../../../../../utils/bytesParsers';
@@ -24,11 +25,11 @@ const TOP_TABLES_COLUMNS_WIDTH_LS_KEY = 'topTablesTableColumnsWidth';
 export function TopTables({path}: TopTablesProps) {
     const location = useLocation();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     const {currentData, error, isFetching} = topTablesApi.useGetTopTablesQuery(
         {path},
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && currentData === undefined;
 
diff --git a/src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx b/src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx
index 1df62ea08f..466d2dbeb2 100644
--- a/src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx
+++ b/src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx
@@ -8,6 +8,7 @@ import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/Re
 import {Search} from '../../../../components/Search';
 import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
 import {parseQuery} from '../../../../routes';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {changeUserInput} from '../../../../store/reducers/executeQuery';
 import {
     setTopQueriesFilters,
@@ -44,7 +45,7 @@ export const TopQueries = ({path, type}: TopQueriesProps) => {
     const location = useLocation();
     const history = useHistory();
 
-    const {autorefresh} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
 
     const filters = useTypedSelector((state) => state.executeTopQueries);
     const {currentData, isFetching, error} = topQueriesApi.useGetTopQueriesQuery(
@@ -52,7 +53,7 @@ export const TopQueries = ({path, type}: TopQueriesProps) => {
             database: path,
             filters,
         },
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && currentData === undefined;
     const {result: data} = currentData || {};
diff --git a/src/containers/Tenant/Diagnostics/TopShards/TopShards.tsx b/src/containers/Tenant/Diagnostics/TopShards/TopShards.tsx
index e78b846f21..6a373d618b 100644
--- a/src/containers/Tenant/Diagnostics/TopShards/TopShards.tsx
+++ b/src/containers/Tenant/Diagnostics/TopShards/TopShards.tsx
@@ -6,6 +6,7 @@ import {useLocation} from 'react-router';
 
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {
     setShardsQueryFilters,
     shardApi,
@@ -94,7 +95,8 @@ export const TopShards = ({tenantPath, type}: TopShardsProps) => {
     const dispatch = useTypedDispatch();
     const location = useLocation();
 
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {currentSchemaPath} = useTypedSelector((state) => state.schema);
 
     const storeFilters = useTypedSelector((state) => state.shardsWorkload);
 
@@ -126,7 +128,7 @@ export const TopShards = ({tenantPath, type}: TopShardsProps) => {
             sortOrder: stringToQuerySortOrder(sortOrder),
             filters,
         },
-        {pollingInterval: autorefresh},
+        {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && result === undefined;
     const {result: data} = result ?? {};
diff --git a/src/containers/Tenant/Query/Preview/Preview.tsx b/src/containers/Tenant/Query/Preview/Preview.tsx
index 0b0f518595..193527973e 100644
--- a/src/containers/Tenant/Query/Preview/Preview.tsx
+++ b/src/containers/Tenant/Query/Preview/Preview.tsx
@@ -4,6 +4,7 @@ import {Button, Icon, Loader} from '@gravity-ui/uikit';
 import EnableFullscreenButton from '../../../../components/EnableFullscreenButton/EnableFullscreenButton';
 import Fullscreen from '../../../../components/Fullscreen/Fullscreen';
 import {QueryResultTable} from '../../../../components/QueryResultTable';
+import {selectAutoRefreshInterval} from '../../../../store/reducers/autoRefreshControl';
 import {previewApi} from '../../../../store/reducers/preview';
 import {setShowPreview} from '../../../../store/reducers/schema/schema';
 import type {EPathType} from '../../../../types/api/schema';
@@ -27,13 +28,14 @@ export const Preview = ({database, type}: PreviewProps) => {
 
     const isPreviewAvailable = isTableType(type);
 
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
+    const autoRefreshInterval = useTypedSelector(selectAutoRefreshInterval);
+    const {currentSchemaPath} = useTypedSelector((state) => state.schema);
     const isFullscreen = useTypedSelector((state) => state.fullscreen);
 
     const query = `--!syntax_v1\nselect * from \`${currentSchemaPath}\` limit 32`;
     const {currentData, isFetching, error} = previewApi.useSendQueryQuery(
         {database, query, action: isExternalTableType(type) ? 'execute-query' : 'execute-scan'},
-        {pollingInterval: autorefresh, skip: !isPreviewAvailable},
+        {pollingInterval: autoRefreshInterval, skip: !isPreviewAvailable},
     );
     const loading = isFetching && currentData === undefined;
     const data = currentData ?? {};
diff --git a/src/store/reducers/autoRefreshControl.ts b/src/store/reducers/autoRefreshControl.ts
new file mode 100644
index 0000000000..2e7bb54c9e
--- /dev/null
+++ b/src/store/reducers/autoRefreshControl.ts
@@ -0,0 +1,31 @@
+import type {Dispatch, PayloadAction} from '@reduxjs/toolkit';
+import {createSlice} from '@reduxjs/toolkit';
+
+import {settingsManager} from '../../services/settings';
+import {AUTO_REFRESH_INTERVAL} from '../../utils/constants';
+
+const autoRefreshLS = Number(settingsManager.readUserSettingsValue(AUTO_REFRESH_INTERVAL, 0));
+
+export const atoRefreshControlSlice = createSlice({
+    name: 'autoRefreshControl',
+    initialState: {
+        autoRefreshInterval: isNaN(autoRefreshLS) ? 0 : autoRefreshLS,
+    },
+    reducers: {
+        setAutoRefreshInterval: (state, action: PayloadAction<number>) => {
+            state.autoRefreshInterval = action.payload;
+        },
+    },
+    selectors: {
+        selectAutoRefreshInterval: (state) => state.autoRefreshInterval,
+    },
+});
+
+export function setAutoRefreshInterval(interval: number) {
+    return (dispatch: Dispatch) => {
+        settingsManager.setUserSettingsValue(AUTO_REFRESH_INTERVAL, interval);
+        dispatch(atoRefreshControlSlice.actions.setAutoRefreshInterval(interval));
+    };
+}
+
+export const {selectAutoRefreshInterval} = atoRefreshControlSlice.selectors;
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
index 66f0b49315..edf57c6a42 100644
--- a/src/store/reducers/index.ts
+++ b/src/store/reducers/index.ts
@@ -2,6 +2,7 @@ import {combineReducers} from '@reduxjs/toolkit';
 
 import {api} from './api';
 import authentication from './authentication/authentication';
+import {atoRefreshControlSlice} from './autoRefreshControl';
 import cluster from './cluster/cluster';
 import clusters from './clusters/clusters';
 import executeQuery from './executeQuery';
@@ -22,6 +23,7 @@ import tooltip from './tooltip';
 
 export const rootReducer = {
     [api.reducerPath]: api.reducer,
+    [atoRefreshControlSlice.reducerPath]: atoRefreshControlSlice.reducer,
     singleClusterMode,
     cluster,
     tenant,
diff --git a/src/store/reducers/schema/schema.ts b/src/store/reducers/schema/schema.ts
index 3074845de5..e2f92297ad 100644
--- a/src/store/reducers/schema/schema.ts
+++ b/src/store/reducers/schema/schema.ts
@@ -1,10 +1,8 @@
-import type {Dispatch, Reducer, Selector} from '@reduxjs/toolkit';
+import type {Reducer, Selector} from '@reduxjs/toolkit';
 import {createSelector} from '@reduxjs/toolkit';
 
 import {isEntityWithMergedImplementation} from '../../../containers/Tenant/utils/schema';
-import {settingsManager} from '../../../services/settings';
 import type {EPathType} from '../../../types/api/schema';
-import {AUTO_REFRESH_INTERVAL} from '../../../utils/constants';
 import {createApiRequest, createRequestActionTypes} from '../../utils';
 
 import type {
@@ -19,17 +17,13 @@ export const FETCH_SCHEMA = createRequestActionTypes('schema', 'FETCH_SCHEMA');
 const PRELOAD_SCHEMAS = 'schema/PRELOAD_SCHEMAS';
 const SET_SCHEMA = 'schema/SET_SCHEMA';
 const SET_SHOW_PREVIEW = 'schema/SET_SHOW_PREVIEW';
-export const SET_AUTOREFRESH_INTERVAL = 'schema/SET_AUTOREFRESH_INTERVAL';
 const RESET_LOADING_STATE = 'schema/RESET_LOADING_STATE';
 
-const autoRefreshLS = Number(settingsManager.readUserSettingsValue(AUTO_REFRESH_INTERVAL, 0));
-
 export const initialState = {
     loading: true,
     wasLoaded: false,
     data: {},
     currentSchemaPath: undefined,
-    autorefresh: isNaN(autoRefreshLS) ? 0 : autoRefreshLS,
     showPreview: false,
 };
 
@@ -91,12 +85,6 @@ const schema: Reducer<SchemaState, SchemaAction> = (state = initialState, action
                 currentSchemaPath: action.data,
             };
         }
-        case SET_AUTOREFRESH_INTERVAL: {
-            return {
-                ...state,
-                autorefresh: action.data,
-            };
-        }
         case SET_SHOW_PREVIEW: {
             return {
                 ...state,
@@ -139,15 +127,7 @@ export function setCurrentSchemaPath(currentSchemaPath: string) {
         data: currentSchemaPath,
     } as const;
 }
-export function setAutorefreshInterval(interval: number) {
-    return (dispatch: Dispatch) => {
-        settingsManager.setUserSettingsValue(AUTO_REFRESH_INTERVAL, interval);
-        dispatch({
-            type: SET_AUTOREFRESH_INTERVAL,
-            data: interval,
-        } as const);
-    };
-}
+
 export function setShowPreview(value: boolean) {
     return {
         type: SET_SHOW_PREVIEW,
diff --git a/src/store/reducers/schema/types.ts b/src/store/reducers/schema/types.ts
index 162f4c5cf2..ef0aa58b54 100644
--- a/src/store/reducers/schema/types.ts
+++ b/src/store/reducers/schema/types.ts
@@ -4,7 +4,6 @@ import type {ApiRequestAction} from '../../utils';
 
 import type {
     FETCH_SCHEMA,
-    SET_AUTOREFRESH_INTERVAL,
     preloadSchemas,
     resetLoadingState,
     setCurrentSchemaPath,
@@ -19,7 +18,6 @@ export interface SchemaState {
     data: SchemaData;
     currentSchema?: TEvDescribeSchemeResult;
     currentSchemaPath?: string;
-    autorefresh: number;
     showPreview: boolean;
     error?: IResponseError;
 }
@@ -40,7 +38,6 @@ export type SchemaAction =
     | SchemaApiRequestAction
     | (
           | ReturnType<typeof setCurrentSchemaPath>
-          | {type: typeof SET_AUTOREFRESH_INTERVAL; data: number}
           | ReturnType<typeof setShowPreview>
           | ReturnType<typeof preloadSchemas>
           | ReturnType<typeof resetLoadingState>

From c9746ee4b3c12d4d99cfa6f8bd06e98e9e838a96 Mon Sep 17 00:00:00 2001
From: Valerii Sidorenko <balepas@nebius.com>
Date: Tue, 25 Jun 2024 15:21:13 +0200
Subject: [PATCH 2/2] fix: typo

---
 src/store/reducers/autoRefreshControl.ts | 6 +++---
 src/store/reducers/index.ts              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/store/reducers/autoRefreshControl.ts b/src/store/reducers/autoRefreshControl.ts
index 2e7bb54c9e..67ecb90674 100644
--- a/src/store/reducers/autoRefreshControl.ts
+++ b/src/store/reducers/autoRefreshControl.ts
@@ -6,7 +6,7 @@ import {AUTO_REFRESH_INTERVAL} from '../../utils/constants';
 
 const autoRefreshLS = Number(settingsManager.readUserSettingsValue(AUTO_REFRESH_INTERVAL, 0));
 
-export const atoRefreshControlSlice = createSlice({
+export const autoRefreshControlSlice = createSlice({
     name: 'autoRefreshControl',
     initialState: {
         autoRefreshInterval: isNaN(autoRefreshLS) ? 0 : autoRefreshLS,
@@ -24,8 +24,8 @@ export const atoRefreshControlSlice = createSlice({
 export function setAutoRefreshInterval(interval: number) {
     return (dispatch: Dispatch) => {
         settingsManager.setUserSettingsValue(AUTO_REFRESH_INTERVAL, interval);
-        dispatch(atoRefreshControlSlice.actions.setAutoRefreshInterval(interval));
+        dispatch(autoRefreshControlSlice.actions.setAutoRefreshInterval(interval));
     };
 }
 
-export const {selectAutoRefreshInterval} = atoRefreshControlSlice.selectors;
+export const {selectAutoRefreshInterval} = autoRefreshControlSlice.selectors;
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
index edf57c6a42..73029d8c9a 100644
--- a/src/store/reducers/index.ts
+++ b/src/store/reducers/index.ts
@@ -2,7 +2,7 @@ import {combineReducers} from '@reduxjs/toolkit';
 
 import {api} from './api';
 import authentication from './authentication/authentication';
-import {atoRefreshControlSlice} from './autoRefreshControl';
+import {autoRefreshControlSlice} from './autoRefreshControl';
 import cluster from './cluster/cluster';
 import clusters from './clusters/clusters';
 import executeQuery from './executeQuery';
@@ -23,7 +23,7 @@ import tooltip from './tooltip';
 
 export const rootReducer = {
     [api.reducerPath]: api.reducer,
-    [atoRefreshControlSlice.reducerPath]: atoRefreshControlSlice.reducer,
+    [autoRefreshControlSlice.reducerPath]: autoRefreshControlSlice.reducer,
     singleClusterMode,
     cluster,
     tenant,