Skip to content

Commit 5d832fd

Browse files
authored
fix(Tablets): update filter (#2887)
1 parent f9c0269 commit 5d832fd

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

src/containers/Tablets/Tablets.tsx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,28 @@ import {skipToken} from '@reduxjs/toolkit/query';
44
import {isNil} from 'lodash';
55

66
import {selectTabletsWithFqdn, tabletsApi} from '../../store/reducers/tablets';
7+
import {ETabletState} from '../../types/api/tablet';
78
import type {TabletsApiRequestParams} from '../../types/store/tablets';
89
import {valueIsDefined} from '../../utils';
910
import {useAutoRefreshInterval, useTypedSelector} from '../../utils/hooks';
1011

1112
import {TabletsTable} from './TabletsTable';
1213

14+
const activeStatuses: ETabletState[] = [
15+
ETabletState.Created,
16+
ETabletState.ResolveStateStorage,
17+
ETabletState.Candidate,
18+
ETabletState.BlockBlobStorage,
19+
ETabletState.RebuildGraph,
20+
ETabletState.WriteZeroEntry,
21+
ETabletState.Restored,
22+
ETabletState.Discover,
23+
ETabletState.Lock,
24+
ETabletState.Active,
25+
ETabletState.ResolveLeader,
26+
ETabletState.Terminating,
27+
];
28+
1329
interface TabletsProps {
1430
path?: string;
1531
database?: string;
@@ -34,7 +50,7 @@ export function Tablets({
3450
const [autoRefreshInterval] = useAutoRefreshInterval();
3551

3652
let params: TabletsApiRequestParams = {};
37-
const filter = onlyActive ? `(State!=Dead)` : undefined;
53+
const filter = onlyActive ? `(State=[${activeStatuses.join(',')}])` : undefined;
3854

3955
const schemaPathParam = React.useMemo(() => {
4056
if (!isNil(path) && !isNil(databaseFullPath)) {

src/types/api/tablet.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export enum ETabletState {
118118
'ResolveLeader' = 'ResolveLeader',
119119
'Deleted' = 'Deleted',
120120
'Stopped' = 'Stopped',
121+
'Terminating' = 'Terminating',
121122
}
122123

123124
interface TBoundChannel {

src/utils/tablet.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const tabletStateToColorState: Record<ETabletState, EFlag> = {
1818
[ETabletState.Stopped]: EFlag.Yellow,
1919
[ETabletState.ResolveLeader]: EFlag.Yellow,
2020
[ETabletState.RebuildGraph]: EFlag.Yellow,
21+
[ETabletState.Terminating]: EFlag.Yellow,
2122

2223
[ETabletState.Deleted]: EFlag.Green,
2324
[ETabletState.Active]: EFlag.Green,

0 commit comments

Comments
 (0)