From 9d7173fb5fe3ab08ff791e7d804c2cfb55dbaf9d Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Fri, 14 Jun 2024 00:32:23 +0300 Subject: [PATCH] fix(endpoints): show toaster on delete [EE-7170] (#11888) --- .../environments/ListView/ListView.tsx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/react/portainer/environments/ListView/ListView.tsx b/app/react/portainer/environments/ListView/ListView.tsx index f3801d083..633ff1556 100644 --- a/app/react/portainer/environments/ListView/ListView.tsx +++ b/app/react/portainer/environments/ListView/ListView.tsx @@ -1,5 +1,6 @@ import { useStore } from 'zustand'; +import { notifySuccess } from '@/portainer/services/notifications'; import { environmentStore } from '@/react/hooks/current-environment-store'; import { PageHeader } from '@@/PageHeader'; @@ -26,7 +27,7 @@ export function ListView() { ); - async function handleRemove(environments: Array) { + async function handleRemove(environmentsToDelete: Array) { const confirmed = await confirmDelete( 'This action will remove all configurations associated to your environment(s). Continue?' ); @@ -37,16 +38,24 @@ export function ListView() { const id = constCurrentEnvironmentStore.environmentId; // If the current endpoint was deleted, then clean endpoint store - if (environments.some((e) => e.Id === id)) { + if (environmentsToDelete.some((e) => e.Id === id)) { constCurrentEnvironmentStore.clear(); } deletionMutation.mutate( - environments.map((e) => ({ + environmentsToDelete.map((e) => ({ id: e.Id, deleteCluster: false, name: e.Name, - })) + })), + { + onSuccess() { + notifySuccess( + 'Environments successfully removed', + environmentsToDelete.map((e) => e.Name).join(', ') + ); + }, + } ); } }