diff --git a/src/plugins/console/public/application/lib/load_from.test.ts b/src/plugins/console/public/application/lib/load_from.test.ts index 8e79dae8764de..d7a2066f72049 100644 --- a/src/plugins/console/public/application/lib/load_from.test.ts +++ b/src/plugins/console/public/application/lib/load_from.test.ts @@ -102,11 +102,11 @@ describe('load from lib', () => { it('works with a non-hash route', () => { mockWindow.location = { ...mockWindow.location, - pathname: '/foo/app/enterprise_search/overview', + pathname: '/foo/app/elasticsearch/overview', }; const codeSnippet = 'GET /_stats'; const expectedUrl = - 'https://my-kibana.elastic.co/foo/app/enterprise_search/overview?load_from=data%3Atext%2Fplain%2COIUQKgBA9A%2BgzgFwIYLkA'; + 'https://my-kibana.elastic.co/foo/app/elasticsearch/overview?load_from=data%3Atext%2Fplain%2COIUQKgBA9A%2BgzgFwIYLkA'; setLoadFromParameter(codeSnippet); expect(mockWindow.history.pushState).toHaveBeenCalledTimes(1); @@ -121,12 +121,12 @@ describe('load from lib', () => { it('works with a non-hash route and other params', () => { mockWindow.location = { ...mockWindow.location, - pathname: '/foo/app/enterprise_search/overview', + pathname: '/foo/app/elasticsearch/overview', search: '?foo=bar', }; const codeSnippet = 'GET /_stats'; const expectedUrl = - 'https://my-kibana.elastic.co/foo/app/enterprise_search/overview?foo=bar&load_from=data%3Atext%2Fplain%2COIUQKgBA9A%2BgzgFwIYLkA'; + 'https://my-kibana.elastic.co/foo/app/elasticsearch/overview?foo=bar&load_from=data%3Atext%2Fplain%2COIUQKgBA9A%2BgzgFwIYLkA'; setLoadFromParameter(codeSnippet); expect(mockWindow.history.pushState).toHaveBeenCalledTimes(1); diff --git a/src/plugins/navigation/common/constants.ts b/src/plugins/navigation/common/constants.ts index 0a054aff5dc2f..0d527e3b49056 100644 --- a/src/plugins/navigation/common/constants.ts +++ b/src/plugins/navigation/common/constants.ts @@ -11,7 +11,7 @@ export const DEFAULT_ROUTE_UI_SETTING_ID = 'defaultRoute'; export const DEFAULT_ROUTES = { classic: '/app/home', - es: '/app/enterprise_search/overview', + es: '/app/elasticsearch/overview', oblt: '/app/observabilityOnboarding', security: '/app/security/get_started', }; diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts index e67d32087787a..638e292ff0e25 100644 --- a/x-pack/plugins/enterprise_search/common/constants.ts +++ b/x-pack/plugins/enterprise_search/common/constants.ts @@ -41,7 +41,7 @@ export const ENTERPRISE_SEARCH_OVERVIEW_PLUGIN = { DESCRIPTION: i18n.translate('xpack.enterpriseSearch.overview.description', { defaultMessage: 'Create search experiences with a refined set of APIs and tools.', }), - URL: '/app/enterprise_search/overview', + URL: '/app/elasticsearch/overview', LOGO: 'logoEnterpriseSearch', }; @@ -55,7 +55,7 @@ export const ENTERPRISE_SEARCH_CONTENT_PLUGIN = { defaultMessage: 'Enterprise search offers a number of ways to easily make your data searchable. Choose from the web crawler, Elasticsearch indices, API, direct uploads, or thrid party connectors.', // TODO: Make sure this content is correct. }), - URL: '/app/enterprise_search/content', + URL: '/app/elasticsearch/content', LOGO: 'logoEnterpriseSearch', SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/', }; diff --git a/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts b/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts index 03cb09385a0fa..b4e1aee6f21b6 100644 --- a/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts +++ b/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts @@ -6,10 +6,10 @@ */ export const ROUTES = { - CRAWLER_INDEX: '/app/enterprise_search/content/crawlers/new_crawler', - NEW_INDEX: '/app/enterprise_search/content/search_indices/new_index', - SEARCH_INDICES_OVERVIEW: '/app/enterprise_search/content/search_indices/', - SELECT_CONNECTOR: '/app/enterprise_search/content/connectors/select_connector', + CRAWLER_INDEX: '/app/elasticsearch/content/crawlers/new_crawler', + NEW_INDEX: '/app/elasticsearch/content/search_indices/new_index', + SEARCH_INDICES_OVERVIEW: '/app/elasticsearch/content/search_indices/', + SELECT_CONNECTOR: '/app/elasticsearch/content/connectors/select_connector', }; export const SEARCH_INDICES = { @@ -66,5 +66,5 @@ export const INDEX_OVERVIEW = { }; export const getIndexRoute = (indexName: string) => { - return `/app/enterprise_search/content/search_indices/search-${indexName}/`; + return `/app/elasticsearch/content/search_indices/search-${indexName}/`; }; diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts index b1a0aaba95661..3d74b81cfddb9 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts @@ -5,6 +5,6 @@ * 2.0. */ -export const overviewPath = '/app/enterprise_search/overview'; +export const overviewPath = '/app/elasticsearch/overview'; export const appSearchPath = '/app/enterprise_search/app_search'; export const workplaceSearchPath = '/app/enterprise_search/workplace_search'; 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 47dcd899d82cf..7cda1c6893b17 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 @@ -163,7 +163,7 @@ describe('useSearchBreadcrumbs', () => { expect(useSearchBreadcrumbs(breadcrumbs)).toEqual([ { text: 'Elasticsearch', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', onClick: expect.any(Function), }, { @@ -206,7 +206,7 @@ describe('useEnterpriseSearchBreadcrumbs', () => { expect(useEnterpriseSearchBreadcrumbs(breadcrumbs)).toEqual([ { text: 'Enterprise Search', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', onClick: expect.any(Function), }, { @@ -252,7 +252,7 @@ describe('useAppSearchBreadcrumbs', () => { expect(useAppSearchBreadcrumbs(breadcrumbs)).toEqual([ { text: 'Enterprise Search', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', onClick: expect.any(Function), }, { @@ -275,7 +275,7 @@ describe('useAppSearchBreadcrumbs', () => { expect(useAppSearchBreadcrumbs()).toEqual([ { text: 'Enterprise Search', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', onClick: expect.any(Function), }, { @@ -308,7 +308,7 @@ describe('useWorkplaceSearchBreadcrumbs', () => { expect(useWorkplaceSearchBreadcrumbs(breadcrumbs)).toEqual([ { text: 'Enterprise Search', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', onClick: expect.any(Function), }, { @@ -331,7 +331,7 @@ describe('useWorkplaceSearchBreadcrumbs', () => { expect(useWorkplaceSearchBreadcrumbs()).toEqual([ { text: 'Enterprise Search', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', onClick: expect.any(Function), }, { diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/classic_nav_helpers.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/layout/classic_nav_helpers.test.ts index 50c5841092a6d..457dfcbad3b5c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/classic_nav_helpers.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/classic_nav_helpers.test.ts @@ -22,23 +22,23 @@ describe('generateSideNavItems', () => { const deepLinksMap = { enterpriseSearch: { id: 'enterpriseSearch', - url: '/app/enterprise_search/overview', + url: '/app/elasticsearch/overview', title: 'Overview', }, 'enterpriseSearchContent:searchIndices': { id: 'enterpriseSearchContent:searchIndices', title: 'Indices', - url: '/app/enterprise_search/content/search_indices', + url: '/app/elasticsearch/content/search_indices', }, 'enterpriseSearchContent:connectors': { id: 'enterpriseSearchContent:connectors', title: 'Connectors', - url: '/app/enterprise_search/content/connectors', + url: '/app/elasticsearch/content/connectors', }, 'enterpriseSearchContent:webCrawlers': { id: 'enterpriseSearchContent:webCrawlers', title: 'Web Crawlers', - url: '/app/enterprise_search/content/crawlers', + url: '/app/elasticsearch/content/crawlers', }, } as unknown as Record; beforeEach(() => { @@ -58,7 +58,7 @@ describe('generateSideNavItems', () => { expect(generateSideNavItems(classicNavItems, deepLinksMap)).toEqual([ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: false, name: 'Overview', @@ -88,7 +88,7 @@ describe('generateSideNavItems', () => { id: 'parent', items: [ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: false, name: 'Overview', @@ -113,7 +113,7 @@ describe('generateSideNavItems', () => { expect(generateSideNavItems(classicNavItems, deepLinksMap)).toEqual([ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: false, name: 'Home', @@ -141,7 +141,7 @@ describe('generateSideNavItems', () => { expect(generateSideNavItems(classicNavItems, deepLinksMap)).toEqual([ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: false, name: 'Home', diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx index 16bafb8b8467b..36bd081021cf3 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx @@ -35,7 +35,7 @@ const DEFAULT_PRODUCT_ACCESS: ProductAccess = { const baseNavItems = [ expect.objectContaining({ 'data-test-subj': 'searchSideNav-Home', - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'home', items: undefined, }), @@ -45,21 +45,21 @@ const baseNavItems = [ items: [ { 'data-test-subj': 'searchSideNav-Indices', - href: '/app/enterprise_search/content/search_indices', + href: '/app/elasticsearch/content/search_indices', id: 'search_indices', items: [], name: 'Indices', }, { 'data-test-subj': 'searchSideNav-Connectors', - href: '/app/enterprise_search/content/connectors', + href: '/app/elasticsearch/content/connectors', id: 'connectors', items: undefined, name: 'Connectors', }, { 'data-test-subj': 'searchSideNav-Crawlers', - href: '/app/enterprise_search/content/crawlers', + href: '/app/elasticsearch/content/crawlers', id: 'crawlers', items: undefined, name: 'Web Crawlers', @@ -170,22 +170,22 @@ const baseNavItems = [ const mockNavLinks = [ { id: 'enterpriseSearch', - url: '/app/enterprise_search/overview', + url: '/app/elasticsearch/overview', }, { id: 'enterpriseSearchContent:searchIndices', title: 'Indices', - url: '/app/enterprise_search/content/search_indices', + url: '/app/elasticsearch/content/search_indices', }, { id: 'enterpriseSearchContent:connectors', title: 'Connectors', - url: '/app/enterprise_search/content/connectors', + url: '/app/elasticsearch/content/connectors', }, { id: 'enterpriseSearchContent:webCrawlers', title: 'Web Crawlers', - url: '/app/enterprise_search/content/crawlers', + url: '/app/elasticsearch/content/crawlers', }, { id: 'searchPlayground', diff --git a/x-pack/plugins/enterprise_search/public/navigation_tree.ts b/x-pack/plugins/enterprise_search/public/navigation_tree.ts index a098cf9c4883f..e235876e11b0a 100644 --- a/x-pack/plugins/enterprise_search/public/navigation_tree.ts +++ b/x-pack/plugins/enterprise_search/public/navigation_tree.ts @@ -127,7 +127,7 @@ export const getNavigationTreeDefinition = ({ return ( pathNameSerialized === - prepend(`/app/enterprise_search/content${SEARCH_INDICES_PATH}`) + prepend(`/app/elasticsearch/content${SEARCH_INDICES_PATH}`) ); }, link: 'enterpriseSearchContent:searchIndices', diff --git a/x-pack/plugins/enterprise_search/server/integrations.ts b/x-pack/plugins/enterprise_search/server/integrations.ts index d66768e578732..cc1682386642b 100644 --- a/x-pack/plugins/enterprise_search/server/integrations.ts +++ b/x-pack/plugins/enterprise_search/server/integrations.ts @@ -23,7 +23,7 @@ export const registerEnterpriseSearchIntegrations = ( defaultMessage: 'Add search to your website with the web crawler.', }), categories: ['search', 'web', 'elastic_stack', 'crawler'], - uiInternalPath: '/app/enterprise_search/content/crawlers/new_crawler', + uiInternalPath: '/app/elasticsearch/content/crawlers/new_crawler', icons: [ { type: 'eui', @@ -44,7 +44,7 @@ export const registerEnterpriseSearchIntegrations = ( defaultMessage: "Add search to your application with Elasticsearch's robust APIs.", }), categories: ['search', 'custom', 'elastic_stack', 'sdk_search', 'language_client'], - uiInternalPath: '/app/enterprise_search/content/search_indices/new_index/api', + uiInternalPath: '/app/elasticsearch/content/search_indices/new_index/api', icons: [ { type: 'eui', diff --git a/x-pack/plugins/search_solution/search_navigation/public/classic_navigation.test.ts b/x-pack/plugins/search_solution/search_navigation/public/classic_navigation.test.ts index 45c6e4c02ace4..bb9789442c18b 100644 --- a/x-pack/plugins/search_solution/search_navigation/public/classic_navigation.test.ts +++ b/x-pack/plugins/search_solution/search_navigation/public/classic_navigation.test.ts @@ -15,23 +15,23 @@ describe('classicNavigationFactory', function () { const mockedNavLinks: Array> = [ { id: 'enterpriseSearch', - url: '/app/enterprise_search/overview', + url: '/app/elasticsearch/overview', title: 'Overview', }, { id: 'enterpriseSearchContent:searchIndices', title: 'Indices', - url: '/app/enterprise_search/content/search_indices', + url: '/app/elasticsearch/content/search_indices', }, { id: 'enterpriseSearchContent:connectors', title: 'Connectors', - url: '/app/enterprise_search/content/connectors', + url: '/app/elasticsearch/content/connectors', }, { id: 'enterpriseSearchContent:webCrawlers', title: 'Web Crawlers', - url: '/app/enterprise_search/content/crawlers', + url: '/app/elasticsearch/content/crawlers', }, ]; const mockedCoreStart = { @@ -69,7 +69,7 @@ describe('classicNavigationFactory', function () { icon: 'logoEnterpriseSearch', items: [ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: false, name: 'Overview', @@ -82,7 +82,7 @@ describe('classicNavigationFactory', function () { it('will set isSelected', () => { mockHistory.location.pathname = '/overview'; - mockHistory.createHref.mockReturnValue('/app/enterprise_search/overview'); + mockHistory.createHref.mockReturnValue('/app/elasticsearch/overview'); const items: ClassicNavItem[] = [ { @@ -96,7 +96,7 @@ describe('classicNavigationFactory', function () { const solutionNav = classicNavigationFactory(items, core, history); expect(solutionNav!.items).toEqual([ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: true, name: 'Overview', @@ -132,14 +132,14 @@ describe('classicNavigationFactory', function () { id: 'searchContent', items: [ { - href: '/app/enterprise_search/content/search_indices', + href: '/app/elasticsearch/content/search_indices', id: 'searchIndices', isSelected: false, name: 'Indices', onClick: expect.any(Function), }, { - href: '/app/enterprise_search/content/connectors', + href: '/app/elasticsearch/content/connectors', id: 'searchConnectors', isSelected: false, name: 'Connectors', @@ -163,7 +163,7 @@ describe('classicNavigationFactory', function () { const solutionNav = classicNavigationFactory(items, core, history); expect(solutionNav!.items).toEqual([ { - href: '/app/enterprise_search/content/search_indices', + href: '/app/elasticsearch/content/search_indices', id: 'searchIndices', isSelected: false, name: 'Index Management', @@ -190,7 +190,7 @@ describe('classicNavigationFactory', function () { const solutionNav = classicNavigationFactory(items, core, history); expect(solutionNav!.items).toEqual([ { - href: '/app/enterprise_search/overview', + href: '/app/elasticsearch/overview', id: 'unit-test', isSelected: false, name: 'Overview', diff --git a/x-pack/test/accessibility/apps/group3/enterprise_search.ts b/x-pack/test/accessibility/apps/group3/enterprise_search.ts index f048b3804aa46..9210a5ccb6a6a 100644 --- a/x-pack/test/accessibility/apps/group3/enterprise_search.ts +++ b/x-pack/test/accessibility/apps/group3/enterprise_search.ts @@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Overview', () => { before(async () => { - await common.navigateToApp('enterprise_search/overview'); + await common.navigateToApp('elasticsearch/overview'); }); it('loads a landing page with product cards', async function () { @@ -50,7 +50,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Content', () => { before(async () => { - await common.navigateToApp('enterprise_search/content/search_indices'); + await common.navigateToApp('elasticsearch/content/search_indices'); }); it('loads the indices page', async function () { diff --git a/x-pack/test/functional/config.base.js b/x-pack/test/functional/config.base.js index d5c6d77785b85..eb13de1c0c9e8 100644 --- a/x-pack/test/functional/config.base.js +++ b/x-pack/test/functional/config.base.js @@ -197,7 +197,7 @@ export default async function ({ readConfigFile }) { pathname: '/app/management/kibana/observabilityAiAssistantManagement', }, enterpriseSearch: { - pathname: '/app/enterprise_search/overview', + pathname: '/app/elasticsearch/overview', }, },