Skip to content

Commit 1e7cd7c

Browse files
committed
fixup refetching
1 parent 1f46bf5 commit 1e7cd7c

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

src/components/organisms/EntityDetails/EntityDetailsContent/EntityDetailsContent.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {useContext, useEffect, useState} from 'react';
22

33
import {Select, Space, Tabs} from 'antd';
44

5-
import {BaseQueryFn, FetchBaseQueryError, MutationDefinition} from '@reduxjs/toolkit/dist/query';
5+
import {MutationDefinition} from '@reduxjs/toolkit/dist/query';
66
import {MutationTrigger} from '@reduxjs/toolkit/dist/query/react/buildHooks';
77

88
import {ExecutorIcon} from '@atoms';
@@ -69,10 +69,7 @@ const EntityDetailsContent: React.FC = () => {
6969
const [runTest] = useRunTestMutation();
7070
const [runTestSuite] = useRunTestSuiteMutation();
7171

72-
const runRequestsMap: Record<
73-
Entity,
74-
MutationTrigger<MutationDefinition<any, BaseQueryFn<any, unknown, FetchBaseQueryError>, never, void, string>>
75-
> = {
72+
const runRequestsMap: Record<Entity, MutationTrigger<MutationDefinition<any, any, any, void>>> = {
7673
'test-suites': runTestSuite,
7774
tests: runTest,
7875
};

src/components/organisms/EntityDetails/EntityDetailsContent/Settings/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const namingMap: Record<Entity, string> = {
1111
tests: 'test',
1212
};
1313

14-
export const updateRequestsMap: Record<Entity, UseMutation<MutationDefinition<any, any, never, void>>> = {
14+
export const updateRequestsMap: Record<Entity, UseMutation<MutationDefinition<any, any, any, void>>> = {
1515
'test-suites': useUpdateTestSuiteMutation,
1616
tests: useUpdateTestMutation,
1717
};

src/components/organisms/EntityDetails/ExecutionDetailsDrawer/ExecutionDetailsDrawer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const ExecutionDetailsDrawer: React.FC = () => {
4545
pollingInterval: PollingIntervals.everySecond,
4646
skip: !isClusterAvailable || !id || isExecutionFinished(data),
4747
});
48-
useExecutionDetailsSync({data: fetchedData, error});
48+
useExecutionDetailsSync({data: fetchedData?.id === id ? fetchedData : null, error});
4949

5050
const isMobile = useIsMobile();
5151

src/utils/isExecutionFinished.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import {TestSuiteExecution} from '@models/testSuiteExecution';
33

44
export function isExecutionFinished(data: TestSuiteExecution | Execution | null | undefined): boolean {
55
const status = (data as Execution)?.executionResult?.status || (data as TestSuiteExecution)?.status;
6-
return ['queued', 'pending', 'running'].includes(status);
6+
return Boolean(status) && !['queued', 'pending', 'running'].includes(status);
77
}

0 commit comments

Comments
 (0)