Skip to content

Commit 4037a2e

Browse files
authored
stop order status polling when there is an error. (#1567)
1 parent d9d1a39 commit 4037a2e

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

src/components/content/common/queries/useLatestServiceOrderStatusQuery.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@ export function useLatestServiceOrderStatusQuery(
2525
};
2626
return getLatestServiceOrderStatus(data);
2727
},
28-
refetchInterval: (query) =>
29-
query.state.data && refetchUntilStates.includes(query.state.data.orderStatus as orderStatus)
30-
? false
31-
: deploymentStatusPollingInterval,
28+
refetchInterval: (query) => {
29+
if (
30+
!query.state.data ||
31+
query.state.error ||
32+
refetchUntilStates.includes(query.state.data.orderStatus as orderStatus)
33+
) {
34+
return false;
35+
}
36+
return deploymentStatusPollingInterval;
37+
},
3238
refetchIntervalInBackground: true,
3339
refetchOnWindowFocus: false,
3440
enabled: orderId !== undefined && isStartPolling,

src/components/content/deployedServices/myServices/MyServices.tsx

-5
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,14 @@ function MyServices(): React.JSX.Element {
292292
serviceDestroyQuery.isError,
293293
getDestroyServiceStatusPollingQuery.data?.isOrderCompleted,
294294
serviceRecreateRequest.isError,
295-
getRecreateServiceOrderStatusPollingQuery.isError,
296295
getRecreateServiceOrderStatusPollingQuery.data?.isOrderCompleted,
297296
serviceStateStartQuery.isError,
298-
getStartServiceDetailsQuery.isError,
299297
getStartServiceDetailsQuery.data?.isOrderCompleted,
300298
serviceStateStopQuery.isError,
301-
getStopServiceDetailsQuery.isError,
302299
getStopServiceDetailsQuery.data?.isOrderCompleted,
303300
serviceStateRestartQuery.isError,
304-
getRestartServiceDetailsQuery.isError,
305301
getRestartServiceDetailsQuery.data?.isOrderCompleted,
306302
redeployFailedDeploymentQuery.isError,
307-
getReDeployLatestServiceOrderStatusQuery.isError,
308303
getReDeployLatestServiceOrderStatusQuery.data?.isOrderCompleted,
309304
]);
310305

src/components/content/order/orderStatus/OrderSubmitStatusAlert.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ function OrderSubmitStatusAlert({
218218
) {
219219
return true;
220220
}
221+
222+
if (getSubmitLatestServiceOrderStatusQuery.isError) {
223+
return true;
224+
}
221225
return false;
222226
};
223227

0 commit comments

Comments
 (0)