Skip to content

Commit 41ac831

Browse files
committed
fix review
1 parent c4c4668 commit 41ac831

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/store/reducers/capabilities/capabilities.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ export async function queryCapability(
3838
) {
3939
const thunk = capabilitiesApi.util.getRunningQueryThunk('getClusterCapabilities', undefined);
4040
await dispatch(thunk);
41-
const capabilityVersion =
42-
capabilitiesApi.endpoints.getClusterCapabilities.select(undefined)(getState() as any).data
43-
?.Capabilities?.[capability] || 0;
44-
return capabilityVersion;
41+
42+
return selectCapabilityVersion(getState(), capability) || 0;
4543
}

src/store/reducers/pdisk/pdisk.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type {TPDiskInfoResponse} from '../../../types/api/pdisk';
22
import {getPDiskId} from '../../../utils/disks/helpers';
3+
import type {GetState} from '../../defaultStore';
34
import {api} from '../api';
45
import {queryCapability} from '../capabilities/capabilities';
56

@@ -14,9 +15,11 @@ export const pDiskApi = api.injectEndpoints({
1415
endpoints: (build) => ({
1516
getPdiskInfo: build.query({
1617
queryFn: async ({nodeId, pDiskId}: PDiskParams, {signal, getState, dispatch}) => {
17-
const newApiAvailable =
18-
(await queryCapability('/pdisk/info', {getState: getState as any, dispatch})) >
19-
0;
18+
const pDiskInfoHandlerVersion = await queryCapability('/pdisk/info', {
19+
getState: getState as GetState,
20+
dispatch,
21+
});
22+
const newApiAvailable = pDiskInfoHandlerVersion > 0;
2023

2124
let diskInfoPromise: Promise<TPDiskInfoResponse>;
2225
if (newApiAvailable) {
@@ -27,7 +30,12 @@ export const pDiskApi = api.injectEndpoints({
2730
.then((result) => {
2831
if (result.PDiskStateInfo) {
2932
return {
30-
Whiteboard: {PDisk: result.PDiskStateInfo[0]},
33+
Whiteboard: {
34+
PDisk: {
35+
...result.PDiskStateInfo[0],
36+
ExpectedSlotCount: undefined,
37+
},
38+
},
3139
};
3240
}
3341
return {};

0 commit comments

Comments
 (0)