From 8af73d2026a6238b0740de435f9799e156b03427 Mon Sep 17 00:00:00 2001
From: Allison Villa <allvilla@gitlab.com>
Date: Mon, 15 Dec 2025 17:17:46 -0500
Subject: [PATCH] Add item hidden toast message when soft deleting

Resolve conflicts
---
 .../ai/catalog/pages/ai_catalog_agents_show.vue           | 5 ++++-
 .../ai/catalog/pages/ai_catalog_flows_show.vue            | 5 ++++-
 .../ai/catalog/pages/ai_catalog_agents_show_spec.js       | 8 ++++++++
 .../ai/catalog/pages/ai_catalog_flows_show_spec.js        | 8 ++++++++
 locale/gitlab.pot                                         | 6 ++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_agents_show.vue b/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_agents_show.vue
index 8be0d5a1734e0e..d10589fe1b1c29 100644
--- a/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_agents_show.vue
+++ b/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_agents_show.vue
@@ -275,7 +275,10 @@ export default {
           return;
         }
 
-        this.$toast.show(s__('AICatalog|Agent deleted.'));
+        const toastMessage = forceHardDelete
+          ? s__('AICatalog|Agent deleted.')
+          : s__('AICatalog|Agent hidden.');
+        this.$toast.show(toastMessage);
         this.$router.push({
           name: AI_CATALOG_AGENTS_ROUTE,
         });
diff --git a/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_flows_show.vue b/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_flows_show.vue
index a60caf9986595f..894bce357f0b85 100644
--- a/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_flows_show.vue
+++ b/ee/app/assets/javascripts/ai/catalog/pages/ai_catalog_flows_show.vue
@@ -269,7 +269,10 @@ export default {
           return;
         }
 
-        this.$toast.show(s__('AICatalog|Flow deleted.'));
+        const toastMessage = forceHardDelete
+          ? s__('AICatalog|Flow deleted.')
+          : s__('AICatalog|Flow hidden.');
+        this.$toast.show(toastMessage);
         this.$router.push({
           name: AI_CATALOG_FLOWS_ROUTE,
         });
diff --git a/ee/spec/frontend/ai/catalog/pages/ai_catalog_agents_show_spec.js b/ee/spec/frontend/ai/catalog/pages/ai_catalog_agents_show_spec.js
index 5bae4b585723b2..6a8068f7ad2a4a 100644
--- a/ee/spec/frontend/ai/catalog/pages/ai_catalog_agents_show_spec.js
+++ b/ee/spec/frontend/ai/catalog/pages/ai_catalog_agents_show_spec.js
@@ -326,6 +326,14 @@ describe('AiCatalogAgentsShow', () => {
         deleteAgent();
         await waitForPromises();
 
+        expect(mockToast.show).toHaveBeenCalledWith('Agent hidden.');
+      });
+
+      it('shows toast reading "Agent deleted" when forceHardDelete is true', async () => {
+        const deleteAgentWithHardDelete = () => findItemActions().props('deleteFn')(true);
+        deleteAgentWithHardDelete();
+        await waitForPromises();
+
         expect(mockToast.show).toHaveBeenCalledWith('Agent deleted.');
       });
     });
diff --git a/ee/spec/frontend/ai/catalog/pages/ai_catalog_flows_show_spec.js b/ee/spec/frontend/ai/catalog/pages/ai_catalog_flows_show_spec.js
index 44a97c918bf2c8..03413d2a0302af 100644
--- a/ee/spec/frontend/ai/catalog/pages/ai_catalog_flows_show_spec.js
+++ b/ee/spec/frontend/ai/catalog/pages/ai_catalog_flows_show_spec.js
@@ -325,6 +325,14 @@ describe('AiCatalogFlowsShow', () => {
         deleteFlow();
         await waitForPromises();
 
+        expect(mockToast.show).toHaveBeenCalledWith('Flow hidden.');
+      });
+
+      it('shows toast reading "Flow deleted" when forceHardDelete is true', async () => {
+        const deleteAgentWithHardDelete = () => findItemActions().props('deleteFn')(true);
+        deleteAgentWithHardDelete();
+        await waitForPromises();
+
         expect(mockToast.show).toHaveBeenCalledWith('Flow deleted.');
       });
     });
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d25dd49cba6772..39036b8908389e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2559,6 +2559,9 @@ msgstr ""
 msgid "AICatalog|Agent enabled in %{targetType}."
 msgstr ""
 
+msgid "AICatalog|Agent hidden."
+msgstr ""
+
 msgid "AICatalog|Agent is now at version %{newVersion}."
 msgstr ""
 
@@ -2871,6 +2874,9 @@ msgstr ""
 msgid "AICatalog|Flow enabled in %{targetType}."
 msgstr ""
 
+msgid "AICatalog|Flow hidden."
+msgstr ""
+
 msgid "AICatalog|Flow is now at version %{newVersion}."
 msgstr ""
 
-- 
GitLab