fix: failed data loading/refreshing in TaskExecutionDetails (#142)

flyteorg · Jan 15, 2021 · 2a3875b · 2a3875b
1 parent dd62120
commit 2a3875b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/components/Executions/TaskExecutionDetails/TaskExecutionNodes.tsx b/src/components/Executions/TaskExecutionDetails/TaskExecutionNodes.tsx
@@ -13,7 +13,7 @@ import {
 } from 'models';
 import * as React from 'react';
 import { useQueryClient } from 'react-query';
-import { nodeExecutionIsTerminal } from '..';
+import { executionRefreshIntervalMs, nodeExecutionIsTerminal } from '..';
 import { NodeExecutionsRequestConfigContext } from '../contexts';
 import { ExecutionFilters } from '../ExecutionFilters';
 import { useNodeExecutionFiltersState } from '../filters/useExecutionFiltersState';
@@ -65,11 +65,18 @@ export const TaskExecutionNodes: React.FC<TaskExecutionNodesProps> = ({
     );
 
     const shouldEnableQuery = (executions: NodeExecution[]) =>
-        every(executions, nodeExecutionIsTerminal) &&
-        taskExecutionIsTerminal(taskExecution);
+        !every(executions, nodeExecutionIsTerminal) ||
+        !taskExecutionIsTerminal(taskExecution);
 
     const nodeExecutionsQuery = useConditionalQuery(
-        makeTaskExecutionChildListQuery(useQueryClient(), taskExecution.id, requestConfig),
+        {
+            ...makeTaskExecutionChildListQuery(
+                useQueryClient(),
+                taskExecution.id,
+                requestConfig
+            ),
+            refetchInterval: executionRefreshIntervalMs
+        },
         shouldEnableQuery
     );
 

diff --git a/src/components/hooks/useConditionalQuery.ts b/src/components/hooks/useConditionalQuery.ts
@@ -27,6 +27,8 @@ export function useConditionalQuery<
 ) {
     const queryClient = useQueryClient();
     const queryData = queryClient.getQueryData<TData>(options.queryKey);
-    const enabled = queryData === undefined ? true : shouldEnableFn(queryData);
-    return useQuery<TData, TError, TQueryFnData>({ ...options, enabled });
+    const enabled = queryData === undefined || shouldEnableFn(queryData);
+    const staleTime = enabled ? options.staleTime : Infinity;
+    const refetchInterval = enabled ? options.refetchInterval : false;
+    return useQuery<TData, TError, TQueryFnData>({ ...options, refetchInterval, staleTime });
 }