Skip to content

[Security assistant] Remove feature flag to enable conversation sharing #234100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephmilovic merged 10 commits into from
Sep 11, 2025
Merged

[Security assistant] Remove feature flag to enable conversation sharing #234100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57c07ed
rm iconColor
stephmilovic Sep 4, 2025
f998f19
rm feature flag
stephmilovic Sep 4, 2025
381d2ae
fix cypress
stephmilovic Sep 4, 2025
fd7fe9d
check
stephmilovic Sep 4, 2025
d514f41
Merge branch 'main' into sharing_release
stephmilovic Sep 9, 2025
0ab19a1
rm from convo settings
stephmilovic Sep 9, 2025
1516e71
test fixing
stephmilovic Sep 9, 2025
a4518bd
fix type
stephmilovic Sep 9, 2025
8473bbe
Merge branch 'main' into sharing_release
stephmilovic Sep 11, 2025
7825679
add secondary user test to duplicate test
stephmilovic Sep 11, 2025
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
30 changes: 1 addition & 29 deletions api_docs/kbn_elastic_assistant.devdocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,20 +1484,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.isAssistantSharingEnabled",
"type": "CompoundType",
"tags": [],
"label": "isAssistantSharingEnabled",
"description": [],
"signature": [
"boolean | undefined"
],
"path": "x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx",
"deprecated": false,
"trackAdoption": false
}
],
"initialIsOpen": false
Expand Down Expand Up @@ -2796,20 +2782,6 @@
"path": "x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "@kbn/elastic-assistant",
"id": "def-public.UseAssistantAvailability.isAssistantSharingEnabled",
"type": "CompoundType",
"tags": [],
"label": "isAssistantSharingEnabled",
"description": [],
"signature": [
"boolean | undefined"
],
"path": "x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts",
"deprecated": false,
"trackAdoption": false
}
],
"initialIsOpen": false
Expand Down Expand Up @@ -3240,4 +3212,4 @@
"misc": [],
"objects": []
}
}
}
15 changes: 4 additions & 11 deletions ...form/packages/shared/kbn-elastic-assistant/impl/assistant/assistant_header/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('AssistantHeader', () => {
});

