From 35af584fce076aa2d2f4c56694666d61e5432610 Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Tue, 16 Sep 2025 11:56:31 +0300 Subject: [PATCH 1/3] fix(Tablets): update filter --- src/containers/Tablets/Tablets.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/containers/Tablets/Tablets.tsx b/src/containers/Tablets/Tablets.tsx index bd64b8fe36..73ad074393 100644 --- a/src/containers/Tablets/Tablets.tsx +++ b/src/containers/Tablets/Tablets.tsx @@ -34,7 +34,9 @@ export function Tablets({ const [autoRefreshInterval] = useAutoRefreshInterval(); let params: TabletsApiRequestParams = {}; - const filter = onlyActive ? `(State!=Dead)` : undefined; + const filter = onlyActive + ? `(State=[Created,ResolveStateStorage,Candidate,BlockBlobStorage,RebuildGraph,WriteZeroEntry,Restored,Discover,Lock,Active,ResolveLeader,Terminating])` + : undefined; const schemaPathParam = React.useMemo(() => { if (!isNil(path) && !isNil(databaseFullPath)) { From e1734c8b64de4edb039e65ddfb4bc2be4790a440 Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Tue, 16 Sep 2025 12:15:10 +0300 Subject: [PATCH 2/3] fix: review --- src/containers/Tablets/Tablets.tsx | 20 +++++++++++++++++--- src/types/api/tablet.ts | 1 + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/containers/Tablets/Tablets.tsx b/src/containers/Tablets/Tablets.tsx index 73ad074393..bef34e38af 100644 --- a/src/containers/Tablets/Tablets.tsx +++ b/src/containers/Tablets/Tablets.tsx @@ -4,12 +4,28 @@ import {skipToken} from '@reduxjs/toolkit/query'; import {isNil} from 'lodash'; import {selectTabletsWithFqdn, tabletsApi} from '../../store/reducers/tablets'; +import {ETabletState} from '../../types/api/tablet'; import type {TabletsApiRequestParams} from '../../types/store/tablets'; import {valueIsDefined} from '../../utils'; import {useAutoRefreshInterval, useTypedSelector} from '../../utils/hooks'; import {TabletsTable} from './TabletsTable'; +const activeStatuses: ETabletState[] = [ + ETabletState.Created, + ETabletState.ResolveStateStorage, + ETabletState.Candidate, + ETabletState.BlockBlobStorage, + ETabletState.RebuildGraph, + ETabletState.WriteZeroEntry, + ETabletState.Restored, + ETabletState.Discover, + ETabletState.Lock, + ETabletState.Active, + ETabletState.ResolveLeader, + ETabletState.Terminating, +]; + interface TabletsProps { path?: string; database?: string; @@ -34,9 +50,7 @@ export function Tablets({ const [autoRefreshInterval] = useAutoRefreshInterval(); let params: TabletsApiRequestParams = {}; - const filter = onlyActive - ? `(State=[Created,ResolveStateStorage,Candidate,BlockBlobStorage,RebuildGraph,WriteZeroEntry,Restored,Discover,Lock,Active,ResolveLeader,Terminating])` - : undefined; + const filter = onlyActive ? `(State=[${activeStatuses.join(',')}])` : undefined; const schemaPathParam = React.useMemo(() => { if (!isNil(path) && !isNil(databaseFullPath)) { diff --git a/src/types/api/tablet.ts b/src/types/api/tablet.ts index 7d5f49175e..891afe6eb7 100644 --- a/src/types/api/tablet.ts +++ b/src/types/api/tablet.ts @@ -118,6 +118,7 @@ export enum ETabletState { 'ResolveLeader' = 'ResolveLeader', 'Deleted' = 'Deleted', 'Stopped' = 'Stopped', + 'Terminating' = 'Terminating', } interface TBoundChannel { From 135c25aba1699d58dee2757123073191dab5e30f Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Tue, 16 Sep 2025 12:34:32 +0300 Subject: [PATCH 3/3] fix: typecheck --- src/utils/tablet.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/tablet.ts b/src/utils/tablet.ts index 9dea327fac..369283d12a 100644 --- a/src/utils/tablet.ts +++ b/src/utils/tablet.ts @@ -18,6 +18,7 @@ const tabletStateToColorState: Record = { [ETabletState.Stopped]: EFlag.Yellow, [ETabletState.ResolveLeader]: EFlag.Yellow, [ETabletState.RebuildGraph]: EFlag.Yellow, + [ETabletState.Terminating]: EFlag.Yellow, [ETabletState.Deleted]: EFlag.Green, [ETabletState.Active]: EFlag.Green,