fixup refetching

kubeshop · Jul 31, 2023 · 1e7cd7c · 1e7cd7c
1 parent 1f46bf5
commit 1e7cd7c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/components/organisms/EntityDetails/EntityDetailsContent/EntityDetailsContent.tsx b/src/components/organisms/EntityDetails/EntityDetailsContent/EntityDetailsContent.tsx
@@ -2,7 +2,7 @@ import {useContext, useEffect, useState} from 'react';
 
 import {Select, Space, Tabs} from 'antd';
 
-import {BaseQueryFn, FetchBaseQueryError, MutationDefinition} from '@reduxjs/toolkit/dist/query';
+import {MutationDefinition} from '@reduxjs/toolkit/dist/query';
 import {MutationTrigger} from '@reduxjs/toolkit/dist/query/react/buildHooks';
 
 import {ExecutorIcon} from '@atoms';
@@ -69,10 +69,7 @@ const EntityDetailsContent: React.FC = () => {
   const [runTest] = useRunTestMutation();
   const [runTestSuite] = useRunTestSuiteMutation();
 
-  const runRequestsMap: Record<
-    Entity,
-    MutationTrigger<MutationDefinition<any, BaseQueryFn<any, unknown, FetchBaseQueryError>, never, void, string>>
-  > = {
+  const runRequestsMap: Record<Entity, MutationTrigger<MutationDefinition<any, any, any, void>>> = {
     'test-suites': runTestSuite,
     tests: runTest,
   };

diff --git a/src/components/organisms/EntityDetails/EntityDetailsContent/Settings/utils.ts b/src/components/organisms/EntityDetails/EntityDetailsContent/Settings/utils.ts
@@ -11,7 +11,7 @@ export const namingMap: Record<Entity, string> = {
   tests: 'test',
 };
 
-export const updateRequestsMap: Record<Entity, UseMutation<MutationDefinition<any, any, never, void>>> = {
+export const updateRequestsMap: Record<Entity, UseMutation<MutationDefinition<any, any, any, void>>> = {
   'test-suites': useUpdateTestSuiteMutation,
   tests: useUpdateTestMutation,
 };
diff --git a/src/components/organisms/EntityDetails/ExecutionDetailsDrawer/ExecutionDetailsDrawer.tsx b/src/components/organisms/EntityDetails/ExecutionDetailsDrawer/ExecutionDetailsDrawer.tsx
@@ -45,7 +45,7 @@ const ExecutionDetailsDrawer: React.FC = () => {
     pollingInterval: PollingIntervals.everySecond,
     skip: !isClusterAvailable || !id || isExecutionFinished(data),
   });
-  useExecutionDetailsSync({data: fetchedData, error});
+  useExecutionDetailsSync({data: fetchedData?.id === id ? fetchedData : null, error});
 
   const isMobile = useIsMobile();
 

diff --git a/src/utils/isExecutionFinished.ts b/src/utils/isExecutionFinished.ts
@@ -3,5 +3,5 @@ import {TestSuiteExecution} from '@models/testSuiteExecution';
 
 export function isExecutionFinished(data: TestSuiteExecution | Execution | null | undefined): boolean {
   const status = (data as Execution)?.executionResult?.status || (data as TestSuiteExecution)?.status;
-  return ['queued', 'pending', 'running'].includes(status);
+  return Boolean(status) && !['queued', 'pending', 'running'].includes(status);
 }