it('renders share badge when sharing is enabled', () => {
render(<AssistantHeader {...testProps} isAssistantSharingEnabled={true} />, {
render(<AssistantHeader {...testProps} />, {
wrapper: TestProviders,
});
expect(screen.getByTestId('shareBadgeButton')).not.toBeDisabled();
Expand All @@ -120,16 +120,9 @@ describe('AssistantHeader', () => {
});

it('disables share badge when isConversationOwner=false', () => {
render(
<AssistantHeader
{...testProps}
isConversationOwner={false}
isAssistantSharingEnabled={true}
/>,
{
wrapper: TestProviders,
}
);
render(<AssistantHeader {...testProps} isConversationOwner={false} />, {
wrapper: TestProviders,
});
expect(screen.getByTestId('shareBadgeButton')).toBeDisabled();
expect(screen.getByTestId('connector-selector')).toBeDisabled();
expect(
Expand Down
4 changes: 1 addition & 3 deletions .../platform/packages/shared/kbn-elastic-assistant/impl/assistant/assistant_header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ interface OwnProps {
isConversationOwner: boolean;
isDisabled: boolean;
isLoading: boolean;
isAssistantSharingEnabled?: boolean;
isSettingsModalVisible: boolean;
setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
onChatCleared: () => void;
Expand Down Expand Up @@ -91,7 +90,6 @@ export const AssistantHeader: React.FC<Props> = ({
defaultConnector,
isConversationOwner,
isAssistantEnabled,
isAssistantSharingEnabled = false,
isDisabled,
isLoading,
isSettingsModalVisible,
Expand Down Expand Up @@ -223,7 +221,7 @@ export const AssistantHeader: React.FC<Props> = ({
)}
</EuiFlexItem>

{!isNewConversation && isAssistantSharingEnabled && (
{!isNewConversation && (
<EuiFlexItem grow={false}>
<ShareSelectModal
conversationSharedState={conversationSharedState}
Expand Down
1 change: 0 additions & 1 deletion .../impl/assistant/conversations/conversation_settings/conversation_settings_editor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ const baseProps: ConversationSettingsEditorProps = {
conversationSettings: { [welcomeConvo.id]: welcomeConvo },
conversationsSettingsBulkActions: {},
http: { basePath: { get: jest.fn(() => 'http://localhost:5601') } } as unknown as HttpSetup,
isAssistantSharingEnabled: true,
isDisabled: false,
selectedConversation: welcomeConvo,
setConversationSettings: mockSetConversationSettings,
Expand Down
29 changes: 12 additions & 17 deletions ...stant/impl/assistant/conversations/conversation_settings/conversation_settings_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export interface ConversationSettingsEditorProps {
conversationSettings: Record<string, Conversation>;
conversationsSettingsBulkActions: ConversationsBulkActions;
http: HttpSetup;
isAssistantSharingEnabled?: boolean;
isDisabled?: boolean;
selectedConversation: Conversation;
setConversationSettings: React.Dispatch<React.SetStateAction<Record<string, Conversation>>>;
Expand All @@ -52,7 +51,6 @@ export const ConversationSettingsEditor: React.FC<ConversationSettingsEditorProp
allSystemPrompts,
conversationsSettingsBulkActions,
http,
isAssistantSharingEnabled = false,
isDisabled = false,
selectedConversation,
setConversationsSettingsBulkActions,
Expand Down Expand Up @@ -310,21 +308,18 @@ export const ConversationSettingsEditor: React.FC<ConversationSettingsEditorProp
/>
</EuiFormRow>
)}

{isAssistantSharingEnabled && (
<EuiFormRow
data-test-subj="shared-field"
display="rowCompressed"
fullWidth
label={i18n.SHARING_OPTIONS}
>
<ShareSelect
selectedConversation={selectedConversation}
onSharedSelectionChange={handleOnSharedSelectionChange}
onUsersUpdate={handleUsersUpdate}
/>
</EuiFormRow>
)}
<EuiFormRow
data-test-subj="shared-field"
display="rowCompressed"
fullWidth
label={i18n.SHARING_OPTIONS}
>
<ShareSelect
selectedConversation={selectedConversation}
onSharedSelectionChange={handleOnSharedSelectionChange}
onUsersUpdate={handleUsersUpdate}
/>
</EuiFormRow>
</>
);
}
Expand Down
5 changes: 2 additions & 3 deletions ...elastic-assistant/impl/assistant/conversations/conversation_settings_management/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ConversationSettingsManagementComponent: React.FC<Props> = ({
}) => {
const {
actionTypeRegistry,
assistantAvailability: { isAssistantEnabled, isAssistantSharingEnabled },
assistantAvailability: { isAssistantEnabled },
http,
nameSpace,
toasts,
Expand Down Expand Up @@ -250,7 +250,7 @@ const ConversationSettingsManagementComponent: React.FC<Props> = ({
onCancelClick();
}, [closeConfirmModal, handleUnselectAll, onCancelClick]);

const { getConversationsList, getColumns } = useConversationsTable(isAssistantSharingEnabled);
const { getConversationsList, getColumns } = useConversationsTable();

const conversationOptions = getConversationsList({
allSystemPrompts,
Expand Down Expand Up @@ -373,7 +373,6 @@ const ConversationSettingsManagementComponent: React.FC<Props> = ({
conversationSettings={conversations}
conversationsSettingsBulkActions={conversationsSettingsBulkActions}
http={http}
isAssistantSharingEnabled={isAssistantSharingEnabled}
isDisabled={isDisabled}
selectedConversation={selectedConversation}
setConversationSettings={setConversationSettings}
Expand Down
2 changes: 1 addition & 1 deletion ...assistant/conversations/conversation_settings_management/use_conversations_table.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const mockActionTypeRegistry: ActionTypeRegistryContract = {

describe('useConversationsTable', () => {
it('should return columns', () => {
const { result } = renderHook(() => useConversationsTable(true));
const { result } = renderHook(() => useConversationsTable());
const columns = result.current.getColumns({
conversationOptions: [],
deletedConversationsIds: [],
Expand Down
Loading