diff --git a/app/react-tools/react-query.ts b/app/react-tools/react-query.ts index 1e9ae125b..d4e1482d0 100644 --- a/app/react-tools/react-query.ts +++ b/app/react-tools/react-query.ts @@ -37,7 +37,12 @@ export function withInvalidate( return { onSuccess() { const promise = Promise.all( - queryKeysToInvalidate.map((keys) => queryClient.invalidateQueries(keys)) + queryKeysToInvalidate.map((keys) => + queryClient.invalidateQueries(keys, { + refetchActive: false, + refetchInactive: false, + }) + ) ); return skipRefresh ? undefined // don't wait for queries to refresh before setting state to success diff --git a/app/react/docker/networks/ItemView/ItemView.tsx b/app/react/docker/networks/ItemView/ItemView.tsx index a7c396d14..bb753f819 100644 --- a/app/react/docker/networks/ItemView/ItemView.tsx +++ b/app/react/docker/networks/ItemView/ItemView.tsx @@ -100,7 +100,7 @@ export function ItemView() { if (confirmed) { deleteNetworkMutation.mutate( - { environmentId, networkId }, + { environmentId, networkId, nodeName }, { onSuccess: () => { router.stateService.go('docker.networks'); diff --git a/app/react/docker/networks/network.service.ts b/app/react/docker/networks/network.service.ts index 2aa4ca9f1..74c56ee5b 100644 --- a/app/react/docker/networks/network.service.ts +++ b/app/react/docker/networks/network.service.ts @@ -33,10 +33,20 @@ export async function getNetwork( export async function deleteNetwork( environmentId: EnvironmentId, - networkId: NetworkId + networkId: NetworkId, + { nodeName }: { nodeName?: string } = {} ) { try { - await axios.delete(buildUrl(environmentId, networkId)); + await axios.delete( + buildUrl(environmentId, networkId), + nodeName + ? { + headers: { + [agentTargetHeader]: nodeName, + }, + } + : undefined + ); return networkId; } catch (e) { throw parseAxiosError(e as Error, 'Unable to remove network'); diff --git a/app/react/docker/networks/queries.ts b/app/react/docker/networks/queries.ts index e6a25666b..5b18ecbc3 100644 --- a/app/react/docker/networks/queries.ts +++ b/app/react/docker/networks/queries.ts @@ -42,10 +42,12 @@ export function useDeleteNetwork() { ({ environmentId, networkId, + nodeName, }: { environmentId: EnvironmentId; networkId: NetworkId; - }) => deleteNetwork(environmentId, networkId), + nodeName?: string; + }) => deleteNetwork(environmentId, networkId, { nodeName }), { onSuccess: (networkId) => { notifySuccess('Network successfully removed', networkId); diff --git a/package.json b/package.json index 9935c9b72..498f15871 100644 --- a/package.json +++ b/package.json @@ -235,5 +235,6 @@ "browserslist": "last 2 versions", "msw": { "workerDirectory": ".storybook/public" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" }