Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions api_docs/kbn_elastic_assistant.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3259,4 +3237,4 @@
"misc": [],
"objects": []
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -39,7 +38,6 @@ export const EmptyConvo: React.FC<Props> = ({
setIsSettingsModalVisible,
setUserPrompt,
}) => {
const { assistantAvailability } = useAssistantContext();
const breakpoint = useVerticalBreakpoint();
const compressed = useMemo(() => breakpoint !== 'tall', [breakpoint]);
return (
Expand Down Expand Up @@ -89,15 +87,13 @@ export const EmptyConvo: React.FC<Props> = ({
</EuiFlexGroup>
</EuiPanel>
</EuiFlexItem>
{assistantAvailability.isStarterPromptsEnabled && (
<EuiFlexItem grow={false} css={starterPromptWrapperClassName}>
<StarterPrompts
compressed={compressed}
connectorId={connectorId}
setUserPrompt={setUserPrompt}
/>
</EuiFlexItem>
)}
<EuiFlexItem grow={false} css={starterPromptWrapperClassName}>
<StarterPrompts
compressed={compressed}
connectorId={connectorId}
setUserPrompt={setUserPrompt}
/>
</EuiFlexItem>
</EuiFlexGroup>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export const mockAssistantAvailability: AssistantAvailability = {
hasUpdateAIAssistantAnonymization: true,
hasManageGlobalKnowledgeBase: true,
isAssistantEnabled: true,
isStarterPromptsEnabled: true,
isAssistantVisible: true,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ const TestExternalProvidersComponent: React.FC<TestExternalProvidersProps> = ({
hasUpdateAIAssistantAnonymization: true,
hasManageGlobalKnowledgeBase: true,
isAssistantEnabled: true,
isStarterPromptsEnabled: true,
isAssistantVisible: true,
};
const queryClient = new QueryClient({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ describe('useAssistantAvailability', () => {
hasConnectorsReadPrivilege: true,
isAssistantEnabled: true,
isAssistantVisible: true,
isStarterPromptsEnabled: true,
hasUpdateAIAssistantAnonymization: true,
hasManageGlobalKnowledgeBase: true,
});
Expand Down Expand Up @@ -128,7 +127,6 @@ describe('useAssistantAvailability', () => {
hasConnectorsReadPrivilege: true,
isAssistantEnabled: true,
isAssistantVisible: false,
isStarterPromptsEnabled: true,
hasUpdateAIAssistantAnonymization: true,
hasManageGlobalKnowledgeBase: true,
});
Expand Down Expand Up @@ -174,7 +172,6 @@ describe('useAssistantAvailability', () => {
hasConnectorsReadPrivilege: false,
isAssistantEnabled: false,
isAssistantVisible: false,
isStarterPromptsEnabled: false,
hasUpdateAIAssistantAnonymization: false,
hasManageGlobalKnowledgeBase: false,
});
Expand Down Expand Up @@ -220,7 +217,6 @@ describe('useAssistantAvailability', () => {
hasConnectorsReadPrivilege: true,
isAssistantEnabled: true,
isAssistantVisible: true,
isStarterPromptsEnabled: true,
hasUpdateAIAssistantAnonymization: false,
hasManageGlobalKnowledgeBase: false,
});
Expand Down Expand Up @@ -251,7 +247,6 @@ describe('useAssistantAvailability', () => {
hasConnectorsReadPrivilege: false,
isAssistantEnabled: true,
isAssistantVisible: true,
isStarterPromptsEnabled: true,
hasUpdateAIAssistantAnonymization: false,
hasManageGlobalKnowledgeBase: false,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const MockAssistantProviderComponent: React.FC<Props> = ({
hasManageGlobalKnowledgeBase: true,
isAssistantEnabled: true,
isAssistantVisible: true,
isStarterPromptsEnabled: true,
};
const chrome = chromeServiceMock.createStartContract();
chrome.getChromeStyle$.mockReturnValue(of('classic'));
Expand Down