refactor: move selectedConsumer to partitions

Author: artemmufazalov

src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx

@@ -8,7 +8,6 @@ import {useAutofetcher, useTypedSelector, useSetting} from '../../../../utils/ho
 import {DEFAULT_TABLE_SETTINGS, PARTITIONS_HIDDEN_COLUMNS_KEY} from '../../../../utils/constants';
 
 import {getNodesList, selectNodesMap} from '../../../../store/reducers/nodesList';
-import {setSelectedConsumer} from '../../../../store/reducers/consumer';
 import {
     cleanTopicData,
     getTopic,
@@ -18,6 +17,7 @@ import {
 import {
     getPartitions,
     setDataWasNotLoaded as setPartitionsDataWasNotLoaded,
+    setSelectedConsumer,
 } from '../../../../store/reducers/partitions/partitions';
 
 import {TableSkeleton} from '../../../../components/TableSkeleton/TableSkeleton';
@@ -52,12 +52,12 @@ export const Partitions = ({path}: PartitionsProps) => {
     const consumers = useTypedSelector(selectConsumersNames);
     const nodesMap = useTypedSelector(selectNodesMap);
     const {autorefresh} = useTypedSelector((state) => state.schema);
-    const {selectedConsumer} = useTypedSelector((state) => state.consumer);
     const {
         loading: partitionsLoading,
         wasLoaded: partitionsWasLoaded,
         error: partitionsError,
         partitions: rawPartitions,
+        selectedConsumer,
     } = useTypedSelector((state) => state.partitions);
     const {
         loading: topicLoading,

src/store/reducers/consumer.ts

@@ -18,7 +18,6 @@ import pool from './pool';
 import tenants from './tenants/tenants';
 import tablet from './tablet';
 import topic from './topic';
-import consumer from './consumer';
 import partitions from './partitions/partitions';
 import executeQuery from './executeQuery';
 import explainQuery from './explainQuery';
@@ -59,7 +58,6 @@ export const rootReducer = {
     tenants,
     tablet,
     topic,
-    consumer,
     partitions,
     executeQuery,
     explainQuery,

src/store/reducers/index.ts

@@ -9,11 +9,13 @@ import {prepareConsumerPartitions, prepareTopicPartitions} from './utils';
 
 export const FETCH_PARTITIONS = createRequestActionTypes('partitions', 'FETCH_PARTITIONS');
 
+const SET_SELECTED_CONSUMER = 'partitions/SET_SELECTED_CONSUMER';
 const SET_DATA_WAS_NOT_LOADED = 'partitions/SET_DATA_WAS_NOT_LOADED';
 
 const initialState = {
     loading: false,
     wasLoaded: false,
+    selectedConsumer: undefined,
 };
 
 const partitions: Reducer<PartitionsState, PartitionsAction> = (state = initialState, action) => {
@@ -44,6 +46,12 @@ const partitions: Reducer<PartitionsState, PartitionsAction> = (state = initialS
                 loading: false,
             };
         }
+        case SET_SELECTED_CONSUMER: {
+            return {
+                ...state,
+                selectedConsumer: action.data,
+            };
+        }
         case SET_DATA_WAS_NOT_LOADED: {
             return {
                 ...state,
@@ -55,6 +63,13 @@ const partitions: Reducer<PartitionsState, PartitionsAction> = (state = initialS
     }
 };
 
+export const setSelectedConsumer = (value?: string) => {
+    return {
+        type: SET_SELECTED_CONSUMER,
+        data: value,
+    } as const;
+};
+
 export const setDataWasNotLoaded = () => {
     return {
         type: SET_DATA_WAS_NOT_LOADED,

src/store/reducers/partitions/partitions.ts

@@ -2,7 +2,7 @@ import type {IResponseError} from '../../../types/api/error';
 import type {IProcessSpeedStats} from '../../../utils/bytesParsers';
 import type {ApiRequestAction} from '../../utils';
 
-import {FETCH_PARTITIONS, setDataWasNotLoaded} from './partitions';
+import {FETCH_PARTITIONS, setDataWasNotLoaded, setSelectedConsumer} from './partitions';
 
 // Fields that could be undefined corresponds to partitions without consumers
 export interface PreparedPartitionData {
@@ -36,10 +36,12 @@ export interface PreparedPartitionData {
 export interface PartitionsState {
     loading: boolean;
     wasLoaded: boolean;
+    selectedConsumer: string | undefined;
     partitions?: PreparedPartitionData[];
     error?: IResponseError;
 }
 
 export type PartitionsAction =
     | ApiRequestAction<typeof FETCH_PARTITIONS, PreparedPartitionData[], IResponseError>
-    | ReturnType<typeof setDataWasNotLoaded>;
+    | ReturnType<typeof setDataWasNotLoaded>
+    | ReturnType<typeof setSelectedConsumer>;

src/store/reducers/partitions/types.ts

@@ -68,7 +68,7 @@ const paramSetup = {
             type: 'number',
         },
         selectedConsumer: {
-            stateKey: 'consumer.selectedConsumer',
+            stateKey: 'partitions.selectedConsumer',
         },
     },
 };