[Security solution] AI Assistant prompt clean up (elastic#217058)

Author: stephmilovic

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/api/prompts/bulk_update_prompts.ts

@@ -20,7 +20,7 @@ export const bulkUpdatePrompts = async (
   http: HttpSetup,
   prompts: PerformPromptsBulkActionRequestBody,
   toasts?: IToasts
-) => {
+): Promise<PerformPromptsBulkActionResponse | { success: false }> => {
   try {
     const result = await http.fetch<PerformPromptsBulkActionResponse>(
       ELASTIC_AI_ASSISTANT_PROMPTS_URL_BULK_ACTION,
@@ -56,5 +56,6 @@ export const bulkUpdatePrompts = async (
         },
       }),
     });
+    return { success: false };
   }
 };

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_modal/system_prompt_editor.tsx

@@ -55,8 +55,8 @@ export const SystemPromptEditorComponent: React.FC<Props> = ({
   // Prompt
   const promptContent = useMemo(
     // Fixing Cursor Jump in text area
-    () => systemPromptSettings.find((sp) => sp.id === selectedSystemPrompt?.id)?.content ?? '',
-    [selectedSystemPrompt?.id, systemPromptSettings]
+    () => selectedSystemPrompt?.content ?? '',
+    [selectedSystemPrompt?.content]
   );
   // Conversations this system prompt should be a default for
   const conversationOptions = useMemo(() => Object.values(conversations), [conversations]);

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_settings_management/index.tsx

@@ -111,15 +111,17 @@ const SystemPromptSettingsManagementComponent = ({ connectors, defaultConnector
 
   const handleSave = useCallback(
     async (param?: { callback?: () => void }) => {
-      const { conversationUpdates } = await saveSystemPromptSettings();
-      await saveConversationsSettings(conversationUpdates);
-      await refetchPrompts();
-      await refetchSystemPromptConversations();
-      toasts?.addSuccess({
-        iconType: 'check',
-        title: SETTINGS_UPDATED_TOAST_TITLE,
-      });
-      param?.callback?.();
+      const { success, conversationUpdates } = await saveSystemPromptSettings();
+      if (success) {
+        await saveConversationsSettings(conversationUpdates);
+        await refetchPrompts();
+        await refetchSystemPromptConversations();
+        toasts?.addSuccess({
+          iconType: 'check',
+          title: SETTINGS_UPDATED_TOAST_TITLE,
+        });
+        param?.callback?.();
+      }
     },
     [
       refetchPrompts,

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompt_settings/quick_prompt_editor.tsx

@@ -44,8 +44,8 @@ const QuickPromptSettingsEditorComponent = ({
   // Prompt
   const promptContent = useMemo(
     // Fixing Cursor Jump in text area
-    () => quickPromptSettings.find((p) => p.id === selectedQuickPrompt?.id)?.content ?? '',
-    [selectedQuickPrompt?.id, quickPromptSettings]
+    () => selectedQuickPrompt?.content ?? '',
+    [selectedQuickPrompt?.content]
   );
 
   const setDefaultPromptColor = useCallback((): string => {

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompt_settings_management/index.tsx

@@ -51,16 +51,19 @@ const QuickPromptSettingsManagementComponent = () => {
     currentAppId,
     http,
     promptsLoaded,
+    toasts,
   });
 
   const handleSave = useCallback(
     async (param?: { callback?: () => void }) => {
-      await saveQuickPromptSettings();
-      toasts?.addSuccess({
-        iconType: 'check',
-        title: SETTINGS_UPDATED_TOAST_TITLE,
-      });
-      param?.callback?.();
+      const didSucceed = await saveQuickPromptSettings();
+      if (didSucceed) {
+        toasts?.addSuccess({
+          iconType: 'check',
+          title: SETTINGS_UPDATED_TOAST_TITLE,
+        });
+        param?.callback?.();
+      }
     },
     [saveQuickPromptSettings, toasts]
   );

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/use_settings_updater/use_quick_prompt_updater.test.ts

@@ -8,9 +8,17 @@
 import { renderHook, act } from '@testing-library/react';
 import { HttpSetup } from '@kbn/core-http-browser';
 import { useQuickPromptUpdater } from './use_quick_prompt_updater';
-import { FindPromptsResponse, PromptResponse } from '@kbn/elastic-assistant-common';
-
+import { FindPromptsResponse, PromptResponse, PromptTypeEnum } from '@kbn/elastic-assistant-common';
+import { bulkUpdatePrompts } from '../../../..';
+import { IToasts } from '@kbn/core-notifications-browser';
 const mockHttp = {} as HttpSetup;
+jest.mock('../../../..');
+jest.mock('../../quick_prompts/quick_prompt_settings/helpers', () => {
+  return {
+    getRandomEuiColor: jest.fn(() => '#61A2FF'),
+  };
+});
+const mockBulkUpdatePrompts = bulkUpdatePrompts as jest.Mock;
 const quickPrompt: PromptResponse = {
   timestamp: '2025-02-24T18:13:51.851Z',
   users: [{ id: 'u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0', name: 'elastic' }],
@@ -57,11 +65,19 @@ const mockAllPrompts: FindPromptsResponse = {
     },
   ],
 };
+const mockToasts = {
+  addSuccess: jest.fn(),
+  addDanger: jest.fn(),
+} as unknown as IToasts;
 
 describe('useQuickPromptUpdater', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
   it('should initialize with quick prompts', () => {
     const { result } = renderHook(() =>
       useQuickPromptUpdater({
+        toasts: mockToasts,
         allPrompts: mockAllPrompts,
         currentAppId: 'securitySolutionUI',
         http: mockHttp,
@@ -76,6 +92,7 @@ describe('useQuickPromptUpdater', () => {
   it('should select a quick prompt by id', () => {
     const { result } = renderHook(() =>
       useQuickPromptUpdater({
+        toasts: mockToasts,
         allPrompts: mockAllPrompts,
         currentAppId: 'securitySolutionUI',
         http: mockHttp,
@@ -93,6 +110,7 @@ describe('useQuickPromptUpdater', () => {
   it('should add a new quick prompt when selecting by name', () => {
     const { result } = renderHook(() =>
       useQuickPromptUpdater({
+        toasts: mockToasts,
         allPrompts: mockAllPrompts,
         currentAppId: 'securitySolutionUI',
         http: mockHttp,
@@ -104,13 +122,21 @@ describe('useQuickPromptUpdater', () => {
       result.current.onQuickPromptSelect('New Quick Prompt');
     });
 
-    expect(result.current.quickPromptSettings).toHaveLength(3);
-    expect(result.current.quickPromptSettings[2].name).toBe('New Quick Prompt');
+    expect(result.current.selectedQuickPrompt).toEqual({
+      name: 'New Quick Prompt',
+      id: '',
+      content: '',
+      color: '#61A2FF',
+      categories: [],
+      promptType: PromptTypeEnum.quick,
+      consumer: 'securitySolutionUI',
+    });
   });
 
   it('should change the content of a selected quick prompt', () => {
     const { result } = renderHook(() =>
       useQuickPromptUpdater({
+        toasts: mockToasts,
         allPrompts: mockAllPrompts,
         currentAppId: 'securitySolutionUI',
         http: mockHttp,
@@ -132,6 +158,7 @@ describe('useQuickPromptUpdater', () => {
   it('should update prompt color', () => {
     const { result } = renderHook(() =>
       useQuickPromptUpdater({
+        toasts: mockToasts,
         allPrompts: mockAllPrompts,
         currentAppId: 'securitySolutionUI',
         http: mockHttp,
@@ -156,6 +183,7 @@ describe('useQuickPromptUpdater', () => {
   it('should reset quick prompt settings', () => {
     const { result } = renderHook(() =>
       useQuickPromptUpdater({
+        toasts: mockToasts,
         allPrompts: mockAllPrompts,
         currentAppId: 'securitySolutionUI',
         http: mockHttp,
@@ -167,12 +195,101 @@ describe('useQuickPromptUpdater', () => {
       result.current.onQuickPromptSelect('New Quick Prompt');
     });
 
-    expect(result.current.quickPromptSettings).toHaveLength(3);
+    expect(result.current.selectedQuickPrompt?.name).toEqual('New Quick Prompt');
 
     act(() => {
       result.current.resetQuickPromptSettings();
     });
+    expect(result.current.selectedQuickPrompt).toEqual(undefined);
+  });
+  it('should delete a quick prompt by id', async () => {
+    const { result } = renderHook(() =>
+      useQuickPromptUpdater({
+        toasts: mockToasts,
+        allPrompts: mockAllPrompts,
+        currentAppId: 'securitySolutionUI',
+        http: mockHttp,
+        promptsLoaded: true,
+      })
+    );
 
-    expect(result.current.quickPromptSettings).toHaveLength(2);
+    act(() => {
+      result.current.onQuickPromptDelete('OZ4qOZUBqnYEVX-cWulv');
+    });
+    await act(async () => {
+      await result.current.saveQuickPromptSettings();
+    });
+
+    expect(mockBulkUpdatePrompts).toHaveBeenCalledWith(
+      mockHttp,
+      {
+        delete: { ids: ['OZ4qOZUBqnYEVX-cWulv'] },
+      },
+      mockToasts
+    );
+  });
+
+  it('should change the context of a selected quick prompt', () => {
+    const { result } = renderHook(() =>
+      useQuickPromptUpdater({
+        toasts: mockToasts,
+        allPrompts: mockAllPrompts,
+        currentAppId: 'securitySolutionUI',
+        http: mockHttp,
+        promptsLoaded: true,
+      })
+    );
+
+    act(() => {
+      result.current.onQuickPromptSelect('OZ4qOZUBqnYEVX-cWulv');
+    });
+
+    act(() => {
+      result.current.onQuickPromptContextChange([
+        { category: 'new-category', description: 'text', tooltip: 'hi' },
+      ]);
+    });
+
+    expect(result.current.selectedQuickPrompt?.categories).toEqual(['new-category']);
+  });
+
+  it('should save quick prompt settings', async () => {
+    const { result } = renderHook(() =>
+      useQuickPromptUpdater({
+        toasts: mockToasts,
+        allPrompts: mockAllPrompts,
+        currentAppId: 'securitySolutionUI',
+        http: mockHttp,
+        promptsLoaded: true,
+      })
+    );
+
+    act(() => {
+      result.current.onQuickPromptSelect('OZ4qOZUBqnYEVX-cWulv');
+    });
+
+    act(() => {
+      result.current.onPromptContentChange('Updated content');
+    });
+    await act(async () => {
+      await result.current.saveQuickPromptSettings();
+    });
+    expect(mockBulkUpdatePrompts).toHaveBeenCalledWith(
+      mockHttp,
+      {
+        create: [
+          {
+            categories: [],
+            color: '#61A2FF',
+            consumer: 'securitySolutionUI',
+            content: 'Updated content',
+            id: '',
+            name: 'OZ4qOZUBqnYEVX-cWulv',
+            promptType: 'quick',
+          },
+        ],
+      },
+      mockToasts
+    );
   });
 });