diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/constants.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/constants.tsx index c29bbc3b3a731..bd4dbfe8fa061 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/constants.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/constants.tsx @@ -36,34 +36,34 @@ export const DOCUMENT_CREATION_WARNINGS = { // This is indented the way it is to work with ApiCodeExample. // Use dedent() when calling this alone export const DOCUMENTS_API_JSON_EXAMPLE = `[ - { - "id": "park_rocky-mountain", - "title": "Rocky Mountain", - "description": "Bisected north to south by the Continental Divide, this portion of the Rockies has ecosystems varying from over 150 riparian lakes to montane and subalpine forests to treeless alpine tundra. Wildlife including mule deer, bighorn sheep, black bears, and cougars inhabit its igneous mountains and glacial valleys. Longs Peak, a classic Colorado fourteener, and the scenic Bear Lake are popular destinations, as well as the historic Trail Ridge Road, which reaches an elevation of more than 12,000 feet (3,700 m).", - "nps_link": "https://www.nps.gov/romo/index.htm", - "states": [ - "Colorado" - ], - "visitors": 4517585, - "world_heritage_site": false, - "location": "40.4,-105.58", - "acres": 265795.2, - "square_km": 1075.6, - "date_established": "1915-01-26T06:00:00Z" - }, - { - "id": "park_saguaro", - "title": "Saguaro", - "description": "Split into the separate Rincon Mountain and Tucson Mountain districts, this park is evidence that the dry Sonoran Desert is still home to a great variety of life spanning six biotic communities. Beyond the namesake giant saguaro cacti, there are barrel cacti, chollas, and prickly pears, as well as lesser long-nosed bats, spotted owls, and javelinas.", - "nps_link": "https://www.nps.gov/sagu/index.htm", - "states": [ - "Arizona" - ], - "visitors": 820426, - "world_heritage_site": false, - "location": "32.25,-110.5", - "acres": 91715.72, - "square_km": 371.2, - "date_established": "1994-10-14T05:00:00Z" - } - ]`; + { + "id": "park_rocky-mountain", + "title": "Rocky Mountain", + "description": "Bisected north to south by the Continental Divide, this portion of the Rockies has ecosystems varying from over 150 riparian lakes to montane and subalpine forests to treeless alpine tundra. Wildlife including mule deer, bighorn sheep, black bears, and cougars inhabit its igneous mountains and glacial valleys. Longs Peak, a classic Colorado fourteener, and the scenic Bear Lake are popular destinations, as well as the historic Trail Ridge Road, which reaches an elevation of more than 12,000 feet (3,700 m).", + "nps_link": "https://www.nps.gov/romo/index.htm", + "states": [ + "Colorado" + ], + "visitors": 4517585, + "world_heritage_site": false, + "location": "40.4,-105.58", + "acres": 265795.2, + "square_km": 1075.6, + "date_established": "1915-01-26T06:00:00Z" + }, + { + "id": "park_saguaro", + "title": "Saguaro", + "description": "Split into the separate Rincon Mountain and Tucson Mountain districts, this park is evidence that the dry Sonoran Desert is still home to a great variety of life spanning six biotic communities. Beyond the namesake giant saguaro cacti, there are barrel cacti, chollas, and prickly pears, as well as lesser long-nosed bats, spotted owls, and javelinas.", + "nps_link": "https://www.nps.gov/sagu/index.htm", + "states": [ + "Arizona" + ], + "visitors": 820426, + "world_heritage_site": false, + "location": "32.25,-110.5", + "acres": 91715.72, + "square_km": 371.2, + "date_established": "1994-10-14T05:00:00Z" + } + ]`; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx index 079fd20e25af3..e5f295f0368fb 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx @@ -7,8 +7,6 @@ import React from 'react'; -import dedent from 'dedent'; - import { useValues, useActions } from 'kea'; import { @@ -107,23 +105,22 @@ export const FlyoutBody: React.FC = () => { - {dedent(` - curl -X POST '${documentsApiUrl}' - -H 'Content-Type: application/json' - -H 'Authorization: Bearer ${apiKey}' - -d '${DOCUMENTS_API_JSON_EXAMPLE}' - # Returns - # [ - # { - # "id": "park_rocky-mountain", - # "errors": [] - # }, - # { - # "id": "park_saguaro", - # "errors": [] - # } - # ] - `)} + {`\ +curl -X POST '${documentsApiUrl}' \\ + -H 'Content-Type: application/json' \\ + -H 'Authorization: Bearer ${apiKey}' \\ + -d '${DOCUMENTS_API_JSON_EXAMPLE}' +# Returns +# [ +# { +# "id": "park_rocky-mountain", +# "errors": [] +# }, +# { +# "id": "park_saguaro", +# "errors": [] +# } +# ]`} ); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/constants.ts index 21051e77547f2..d6ee25da6e2b1 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/constants.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/constants.ts @@ -7,12 +7,7 @@ import { i18n } from '@kbn/i18n'; -export const LEAVE_UNASSIGNED_FIELD = i18n.translate( - 'xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.leaveUnassigned.field', - { - defaultMessage: 'Leave unassigned', - } -); +export const LEAVE_UNASSIGNED_FIELD = ''; export const SUCCESS_MESSAGE = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.success.message', diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.test.tsx index 819c666bd7267..6e077f068a0d5 100644 --- a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.test.tsx @@ -16,21 +16,30 @@ jest.mock('../../../lib/kibana'); describe('NoEnrichmentsPanelView', () => { it('renders a qualified container', () => { const wrapper = mount( - + ); expect(wrapper.find('[data-test-subj="no-enrichments-panel"]').exists()).toEqual(true); }); it('renders nothing when all enrichments are present', () => { const wrapper = mount( - + ); expect(wrapper.find('[data-test-subj="no-enrichments-panel"]').exists()).toEqual(false); }); it('renders expected text when no enrichments are present', () => { const wrapper = mount( - + ); expect(wrapper.find('[data-test-subj="no-enrichments-panel"]').hostNodes().text()).toContain( i18n.NO_ENRICHMENTS_FOUND_TITLE @@ -39,7 +48,10 @@ describe('NoEnrichmentsPanelView', () => { it('renders expected text when existing enrichments are absent', () => { const wrapper = mount( - + ); expect(wrapper.find('[data-test-subj="no-enrichments-panel"]').hostNodes().text()).toContain( i18n.NO_INDICATOR_ENRICHMENTS_TITLE @@ -48,7 +60,10 @@ describe('NoEnrichmentsPanelView', () => { it('renders expected text when investigation enrichments are absent', () => { const wrapper = mount( - + ); expect(wrapper.find('[data-test-subj="no-enrichments-panel"]').hostNodes().text()).toContain( i18n.NO_INVESTIGATION_ENRICHMENTS_TITLE diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.tsx index a26e74d12f40f..1c419372aea30 100644 --- a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.tsx +++ b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/no_enrichments_panel.tsx @@ -35,9 +35,9 @@ const NoEnrichmentsPanelView: React.FC<{ NoEnrichmentsPanelView.displayName = 'NoEnrichmentsPanelView'; export const NoEnrichmentsPanel: React.FC<{ - existingEnrichmentsCount: number; - investigationEnrichmentsCount: number; -}> = ({ existingEnrichmentsCount, investigationEnrichmentsCount }) => { + isIndicatorMatchesPresent: boolean; + isInvestigationTimeEnrichmentsPresent: boolean; +}> = ({ isIndicatorMatchesPresent, isInvestigationTimeEnrichmentsPresent }) => { const threatIntelDocsUrl = `${ useKibana().services.docLinks.links.filebeat.base }/filebeat-module-threatintel.html`; @@ -50,7 +50,7 @@ export const NoEnrichmentsPanel: React.FC<{ ); - if (existingEnrichmentsCount === 0 && investigationEnrichmentsCount === 0) { + if (!isIndicatorMatchesPresent && !isInvestigationTimeEnrichmentsPresent) { return ( {i18n.NO_ENRICHMENTS_FOUND_TITLE}} @@ -61,7 +61,7 @@ export const NoEnrichmentsPanel: React.FC<{ } /> ); - } else if (existingEnrichmentsCount === 0) { + } else if (!isIndicatorMatchesPresent) { return ( <> @@ -75,7 +75,7 @@ export const NoEnrichmentsPanel: React.FC<{ /> ); - } else if (investigationEnrichmentsCount === 0) { + } else if (!isInvestigationTimeEnrichmentsPresent) { return ( <> diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx index 7074212dcdb4c..668c6ffb723aa 100644 --- a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx +++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx @@ -113,15 +113,14 @@ const EventDetailsComponent: React.FC = ({ loading: enrichmentsLoading, result: enrichmentsResponse, } = useInvestigationTimeEnrichment(eventFields); - const investigationEnrichments = useMemo(() => enrichmentsResponse?.enrichments ?? [], [ - enrichmentsResponse?.enrichments, - ]); + const allEnrichments = useMemo(() => { if (enrichmentsLoading || !enrichmentsResponse?.enrichments) { return existingEnrichments; } return filterDuplicateEnrichments([...existingEnrichments, ...enrichmentsResponse.enrichments]); }, [enrichmentsLoading, enrichmentsResponse, existingEnrichments]); + const enrichmentCount = allEnrichments.length; const summaryTab: EventViewTab | undefined = useMemo( @@ -184,21 +183,16 @@ const EventDetailsComponent: React.FC = ({ <> existingEnrichments.length + } + isIndicatorMatchesPresent={existingEnrichments.length > 0} /> ), } : undefined, - [ - allEnrichments, - enrichmentCount, - enrichmentsLoading, - existingEnrichments.length, - investigationEnrichments.length, - isAlert, - ] + [allEnrichments, enrichmentCount, enrichmentsLoading, existingEnrichments.length, isAlert] ); const tableTab = useMemo( diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/cti_disabled_module.tsx b/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/cti_disabled_module.tsx index da5216be7db3c..38c352c43b0d4 100644 --- a/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/cti_disabled_module.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/cti_disabled_module.tsx @@ -41,7 +41,12 @@ export const CtiDisabledModuleComponent = () => { ); return ( - + ); }; diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.test.tsx b/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.test.tsx index 9714c28cc58cc..ffd0c8e69e76d 100644 --- a/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.test.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.test.tsx @@ -144,4 +144,32 @@ describe('ThreatIntelPanelView', () => { `Showing: ${mockThreatIntelPanelViewProps.totalEventCount} indicators` ); }); + + it('renders inspect button by default', () => { + const wrapper = mount( + + + + + + + + ); + + expect(wrapper.exists('[data-test-subj="inspect-icon-button"]')).toBe(true); + }); + + it('does not render inspect button if isInspectEnabled is false', () => { + const wrapper = mount( + + + + + + + + ); + + expect(wrapper.exists('[data-test-subj="inspect-icon-button"]')).toBe(false); + }); }); diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.tsx b/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.tsx index 2add03788eea2..6bd7bef20fcbe 100644 --- a/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/overview_cti_links/threat_intel_panel_view.tsx @@ -55,6 +55,7 @@ const RightSideLink = styled(EuiLink)` interface ThreatIntelPanelViewProps { buttonHref?: string; isDashboardPluginDisabled?: boolean; + isInspectEnabled?: boolean; listItems: CtiListItem[]; splitPanel?: JSX.Element; totalEventCount: number; @@ -77,6 +78,7 @@ const panelTitle = ( export const ThreatIntelPanelView: React.FC = ({ buttonHref = '', isDashboardPluginDisabled, + isInspectEnabled = true, listItems, splitPanel, totalEventCount, @@ -142,7 +144,11 @@ export const ThreatIntelPanelView: React.FC = ({ - + <>{button} {splitPanel} diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 32f258bab51ad..13cb175ac908e 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -8041,7 +8041,6 @@ "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.featuredResults.title": "強調された結果", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.go.button": "Go", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.lastUpdated.heading": "最終更新", - "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.leaveUnassigned.field": "割り当てなし", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.preview.title": "プレビュー", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.reset.button": "リセット", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.resultDetail.label": "結果詳細", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index ed76397498e30..6e7ab7a33a0f3 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -8109,7 +8109,6 @@ "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.featuredResults.title": "精选结果", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.go.button": "执行", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.lastUpdated.heading": "上次更新时间", - "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.leaveUnassigned.field": "不分配", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.preview.title": "预览", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.reset.button": "重置", "xpack.enterpriseSearch.workplaceSearch.contentSources.displaySettings.resultDetail.label": "结果详情", diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts index 71bf03365e66d..371b0f8d0b0b3 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts @@ -29,7 +29,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const dashboardExpect = getService('dashboardExpect'); const searchSessions = getService('searchSessions'); - describe('save a search sessions with relative time', () => { + // Failing: See https://github.com/elastic/kibana/issues/97701 + describe.skip('save a search sessions with relative time', () => { before(async () => { await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', { useActualUrl: true, diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts index 1f57cd1b6db34..4656edc7edfb4 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts @@ -23,7 +23,8 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); - describe('test metadata api', () => { + // Failing: See https://github.com/elastic/kibana/issues/106051 + describe.skip('test metadata api', () => { describe(`POST ${HOST_METADATA_LIST_ROUTE} when index is empty`, () => { it('metadata api should return empty result when index is empty', async () => { await deleteMetadataStream(getService);