mirror of https://github.com/portainer/portainer
fix(docker/network): send target nodeName when removing a network on swarm (#12000)
parent
3529a36f92
commit
566e37535f
|
@ -37,7 +37,12 @@ export function withInvalidate(
|
||||||
return {
|
return {
|
||||||
onSuccess() {
|
onSuccess() {
|
||||||
const promise = Promise.all(
|
const promise = Promise.all(
|
||||||
queryKeysToInvalidate.map((keys) => queryClient.invalidateQueries(keys))
|
queryKeysToInvalidate.map((keys) =>
|
||||||
|
queryClient.invalidateQueries(keys, {
|
||||||
|
refetchActive: false,
|
||||||
|
refetchInactive: false,
|
||||||
|
})
|
||||||
|
)
|
||||||
);
|
);
|
||||||
return skipRefresh
|
return skipRefresh
|
||||||
? undefined // don't wait for queries to refresh before setting state to success
|
? undefined // don't wait for queries to refresh before setting state to success
|
||||||
|
|
|
@ -100,7 +100,7 @@ export function ItemView() {
|
||||||
|
|
||||||
if (confirmed) {
|
if (confirmed) {
|
||||||
deleteNetworkMutation.mutate(
|
deleteNetworkMutation.mutate(
|
||||||
{ environmentId, networkId },
|
{ environmentId, networkId, nodeName },
|
||||||
{
|
{
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
router.stateService.go('docker.networks');
|
router.stateService.go('docker.networks');
|
||||||
|
|
|
@ -33,10 +33,20 @@ export async function getNetwork(
|
||||||
|
|
||||||
export async function deleteNetwork(
|
export async function deleteNetwork(
|
||||||
environmentId: EnvironmentId,
|
environmentId: EnvironmentId,
|
||||||
networkId: NetworkId
|
networkId: NetworkId,
|
||||||
|
{ nodeName }: { nodeName?: string } = {}
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
await axios.delete(buildUrl(environmentId, networkId));
|
await axios.delete(
|
||||||
|
buildUrl(environmentId, networkId),
|
||||||
|
nodeName
|
||||||
|
? {
|
||||||
|
headers: {
|
||||||
|
[agentTargetHeader]: nodeName,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
: undefined
|
||||||
|
);
|
||||||
return networkId;
|
return networkId;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw parseAxiosError(e as Error, 'Unable to remove network');
|
throw parseAxiosError(e as Error, 'Unable to remove network');
|
||||||
|
|
|
@ -42,10 +42,12 @@ export function useDeleteNetwork() {
|
||||||
({
|
({
|
||||||
environmentId,
|
environmentId,
|
||||||
networkId,
|
networkId,
|
||||||
|
nodeName,
|
||||||
}: {
|
}: {
|
||||||
environmentId: EnvironmentId;
|
environmentId: EnvironmentId;
|
||||||
networkId: NetworkId;
|
networkId: NetworkId;
|
||||||
}) => deleteNetwork(environmentId, networkId),
|
nodeName?: string;
|
||||||
|
}) => deleteNetwork(environmentId, networkId, { nodeName }),
|
||||||
{
|
{
|
||||||
onSuccess: (networkId) => {
|
onSuccess: (networkId) => {
|
||||||
notifySuccess('Network successfully removed', networkId);
|
notifySuccess('Network successfully removed', networkId);
|
||||||
|
|
|
@ -235,5 +235,6 @@
|
||||||
"browserslist": "last 2 versions",
|
"browserslist": "last 2 versions",
|
||||||
"msw": {
|
"msw": {
|
||||||
"workerDirectory": ".storybook/public"
|
"workerDirectory": ".storybook/public"
|
||||||
}
|
},
|
||||||
|
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue