diff --git a/api_docs/kbn_elastic_assistant.devdocs.json b/api_docs/kbn_elastic_assistant.devdocs.json index 2fb9147905166..6421522b93d7f 100644 --- a/api_docs/kbn_elastic_assistant.devdocs.json +++ b/api_docs/kbn_elastic_assistant.devdocs.json @@ -1445,17 +1445,6 @@ "path": "x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx", "deprecated": false, "trackAdoption": false - }, - { - "parentPluginId": "@kbn/elastic-assistant", - "id": "def-public.AssistantAvailability.isStarterPromptsEnabled", - "type": "boolean", - "tags": [], - "label": "isStarterPromptsEnabled", - "description": [], - "path": "x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx", - "deprecated": false, - "trackAdoption": false } ], "initialIsOpen": false @@ -2814,17 +2803,6 @@ "path": "x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts", "deprecated": false, "trackAdoption": false - }, - { - "parentPluginId": "@kbn/elastic-assistant", - "id": "def-public.UseAssistantAvailability.isStarterPromptsEnabled", - "type": "boolean", - "tags": [], - "label": "isStarterPromptsEnabled", - "description": [], - "path": "x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts", - "deprecated": false, - "trackAdoption": false } ], "initialIsOpen": false @@ -3259,4 +3237,4 @@ "misc": [], "objects": [] } -} \ No newline at end of file +} diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/api/security_ai_prompts/use_find_prompts.ts b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/api/security_ai_prompts/use_find_prompts.ts index 7faac2cd63542..a2564313943b0 100644 --- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/api/security_ai_prompts/use_find_prompts.ts +++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/api/security_ai_prompts/use_find_prompts.ts @@ -39,7 +39,7 @@ export const useFindPrompts = (payload: UseFindPromptsParams) => { const { isAssistantEnabled, httpFetch, toasts } = payload.context; const QUERY = { - connector_id: payload.params.connector_id, + ...(payload.params.connector_id ? { connector_id: payload.params.connector_id } : {}), prompt_ids: payload.params.prompt_ids, prompt_group_id: payload.params.prompt_group_id, }; diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/assistant_body/empty_convo.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/assistant_body/empty_convo.tsx index 50e8cadc199ab..98a9e2071a99d 100644 --- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/assistant_body/empty_convo.tsx +++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/assistant_body/empty_convo.tsx @@ -11,7 +11,6 @@ import { css } from '@emotion/react'; import { PromptResponse } from '@kbn/elastic-assistant-common'; import { AssistantBeacon } from '@kbn/ai-assistant-icon'; import { useVerticalBreakpoint } from './use_vertical_breakpoint'; -import { useAssistantContext } from '../../..'; import { StarterPrompts } from './starter_prompts'; import { SystemPrompt } from '../prompt_editor/system_prompt'; import { SetupKnowledgeBaseButton } from '../../knowledge_base/setup_knowledge_base_button'; @@ -39,7 +38,6 @@ export const EmptyConvo: React.FC = ({ setIsSettingsModalVisible, setUserPrompt, }) => { - const { assistantAvailability } = useAssistantContext(); const breakpoint = useVerticalBreakpoint(); const compressed = useMemo(() => breakpoint !== 'tall', [breakpoint]); return ( @@ -89,15 +87,13 @@ export const EmptyConvo: React.FC = ({ - {assistantAvailability.isStarterPromptsEnabled && ( - - - - )} + + + ); }; diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx index 75093c14f18c0..3229a60269d62 100644 --- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx +++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx @@ -78,7 +78,6 @@ export interface AssistantAvailability { hasUpdateAIAssistantAnonymization: boolean; // When true, user has `Edit` privilege for `Global Knowledge Base` hasManageGlobalKnowledgeBase: boolean; - isStarterPromptsEnabled: boolean; } export type GetAssistantMessages = (commentArgs: { diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/test_providers/test_providers.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/test_providers/test_providers.tsx index 61a1ebd898d84..688654e997b06 100644 --- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/test_providers/test_providers.tsx +++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/test_providers/test_providers.tsx @@ -42,7 +42,6 @@ export const mockAssistantAvailability: AssistantAvailability = { hasUpdateAIAssistantAnonymization: true, hasManageGlobalKnowledgeBase: true, isAssistantEnabled: true, - isStarterPromptsEnabled: true, isAssistantVisible: true, }; diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts b/x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts index 5e1bd59b3fe7d..f93e7c149cb34 100644 --- a/x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts +++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts @@ -203,6 +203,4 @@ export interface UseAssistantAvailability { hasUpdateAIAssistantAnonymization: boolean; // When true, user has `Edit` privilege for `Global Knowledge Base` hasManageGlobalKnowledgeBase: boolean; - // remove once product has signed off on prompt text - isStarterPromptsEnabled: boolean; } diff --git a/x-pack/solutions/security/packages/ecs-data-quality-dashboard/impl/data_quality_panel/mock/test_providers/test_providers.tsx b/x-pack/solutions/security/packages/ecs-data-quality-dashboard/impl/data_quality_panel/mock/test_providers/test_providers.tsx index 0966a682a0bc4..5728d0c52385f 100644 --- a/x-pack/solutions/security/packages/ecs-data-quality-dashboard/impl/data_quality_panel/mock/test_providers/test_providers.tsx +++ b/x-pack/solutions/security/packages/ecs-data-quality-dashboard/impl/data_quality_panel/mock/test_providers/test_providers.tsx @@ -59,7 +59,6 @@ const TestExternalProvidersComponent: React.FC = ({ hasUpdateAIAssistantAnonymization: true, hasManageGlobalKnowledgeBase: true, isAssistantEnabled: true, - isStarterPromptsEnabled: true, isAssistantVisible: true, }; const queryClient = new QueryClient({ diff --git a/x-pack/solutions/security/plugins/elastic_assistant/public/src/context/assistant_context/assistant_provider.test.tsx b/x-pack/solutions/security/plugins/elastic_assistant/public/src/context/assistant_context/assistant_provider.test.tsx index 4f307e702ef60..81701a798c7e0 100644 --- a/x-pack/solutions/security/plugins/elastic_assistant/public/src/context/assistant_context/assistant_provider.test.tsx +++ b/x-pack/solutions/security/plugins/elastic_assistant/public/src/context/assistant_context/assistant_provider.test.tsx @@ -66,7 +66,6 @@ describe('AssistantProvider', () => { hasSearchAILakeConfigurations: expect.any(Boolean), hasUpdateAIAssistantAnonymization: expect.any(Boolean), isAssistantEnabled: expect.any(Boolean), - isStarterPromptsEnabled: expect.any(Boolean), isAssistantVisible: expect.any(Boolean), }), assistantFeatures: expect.objectContaining({ diff --git a/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.test.ts b/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.test.ts index 7582504f29405..fa26139b76dfa 100644 --- a/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.test.ts +++ b/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.test.ts @@ -75,7 +75,6 @@ describe('useAssistantAvailability', () => { hasConnectorsReadPrivilege: true, isAssistantEnabled: true, isAssistantVisible: true, - isStarterPromptsEnabled: true, hasUpdateAIAssistantAnonymization: true, hasManageGlobalKnowledgeBase: true, }); @@ -128,7 +127,6 @@ describe('useAssistantAvailability', () => { hasConnectorsReadPrivilege: true, isAssistantEnabled: true, isAssistantVisible: false, - isStarterPromptsEnabled: true, hasUpdateAIAssistantAnonymization: true, hasManageGlobalKnowledgeBase: true, }); @@ -174,7 +172,6 @@ describe('useAssistantAvailability', () => { hasConnectorsReadPrivilege: false, isAssistantEnabled: false, isAssistantVisible: false, - isStarterPromptsEnabled: false, hasUpdateAIAssistantAnonymization: false, hasManageGlobalKnowledgeBase: false, }); @@ -220,7 +217,6 @@ describe('useAssistantAvailability', () => { hasConnectorsReadPrivilege: true, isAssistantEnabled: true, isAssistantVisible: true, - isStarterPromptsEnabled: true, hasUpdateAIAssistantAnonymization: false, hasManageGlobalKnowledgeBase: false, }); @@ -251,7 +247,6 @@ describe('useAssistantAvailability', () => { hasConnectorsReadPrivilege: false, isAssistantEnabled: true, isAssistantVisible: true, - isStarterPromptsEnabled: true, hasUpdateAIAssistantAnonymization: false, hasManageGlobalKnowledgeBase: false, }); diff --git a/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.ts b/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.ts index 699e00d81c4cb..6dbf97c52bd57 100644 --- a/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.ts +++ b/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.ts @@ -13,13 +13,11 @@ import { useKibana } from '../../context/typed_kibana_context/typed_kibana_conte import { useLicense } from '../licence/use_licence'; import { useIsNavControlVisible } from '../is_nav_control_visible/use_is_nav_control_visible'; -export const STARTER_PROMPTS_FEATURE_FLAG = 'elasticAssistant.starterPromptsEnabled' as const; export const useAssistantAvailability = (): UseAssistantAvailability => { const { isVisible } = useIsNavControlVisible(); const isEnterprise = useLicense().isEnterprise(); const { application: { capabilities }, - featureFlags, } = useKibana().services; const hasAssistantPrivilege = capabilities[ASSISTANT_FEATURE_ID]?.['ai-assistant'] === true; @@ -39,14 +37,11 @@ export const useAssistantAvailability = (): UseAssistantAvailability => { capabilities.actions?.delete === true && capabilities.actions?.save === true; - const isStarterPromptsEnabled = featureFlags.getBooleanValue(STARTER_PROMPTS_FEATURE_FLAG, false); - return { hasSearchAILakeConfigurations, hasAssistantPrivilege, hasConnectorsAllPrivilege, hasConnectorsReadPrivilege, - isStarterPromptsEnabled, isAssistantEnabled: isEnterprise, isAssistantVisible: isEnterprise && isVisible, hasUpdateAIAssistantAnonymization, diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/mock/mock_assistant_provider.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/mock/mock_assistant_provider.tsx index 8f4374ad1bf89..a595668c146d6 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/mock/mock_assistant_provider.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/mock/mock_assistant_provider.tsx @@ -41,7 +41,6 @@ export const MockAssistantProviderComponent: React.FC = ({ hasManageGlobalKnowledgeBase: true, isAssistantEnabled: true, isAssistantVisible: true, - isStarterPromptsEnabled: true, }; const chrome = chromeServiceMock.createStartContract(); chrome.getChromeStyle$.mockReturnValue(of('classic'));