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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const mockUseLoadInferenceConnectors = jest.fn();
const mockUseSpaceId = jest.fn();
const mockUseStoredAssistantConnectorId = jest.fn();
const mockUseAssistantAvailability = jest.fn();
const mockUseAgentBuilderAvailability = jest.fn();
const mockUseFetchEntityDetailsHighlights = jest.fn();
const mockUseHasEntityHighlightsLicense = jest.fn();

Expand All @@ -41,6 +42,10 @@ jest.mock('../../../../assistant/use_assistant_availability', () => ({
useAssistantAvailability: () => mockUseAssistantAvailability(),
}));

jest.mock('../../../../agent_builder/hooks/use_agent_builder_availability', () => ({
useAgentBuilderAvailability: () => mockUseAgentBuilderAvailability(),
}));

jest.mock('../../../../onboarding/components/hooks/use_stored_state', () => ({
useStoredAssistantConnectorId: () => mockUseStoredAssistantConnectorId(),
}));
Expand Down Expand Up @@ -118,9 +123,12 @@ describe('EntityHighlights', () => {
const defaultStoredAssistantConnectorId = ['connector-1', jest.fn()];
const defaultAssistantAvailability = {
hasAssistantPrivilege: true,
isAssistantEnabled: true,
hasConnectorsReadPrivilege: true,
isAssistantVisible: true,
};
const defaultAgentBuilderAvailability = {
hasAgentBuilderPrivilege: true,
};
const defaultFetchEntityDetailsHighlights = {
fetchEntityHighlights: mockFetchEntityHighlights,
isChatLoading: false,
Expand All @@ -138,6 +146,7 @@ describe('EntityHighlights', () => {
mockUseSpaceId.mockReturnValue(defaultSpaceId);
mockUseStoredAssistantConnectorId.mockReturnValue(defaultStoredAssistantConnectorId);
mockUseAssistantAvailability.mockReturnValue(defaultAssistantAvailability);
mockUseAgentBuilderAvailability.mockReturnValue(defaultAgentBuilderAvailability);
mockUseFetchEntityDetailsHighlights.mockReturnValue(defaultFetchEntityDetailsHighlights);
mockUseHasEntityHighlightsLicense.mockReturnValue(true);
});
Expand All @@ -151,11 +160,24 @@ describe('EntityHighlights', () => {
expect(screen.getByTestId('asset-criticality-selector')).toBeInTheDocument();
});

it('returns null when assistant is disabled due to no privileges', () => {
mockUseAssistantAvailability.mockReturnValue({
it('returns null when user has insufficent license', () => {
mockUseHasEntityHighlightsLicense.mockReturnValueOnce(false);

render(<EntityHighlightsAccordion {...defaultProps} />, {
wrapper: TestProviders,
});

expect(screen.queryByText('Entity summary')).not.toBeInTheDocument();
});

it('returns null when user has no assistant privilege or agent builder privilege', () => {
mockUseAssistantAvailability.mockReturnValueOnce({
hasAssistantPrivilege: false,
isAssistantEnabled: true,
isAssistantVisible: true,
hasConnectorsReadPrivilege: true,
isAssistantVisible: false,
});
mockUseAgentBuilderAvailability.mockReturnValueOnce({
hasAgentBuilderPrivilege: false,
});

render(<EntityHighlightsAccordion {...defaultProps} />, {
Expand All @@ -165,11 +187,14 @@ describe('EntityHighlights', () => {
expect(screen.queryByText('Entity summary')).not.toBeInTheDocument();
});

it('returns null when assistant is not enabled', () => {
mockUseAssistantAvailability.mockReturnValue({
it('returns null when user has no connector read privilege', () => {
mockUseAssistantAvailability.mockReturnValueOnce({
hasAssistantPrivilege: true,
isAssistantEnabled: false,
isAssistantVisible: true,
hasConnectorsReadPrivilege: false,
});
mockUseAgentBuilderAvailability.mockReturnValueOnce({
hasAgentBuilderPrivilege: true,
});

render(<EntityHighlightsAccordion {...defaultProps} />, {
Expand All @@ -179,6 +204,40 @@ describe('EntityHighlights', () => {
expect(screen.queryByText('Entity summary')).not.toBeInTheDocument();
});

it('renders if user has assistant privilege and no agent builder privilege', () => {
mockUseAssistantAvailability.mockReturnValueOnce({
hasAssistantPrivilege: true,
isAssistantVisible: true,
hasConnectorsReadPrivilege: true,
});
mockUseAgentBuilderAvailability.mockReturnValueOnce({
hasAgentBuilderPrivilege: false,
});

render(<EntityHighlightsAccordion {...defaultProps} />, {
wrapper: TestProviders,
});

expect(screen.getByText('Entity summary')).toBeInTheDocument();
});

it('renders if user has agent builder privilege and no assistant privilege', () => {
mockUseAssistantAvailability.mockReturnValueOnce({
hasAssistantPrivilege: false,
isAssistantVisible: false,
hasConnectorsReadPrivilege: true,
});
mockUseAgentBuilderAvailability.mockReturnValueOnce({
hasAgentBuilderPrivilege: true,
});

render(<EntityHighlightsAccordion {...defaultProps} />, {
wrapper: TestProviders,
});

expect(screen.getByText('Entity summary')).toBeInTheDocument();
});

it(`shows "Add Connector" button when no assistant result, not loading and no connectors`, () => {
mockUseLoadInferenceConnectors.mockReturnValueOnce({
data: { hasConnectors: false, connectors: [] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { useLoadActionTypes } from '@kbn/elastic-assistant/impl/connectorland/us
import type { ActionConnector, ActionType } from '@kbn/triggers-actions-ui-plugin/public';
import { useKibana } from '../../../../common/lib/kibana';
import { useAssistantAvailability } from '../../../../assistant/use_assistant_availability';
import { useAgentBuilderAvailability } from '../../../../agent_builder/hooks/use_agent_builder_availability';
import type { EntityType } from '../../../../../common/search_strategy';
import { useStoredAssistantConnectorId } from '../../../../onboarding/components/hooks/use_stored_state';
import { useSpaceId } from '../../../../common/hooks/use_space_id';
Expand Down Expand Up @@ -74,8 +75,9 @@ export const EntityHighlightsAccordion: React.FC<{
}, [aiConnectors, connectorId]);

const [isConnectorModalVisible, setIsConnectorModalVisible] = useState<boolean>(false);
const { hasAssistantPrivilege, isAssistantEnabled, isAssistantVisible } =
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Access to the inference API does not depend on whether the assistant is enabled so I removed this check.

const { hasConnectorsReadPrivilege, hasAssistantPrivilege, isAssistantVisible } =
useAssistantAvailability();
const { hasAgentBuilderPrivilege } = useAgentBuilderAvailability();
const hasEntityHighlightsLicense = useHasEntityHighlightsLicense();
const {
gradientPanelStyle,
Expand Down Expand Up @@ -132,10 +134,24 @@ export const EntityHighlightsAccordion: React.FC<{
setPopover(false);
}, []);

const disabled = useMemo(
() => !hasAssistantPrivilege || !isAssistantEnabled || !hasEntityHighlightsLicense,
[hasAssistantPrivilege, isAssistantEnabled, hasEntityHighlightsLicense]
);
const disabled = useMemo(() => {
if (!hasEntityHighlightsLicense) {
return true;
}

// if user does not have access to connectors, we cannot invoke the inference action
if (!hasConnectorsReadPrivilege) {
return true;
}

// if user does not have access to assistant or agent builder, disable entity highlights
return !(hasAssistantPrivilege || hasAgentBuilderPrivilege);
}, [
hasConnectorsReadPrivilege,
hasAgentBuilderPrivilege,
hasAssistantPrivilege,
hasEntityHighlightsLicense,
]);

const isLoading = useMemo(
() => isChatLoading || isAnonymizationFieldsLoading || isLoadingConnectors,
Expand Down
Loading