diff --git a/packages/core/application/core-application-common/src/default_app_categories.ts b/packages/core/application/core-application-common/src/default_app_categories.ts index da76c18e62cec..f9bb68199bc87 100644 --- a/packages/core/application/core-application-common/src/default_app_categories.ts +++ b/packages/core/application/core-application-common/src/default_app_categories.ts @@ -23,7 +23,7 @@ export const DEFAULT_APP_CATEGORIES: Record = Object.freeze enterpriseSearch: { id: 'enterpriseSearch', label: i18n.translate('core.ui.searchNavList.label', { - defaultMessage: 'Search', + defaultMessage: 'Elasticsearch', }), order: 2000, euiIconType: 'logoEnterpriseSearch', diff --git a/packages/kbn-guided-onboarding/src/components/landing_page/classic_version/guide_filters.tsx b/packages/kbn-guided-onboarding/src/components/landing_page/classic_version/guide_filters.tsx index 1a2842c3a6594..73f39f8ce5a6a 100644 --- a/packages/kbn-guided-onboarding/src/components/landing_page/classic_version/guide_filters.tsx +++ b/packages/kbn-guided-onboarding/src/components/landing_page/classic_version/guide_filters.tsx @@ -75,7 +75,7 @@ export const GuideFilters = ({ activeFilter, setActiveFilter, application }: Gui > diff --git a/packages/kbn-guided-onboarding/src/components/landing_page/guide/guide_filters.tsx b/packages/kbn-guided-onboarding/src/components/landing_page/guide/guide_filters.tsx index 81d25e5a7d635..00152936a58bf 100644 --- a/packages/kbn-guided-onboarding/src/components/landing_page/guide/guide_filters.tsx +++ b/packages/kbn-guided-onboarding/src/components/landing_page/guide/guide_filters.tsx @@ -76,7 +76,7 @@ export const GuideFilters = ({ > diff --git a/packages/kbn-management/settings/utilities/category/get_category_name.ts b/packages/kbn-management/settings/utilities/category/get_category_name.ts index 5569479b48ad6..8ff9851e5862a 100644 --- a/packages/kbn-management/settings/utilities/category/get_category_name.ts +++ b/packages/kbn-management/settings/utilities/category/get_category_name.ts @@ -62,7 +62,7 @@ const names: Record = { defaultMessage: 'Reporting', }), [SEARCH_CATEGORY]: i18n.translate('management.settings.categoryNames.searchLabel', { - defaultMessage: 'Search', + defaultMessage: 'Elasticsearch', }), [SECURITY_SOLUTION_CATEGORY]: i18n.translate( 'management.settings.categoryNames.securitySolutionLabel', diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts index 884d5357bf912..0c9ecd8488658 100755 --- a/src/plugins/custom_integrations/common/index.ts +++ b/src/plugins/custom_integrations/common/index.ts @@ -67,7 +67,7 @@ export const INTEGRATION_CATEGORY_DISPLAY: { productivity_security: { title: 'Productivity', parent_id: 'security' }, proxy_security: { title: 'Proxy', parent_id: 'security' }, sdk_search: { title: 'SDK', parent_id: 'search' }, - search: { title: 'Search', parent_id: undefined }, + search: { title: 'Elasticsearch', parent_id: undefined }, security: { title: 'Security', parent_id: undefined }, stream_processing: { title: 'Stream Processing', parent_id: 'observability' }, support: { title: 'Support', parent_id: undefined }, diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts index 797f94fa29e51..0c13a772862b8 100644 --- a/x-pack/plugins/enterprise_search/common/constants.ts +++ b/x-pack/plugins/enterprise_search/common/constants.ts @@ -27,7 +27,7 @@ import { IngestPipelineParams } from '@kbn/search-connectors'; import { ProductFeatures } from './types'; export const SEARCH_PRODUCT_NAME = i18n.translate('xpack.enterpriseSearch.search.productName', { - defaultMessage: 'Search', + defaultMessage: 'Elasticsearch', }); export const ENTERPRISE_SEARCH_PRODUCT_NAME = i18n.translate('xpack.enterpriseSearch.productName', { defaultMessage: 'Enterprise Search', diff --git a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx index 7374ecd0ac359..4ce68d1bbd6e4 100644 --- a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx @@ -40,7 +40,7 @@ export const AISearchGuide: React.FC = () => { bottomBorder={false} pageHeader={{ pageTitle: i18n.translate('xpack.enterpriseSearch.aiSearch.guide.pageTitle', { - defaultMessage: 'Improve search revelance with AI', + defaultMessage: 'Improve search relevance with AI', }), }} > diff --git a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx index 42a84efd0ccc4..dfcc1695e4efd 100644 --- a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx @@ -13,6 +13,8 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { i18n } from '@kbn/i18n'; + import { SetAiSearchChrome } from '../../../shared/kibana_chrome'; import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout'; import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry'; @@ -23,12 +25,14 @@ describe('EnterpriseSearchAISearchPageTemplate', () => { it('renders', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] }); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx index b43f1fbcee7d6..f59a750e1a06c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx @@ -43,7 +43,7 @@ describe('EnterpriseSearchAnalyticsPageTemplate', () => { ); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] }); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx index 99eba7d57b108..53fdc507ccfb6 100644 --- a/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx @@ -13,6 +13,8 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { i18n } from '@kbn/i18n'; + import { SetElasticsearchChrome } from '../../../shared/kibana_chrome'; import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout'; import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry'; @@ -23,12 +25,14 @@ describe('EnterpriseSearchElasticsearchPageTemplate', () => { it('renders', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] }); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx index 3f072abb3c0bf..f6f7355b04e20 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx @@ -13,6 +13,8 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { i18n } from '@kbn/i18n'; + import { SetEnterpriseSearchContentChrome } from '../../../shared/kibana_chrome'; import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout'; import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry'; @@ -23,12 +25,14 @@ describe('EnterpriseSearchContentPageTemplate', () => { it('renders', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] }); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/page_template.test.tsx index ea0e3f4b7749b..92b400fa9b191 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/page_template.test.tsx @@ -13,6 +13,8 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { i18n } from '@kbn/i18n'; + import { SetSearchChrome } from '../../../shared/kibana_chrome'; import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout'; import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry'; @@ -23,12 +25,14 @@ describe('EnterpriseSearchOverviewPageTemplate', () => { it('renders', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] }); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx index 6b9e6b891a59f..246c9835a015a 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx @@ -32,7 +32,7 @@ describe('EnterpriseSearchRelevancePageTemplate', () => { ); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ items: [], name: 'Search' }); + expect(wrapper.prop('solutionNav')).toEqual({ items: [], name: 'Elasticsearch' }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx index ef1e5ffa70593..0fccdb62d4d2e 100644 --- a/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx @@ -13,6 +13,8 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { i18n } from '@kbn/i18n'; + import { SetSearchExperiencesChrome } from '../../../shared/kibana_chrome'; import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout'; import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry'; @@ -23,12 +25,14 @@ describe('EnterpriseSearchSearchExperiencesPageTemplate', () => { it('renders', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] }); + expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts index c767706fb0d6f..47dcd899d82cf 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts @@ -162,7 +162,7 @@ describe('useSearchBreadcrumbs', () => { expect(useSearchBreadcrumbs(breadcrumbs)).toEqual([ { - text: 'Search', + text: 'Elasticsearch', href: '/app/enterprise_search/overview', onClick: expect.any(Function), }, @@ -180,7 +180,7 @@ describe('useSearchBreadcrumbs', () => { it('shows just the root if breadcrumbs is empty', () => { expect(useSearchBreadcrumbs()).toEqual([ { - text: 'Search', + text: 'Elasticsearch', }, ]); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts index 511445240095f..5db04cc0a15c2 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts @@ -17,17 +17,17 @@ describe('generateTitle', () => { describe('searchTitle', () => { it('automatically appends the Enterprise Search product onto the pages array', () => { const title = searchTitle(['Setup Guide']); - expect(title).toEqual('Setup Guide - Search'); + expect(title).toEqual('Setup Guide - Elasticsearch'); }); it('can be mixed and matched', () => { const title = searchTitle([appSearchTitle(['Some Page'])]); - expect(title).toEqual('Some Page - App Search - Search'); + expect(title).toEqual('Some Page - App Search - Elasticsearch'); }); it('falls back to product name', () => { const title = searchTitle(); - expect(title).toEqual('Search'); + expect(title).toEqual('Elasticsearch'); }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx index 4c2dc40309349..370972ebe53ea 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx @@ -12,6 +12,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { EuiCallOut } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template'; @@ -35,7 +36,9 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { it('renders children', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); @@ -71,7 +74,13 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { const wrapper = shallow( Nothing here yet!} + emptyState={ +
+ {i18n.translate('xpack.enterpriseSearch..div.nothingHereYetLabel', { + defaultMessage: 'Nothing here yet!', + })} +
+ } >
@@ -88,7 +97,13 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { const wrapper = shallow( Nothing here yet!
} + emptyState={ +
+ {i18n.translate('xpack.enterpriseSearch..div.nothingHereYetLabel', { + defaultMessage: 'Nothing here yet!', + })} +
+ } >
@@ -201,14 +216,14 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { ); }); - it('automatically sets the Search logo onto passed solution navs', () => { + it('automatically sets the Elasticsearch logo onto passed solution navs', () => { const wrapper = shallow( - + ); expect(wrapper.find(KibanaPageTemplate).prop('solutionNav')).toEqual({ icon: 'logoEnterpriseSearch', - name: 'Search', + name: 'Elasticsearch', items: [], }); }); @@ -216,14 +231,14 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { it('sets the solutionNavIcon passed', () => { const wrapper = shallow( ); expect(wrapper.find(KibanaPageTemplate).prop('solutionNav')).toEqual({ icon: 'logoElasticsearch', - name: 'Search', + name: 'Elasticsearch', items: [], }); }); @@ -231,7 +246,13 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { describe('Embedded Console', () => { it('renders embedded console if available', () => { - const FakeEmbeddedConsole: React.FC = () =>
foo
; + const FakeEmbeddedConsole: React.FC = () => ( +
+ {i18n.translate('xpack.enterpriseSearch.fakeEmbeddedConsole.div.fooLabel', { + defaultMessage: 'foo', + })} +
+ ); const consolePlugin = { EmbeddableConsole: FakeEmbeddedConsole }; setMockValues({ @@ -241,14 +262,22 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.find(consolePlugin.EmbeddableConsole).exists()).toBe(true); }); it('Hides embedded console if available but page template prop set to hide', () => { - const FakeEmbeddedConsole: React.FC = () =>
foo
; + const FakeEmbeddedConsole: React.FC = () => ( +
+ {i18n.translate('xpack.enterpriseSearch.fakeEmbeddedConsole.div.fooLabel', { + defaultMessage: 'foo', + })} +
+ ); const consolePlugin = { EmbeddableConsole: FakeEmbeddedConsole }; setMockValues({ @@ -258,7 +287,9 @@ describe('EnterpriseSearchPageTemplateWrapper', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); diff --git a/x-pack/plugins/enterprise_search/public/applications/vector_search/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/vector_search/components/layout/page_template.test.tsx index 5f6fe605858bf..561b6d69ed09b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/vector_search/components/layout/page_template.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/vector_search/components/layout/page_template.test.tsx @@ -13,6 +13,8 @@ import React from 'react'; import { shallow } from 'enzyme'; +import { i18n } from '@kbn/i18n'; + import { SetVectorSearchChrome } from '../../../shared/kibana_chrome'; import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout'; import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry'; @@ -23,12 +25,14 @@ describe('EnterpriseSearchVectorSearchPageTemplate', () => { it('renders', () => { const wrapper = shallow( -
world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })} +
); expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper); - expect(wrapper.prop('solutionNav')).toEqual({ items: [], name: 'Search' }); + expect(wrapper.prop('solutionNav')).toEqual({ items: [], name: 'Elasticsearch' }); expect(wrapper.find('.hello').text()).toEqual('world'); }); diff --git a/x-pack/plugins/enterprise_search/public/navigation_tree.ts b/x-pack/plugins/enterprise_search/public/navigation_tree.ts index 2f41db6bef486..25ad8ec37743f 100644 --- a/x-pack/plugins/enterprise_search/public/navigation_tree.ts +++ b/x-pack/plugins/enterprise_search/public/navigation_tree.ts @@ -31,7 +31,7 @@ export interface DynamicSideNavItems { const title = i18n.translate( 'xpack.enterpriseSearch.searchNav.headerSolutionSwitcher.searchSolutionTitle', { - defaultMessage: 'Search', + defaultMessage: 'Elasticsearch', } ); const icon = 'logoElasticsearch'; diff --git a/x-pack/plugins/enterprise_search/server/lib/pipelines/create_pipeline_definitions.ts b/x-pack/plugins/enterprise_search/server/lib/pipelines/create_pipeline_definitions.ts index 744369ca18806..cff429f3934a0 100644 --- a/x-pack/plugins/enterprise_search/server/lib/pipelines/create_pipeline_definitions.ts +++ b/x-pack/plugins/enterprise_search/server/lib/pipelines/create_pipeline_definitions.ts @@ -48,7 +48,7 @@ export const createIndexPipelineDefinitions = async ( const ingestPipeline = { _meta: { managed: true, - managed_by: 'Search', + managed_by: 'Elasticsearch', }, description: `Ingest pipeline for the '${indexName}' index`, id: `${indexName}`, diff --git a/x-pack/plugins/enterprise_search/server/utils/search_result_provider.test.ts b/x-pack/plugins/enterprise_search/server/utils/search_result_provider.test.ts index 49e94e76cd7a0..3e7a0777dad23 100644 --- a/x-pack/plugins/enterprise_search/server/utils/search_result_provider.test.ts +++ b/x-pack/plugins/enterprise_search/server/utils/search_result_provider.test.ts @@ -66,13 +66,13 @@ const connectors = [ }, ]; -describe('Enterprise Search search provider', () => { +describe('Search search provider', () => { const crawlerResult = { icon: 'crawlerIcon.svg', id: 'elastic-crawler', score: 75, title: 'Elastic Web Crawler', - type: 'Search', + type: 'Elasticsearch', url: { path: `${ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL}/crawlers/new_crawler`, prependBasePath: true, @@ -84,7 +84,7 @@ describe('Enterprise Search search provider', () => { id: 'mongodb', score: 75, title: 'MongoDB', - type: 'Search', + type: 'Elasticsearch', url: { path: `${ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL}/connectors/new_connector?connector_type=connector_client&service_type=mongodb`, prependBasePath: true, @@ -96,7 +96,7 @@ describe('Enterprise Search search provider', () => { id: 'mongodb', score: 75, title: 'MongoDB', - type: 'Search', + type: 'Elasticsearch', url: { path: `${ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL}/connectors/new_connector?connector_type=native&service_type=mongodb`, prependBasePath: true, @@ -108,7 +108,7 @@ describe('Enterprise Search search provider', () => { id: '', score: 75, title: 'Customized connector', - type: 'Search', + type: 'Elasticsearch', url: { path: `${ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL}/connectors/new_connector?connector_type=connector_client&service_type=`, prependBasePath: true, diff --git a/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts b/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts index a5ce3aeb367da..6da354495ea0d 100644 --- a/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts +++ b/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts @@ -62,9 +62,7 @@ export function toSearchResult({ id: serviceType, score, title: name, - type: i18n.translate('xpack.enterpriseSearch.searchProvider.type.name', { - defaultMessage: 'Search', - }), + type: 'Elasticsearch', url: { path: url ?? newUrl, prependBasePath: true, @@ -108,18 +106,15 @@ export function getSearchResultProvider( ] : []), ...(config.hasConnectors ? connectorTypes : []), - ...(config.canDeployEntSearch - ? [ - { - keywords: ['esre', 'search'], - name: i18n.translate('xpack.enterpriseSearch.searchProvider.aiSearch.name', { - defaultMessage: 'Search AI', - }), - serviceType: 'ai_search', - url: AI_SEARCH_PLUGIN.URL, - }, - ] - : []), + + { + keywords: ['esre', 'search'], + name: i18n.translate('xpack.enterpriseSearch.searchProvider.aiSearch.name', { + defaultMessage: 'Search AI', + }), + serviceType: 'ai_search', + url: AI_SEARCH_PLUGIN.URL, + }, ]; const result = services .map((service) => { diff --git a/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx b/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx index 701490be4c4c4..9aeb87e134e6a 100644 --- a/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx +++ b/x-pack/plugins/spaces/public/management/components/solution_view/solution_view.tsx @@ -43,7 +43,7 @@ const getOptions = ({ size }: EuiThemeComputed): Array {i18n.translate( 'xpack.spaces.management.manageSpacePage.solutionViewSelect.searchOptionLabel', - { defaultMessage: 'Search' } + { defaultMessage: 'Elasticsearch' } )} ), diff --git a/x-pack/plugins/spaces/public/nav_control/solution_view_tour/solution_view_tour.tsx b/x-pack/plugins/spaces/public/nav_control/solution_view_tour/solution_view_tour.tsx index caa9cc17b053c..eda87809c66b3 100644 --- a/x-pack/plugins/spaces/public/nav_control/solution_view_tour/solution_view_tour.tsx +++ b/x-pack/plugins/spaces/public/nav_control/solution_view_tour/solution_view_tour.tsx @@ -28,7 +28,7 @@ const LearnMoreLink = () => ( const solutionMap: Record = { es: i18n.translate('xpack.spaces.navControl.tour.esSolution', { - defaultMessage: 'Search', + defaultMessage: 'Elasticsearch', }), security: i18n.translate('xpack.spaces.navControl.tour.securitySolution', { defaultMessage: 'Security', diff --git a/x-pack/plugins/spaces/public/space_solution_badge/badge.tsx b/x-pack/plugins/spaces/public/space_solution_badge/badge.tsx index e9c6a15d3bd90..7cdd605a9de62 100644 --- a/x-pack/plugins/spaces/public/space_solution_badge/badge.tsx +++ b/x-pack/plugins/spaces/public/space_solution_badge/badge.tsx @@ -21,7 +21,7 @@ const SolutionOptions: Record< label: ( ), }, diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index cb51a020eeaac..d4c29602b137f 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -3145,6 +3145,8 @@ "esqlEditor.query.EnableWordWrapLabel": "Ajouter des sauts de ligne aux barres verticales", "esqlEditor.query.errorCount": "{count} {count, plural, one {erreur} other {erreurs}}", "esqlEditor.query.errorsTitle": "Erreurs", + "esqlEditor.query.esqlQueriesCopy": "Copier la requête dans le presse-papier", + "esqlEditor.query.esqlQueriesListRun": "Exécuter la requête", "esqlEditor.query.expandLabel": "Développer", "esqlEditor.query.feedback": "Commentaires", "esqlEditor.query.hideQueriesLabel": "Masquer les recherches récentes", @@ -3154,8 +3156,6 @@ "esqlEditor.query.lineNumber": "Ligne {lineNumber}", "esqlEditor.query.querieshistory.error": "La requête a échouée", "esqlEditor.query.querieshistory.success": "La requête a été exécuté avec succès", - "esqlEditor.query.esqlQueriesCopy": "Copier la requête dans le presse-papier", - "esqlEditor.query.esqlQueriesListRun": "Exécuter la requête", "esqlEditor.query.querieshistoryTable": "Tableau d'historique des recherches", "esqlEditor.query.recentQueriesColumnLabel": "Recherches récentes", "esqlEditor.query.refreshLabel": "Actualiser", @@ -18922,7 +18922,6 @@ "xpack.enterpriseSearch.searchNav.otherTools": "Autres outils", "xpack.enterpriseSearch.searchNav.relevance": "Pertinence", "xpack.enterpriseSearch.searchProvider.aiSearch.name": "Intelligence artificielle de recherche", - "xpack.enterpriseSearch.searchProvider.type.name": "Recherche", "xpack.enterpriseSearch.searchProvider.webCrawler.name": "Robot d'indexation d'Elastic", "xpack.enterpriseSearch.selectConnector.badgeOnClick.ariaLabel": "Cliquer pour ouvrir la fenêtre contextuelle d'explication du connecteur", "xpack.enterpriseSearch.selectConnector.connectorClientBadgeLabel": "Autogéré", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index b5a0c4a1481df..8093adc62ff8a 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -3139,6 +3139,8 @@ "esqlEditor.query.EnableWordWrapLabel": "パイプの改行を追加", "esqlEditor.query.errorCount": "{count} {count, plural, other {# 件のエラー}}", "esqlEditor.query.errorsTitle": "エラー", + "esqlEditor.query.esqlQueriesCopy": "クエリをクリップボードにコピー", + "esqlEditor.query.esqlQueriesListRun": "クエリーを実行", "esqlEditor.query.expandLabel": "拡張", "esqlEditor.query.feedback": "フィードバック", "esqlEditor.query.hideQueriesLabel": "最近のクエリーを非表示", @@ -3148,8 +3150,6 @@ "esqlEditor.query.lineNumber": "行{lineNumber}", "esqlEditor.query.querieshistory.error": "クエリ失敗", "esqlEditor.query.querieshistory.success": "クエリは正常に実行されました", - "esqlEditor.query.esqlQueriesCopy": "クエリをクリップボードにコピー", - "esqlEditor.query.esqlQueriesListRun": "クエリーを実行", "esqlEditor.query.querieshistoryTable": "クエリ履歴テーブル", "esqlEditor.query.recentQueriesColumnLabel": "最近のクエリー", "esqlEditor.query.refreshLabel": "更新", @@ -18892,7 +18892,6 @@ "xpack.enterpriseSearch.searchNav.mngt": "スタック管理", "xpack.enterpriseSearch.searchNav.otherTools": "その他のツール", "xpack.enterpriseSearch.searchProvider.aiSearch.name": "検索AI", - "xpack.enterpriseSearch.searchProvider.type.name": "検索", "xpack.enterpriseSearch.searchProvider.webCrawler.name": "Elastic Webクローラー", "xpack.enterpriseSearch.selectConnector.badgeOnClick.ariaLabel": "クリックすると、コネクター説明ポップオーバーが開きます", "xpack.enterpriseSearch.selectConnector.connectorClientBadgeLabel": "セルフマネージド", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 8c21f00ca8228..a232bc7435c3e 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -3095,6 +3095,8 @@ "esqlEditor.query.EnableWordWrapLabel": "在管道符上添加换行符", "esqlEditor.query.errorCount": "{count} 个{count, plural, other {错误}}", "esqlEditor.query.errorsTitle": "错误", + "esqlEditor.query.esqlQueriesCopy": "复制查询到剪贴板", + "esqlEditor.query.esqlQueriesListRun": "运行查询", "esqlEditor.query.expandLabel": "展开", "esqlEditor.query.feedback": "反馈", "esqlEditor.query.hideQueriesLabel": "隐藏最近查询", @@ -3104,8 +3106,6 @@ "esqlEditor.query.lineNumber": "第 {lineNumber} 行", "esqlEditor.query.querieshistory.error": "查询失败", "esqlEditor.query.querieshistory.success": "已成功运行查询", - "esqlEditor.query.esqlQueriesCopy": "复制查询到剪贴板", - "esqlEditor.query.esqlQueriesListRun": "运行查询", "esqlEditor.query.querieshistoryTable": "查询历史记录表", "esqlEditor.query.recentQueriesColumnLabel": "最近查询", "esqlEditor.query.refreshLabel": "刷新", @@ -18558,7 +18558,6 @@ "xpack.enterpriseSearch.searchNav.otherTools": "其他工具", "xpack.enterpriseSearch.searchNav.relevance": "相关性", "xpack.enterpriseSearch.searchProvider.aiSearch.name": "搜索 AI", - "xpack.enterpriseSearch.searchProvider.type.name": "搜索", "xpack.enterpriseSearch.searchProvider.webCrawler.name": "Elastic 网络爬虫", "xpack.enterpriseSearch.selectConnector.badgeOnClick.ariaLabel": "单击以打开连接器说明弹出框", "xpack.enterpriseSearch.selectConnector.connectorClientBadgeLabel": "自管型",