diff --git a/x-pack/plugins/enterprise_search/SERVER.md b/x-pack/plugins/enterprise_search/SERVER.md index b4275f3bb545e..7b6865443e319 100644 --- a/x-pack/plugins/enterprise_search/SERVER.md +++ b/x-pack/plugins/enterprise_search/SERVER.md @@ -12,7 +12,7 @@ On startup, [the plugin](server/plugin.ts) registers all API routes with the mai API endpoints are organized according to loosely applied RESTful principles. GET for fetching data, POST for creating new data, PUT for updating data. The main routes you'll likely be working with: `enterprise_search` -- enterprise_search/analytics +- elasticsearch/analytics - enterprise_search/crawler - enterprise_search/connectors - enterprise_search/indices diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts index 4b9ea32949518..e67d32087787a 100644 --- a/x-pack/plugins/enterprise_search/common/constants.ts +++ b/x-pack/plugins/enterprise_search/common/constants.ts @@ -89,7 +89,7 @@ export const ANALYTICS_PLUGIN = { defaultMessage: 'Dashboards and tools for visualizing end-user behavior and measuring the performance of your search applications.', }), - URL: '/app/enterprise_search/analytics', + URL: '/app/elasticsearch/analytics', SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/', }; @@ -162,7 +162,7 @@ export const APPLICATIONS_PLUGIN = { defaultMessage: 'Build', }), SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/', - URL: '/app/enterprise_search/applications', + URL: '/app/elasticsearch/applications', }; export const VECTOR_SEARCH_PLUGIN = { diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.test.ts index 2b1fb081f51c5..603936327de4b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.test.ts @@ -23,7 +23,7 @@ describe('AddAnalyticsCollectionsApiLogic', () => { http.post.mockReturnValue(promise); const result = createAnalyticsCollection({ name: 'test' }); await nextTick(); - expect(http.post).toHaveBeenCalledWith('/internal/enterprise_search/analytics/collections', { + expect(http.post).toHaveBeenCalledWith('/internal/elasticsearch/analytics/collections', { body: JSON.stringify({ name: 'test' }), }); await expect(result).resolves.toEqual({ name: 'test' }); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.ts index 2aee9c0feb26b..d7d497891e921 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/add_analytics_collection/add_analytics_collection_api_logic.ts @@ -20,7 +20,7 @@ export const createAnalyticsCollection = async ({ name, }: AddAnalyticsCollectionApiLogicArgs): Promise => { const { http } = HttpLogic.values; - const route = '/internal/enterprise_search/analytics/collections'; + const route = '/internal/elasticsearch/analytics/collections'; const response = await http.post(route, { body: JSON.stringify({ name }), }); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.test.ts index 091b715744240..ead64d2eb1744 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.test.ts @@ -25,7 +25,7 @@ describe('AnalyticsEventsExistApiLogic', () => { const result = checkAnalyticsEventsExist({ indexName }); await nextTick(); expect(http.get).toHaveBeenCalledWith( - `/internal/enterprise_search/analytics/collection/${indexName}/events/exist` + `/internal/elasticsearch/analytics/collection/${indexName}/events/exist` ); await expect(result).resolves.toEqual({ exists: true }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.ts index 083297f571a9e..c1a3a0bcf1e52 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/check_analytics_events/check_analytics_events_exist_api_logic.ts @@ -19,7 +19,7 @@ export const checkAnalyticsEventsExist = async ({ indexName, }: AnalyticsEventsExistApiLogicArgs): Promise => { const { http } = HttpLogic.values; - const route = `/internal/enterprise_search/analytics/collection/${indexName}/events/exist`; + const route = `/internal/elasticsearch/analytics/collection/${indexName}/events/exist`; const response = await http.get(route); return response; diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.test.ts index 1ad6c18fea3bf..b3379b47a0fbe 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.test.ts @@ -25,7 +25,7 @@ describe('DeleteAnalyticsCollectionApiLogic', () => { const result = deleteAnalyticsCollection({ name }); await nextTick(); expect(http.delete).toHaveBeenCalledWith( - `/internal/enterprise_search/analytics/collections/${name}` + `/internal/elasticsearch/analytics/collections/${name}` ); await expect(result).resolves.toEqual(undefined); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.tsx index 2cddffd49dd5d..08108bab744e7 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/delete_analytics_collection/delete_analytics_collection_api_logic.tsx @@ -14,7 +14,7 @@ export type DeleteAnalyticsCollectionApiLogicResponse = void; export const deleteAnalyticsCollection = async ({ name }: { name: string }) => { const { http } = HttpLogic.values; - const route = `/internal/enterprise_search/analytics/collections/${name}`; + const route = `/internal/elasticsearch/analytics/collections/${name}`; await http.delete(route); return; diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.test.ts index ae21c61a8fad2..3a24a97a4ed30 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.test.ts @@ -25,7 +25,7 @@ describe('FetchAnalyticsCollectionApiLogic', () => { const result = fetchAnalyticsCollection({ name }); await nextTick(); expect(http.get).toHaveBeenCalledWith( - `/internal/enterprise_search/analytics/collections/${name}` + `/internal/elasticsearch/analytics/collections/${name}` ); await expect(result).resolves.toEqual({ name: 'result' }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.tsx index 5aafc82c29e0e..92938344a0bbe 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/fetch_analytics_collection/fetch_analytics_collection_api_logic.tsx @@ -14,7 +14,7 @@ export type FetchAnalyticsCollectionApiLogicResponse = AnalyticsCollection; export const fetchAnalyticsCollection = async ({ name }: { name: string }) => { const { http } = HttpLogic.values; - const route = `/internal/enterprise_search/analytics/collections/${name}`; + const route = `/internal/elasticsearch/analytics/collections/${name}`; const response = await http.get(route); return response; diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.test.ts index c1a5950e03073..460badab4ddfc 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.test.ts @@ -34,7 +34,7 @@ describe('GenerateAnalyticsApiKeyLogic', () => { }); await nextTick(); expect(http.post).toHaveBeenCalledWith( - '/internal/enterprise_search/analytics/collections/puggles/api_key', + '/internal/elasticsearch/analytics/collections/puggles/api_key', { body: JSON.stringify({ keyName: 'puggles read only key', diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.ts index 2603ee977a6a0..c0f4e8ea71771 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/generate_analytics_api_key/generate_analytics_api_key_logic.ts @@ -24,7 +24,7 @@ export const generateAnalyticsApiKey = async ({ collectionName: string; keyName: string; }) => { - const route = `/internal/enterprise_search/analytics/collections/${collectionName}/api_key`; + const route = `/internal/elasticsearch/analytics/collections/${collectionName}/api_key`; return await HttpLogic.values.http.post(route, { body: JSON.stringify({ diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.test.ts index 15d73d21ff890..c4fff16e6d194 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.test.ts @@ -23,7 +23,7 @@ describe('FetchAnalyticsCollectionsApiLogic', () => { http.get.mockReturnValue(promise); const result = fetchAnalyticsCollections({}); await nextTick(); - expect(http.get).toHaveBeenCalledWith('/internal/enterprise_search/analytics/collections', { + expect(http.get).toHaveBeenCalledWith('/internal/elasticsearch/analytics/collections', { query: { query: '' }, }); await expect(result).resolves.toEqual([{ name: 'result' }]); diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.ts index 45567d9202639..e1e8080973c2b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.ts +++ b/x-pack/plugins/enterprise_search/public/applications/analytics/api/index/fetch_analytics_collections_api_logic.ts @@ -20,7 +20,7 @@ export const fetchAnalyticsCollections = async ({ query = '', }: FetchAnalyticsCollectionsApiLogicArgs) => { const { http } = HttpLogic.values; - const route = '/internal/enterprise_search/analytics/collections'; + const route = '/internal/elasticsearch/analytics/collections'; const response = await http.get(route, { query: { query, 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 db0340e99317e..16bafb8b8467b 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 @@ -80,14 +80,14 @@ const baseNavItems = [ }, { 'data-test-subj': 'searchSideNav-SearchApplications', - href: '/app/enterprise_search/applications/search_applications', + href: '/app/elasticsearch/applications/search_applications', id: 'searchApplications', items: undefined, name: 'Search Applications', }, { 'data-test-subj': 'searchSideNav-BehavioralAnalytics', - href: '/app/enterprise_search/analytics', + href: '/app/elasticsearch/analytics', id: 'analyticsCollections', items: undefined, name: 'Behavioral Analytics', @@ -195,12 +195,12 @@ const mockNavLinks = [ { id: 'enterpriseSearchApplications:searchApplications', title: 'Search Applications', - url: '/app/enterprise_search/applications/search_applications', + url: '/app/elasticsearch/applications/search_applications', }, { id: 'enterpriseSearchAnalytics', title: 'Behavioral Analytics', - url: '/app/enterprise_search/analytics', + url: '/app/elasticsearch/analytics', }, { id: 'searchInferenceEndpoints:inferenceEndpoints', @@ -387,17 +387,17 @@ describe('useEnterpriseSearchApplicationNav', () => { const engineItem: EuiSideNavItemType = enginesItem!.items[0]; expect(engineItem).toMatchInlineSnapshot(` Object { - "href": "/app/enterprise_search/applications/search_applications/my-test-engine", + "href": "/app/elasticsearch/applications/search_applications/my-test-engine", "id": "searchApplicationId", "items": Array [ Object { - "href": "/app/enterprise_search/applications/search_applications/my-test-engine/docs_explorer", + "href": "/app/elasticsearch/applications/search_applications/my-test-engine/docs_explorer", "id": "enterpriseSearchApplicationDocsExplorer", "items": undefined, "name": "Docs Explorer", }, Object { - "href": "/app/enterprise_search/applications/search_applications/my-test-engine/content", + "href": "/app/elasticsearch/applications/search_applications/my-test-engine/content", "iconToString": undefined, "id": "enterpriseSearchApplicationsContent", "items": undefined, @@ -410,7 +410,7 @@ describe('useEnterpriseSearchApplicationNav', () => { "nameToString": "Content", }, Object { - "href": "/app/enterprise_search/applications/search_applications/my-test-engine/connect", + "href": "/app/elasticsearch/applications/search_applications/my-test-engine/connect", "id": "enterpriseSearchApplicationConnect", "items": undefined, "name": "Connect", @@ -448,7 +448,7 @@ describe('useEnterpriseSearchApplicationNav', () => { // @ts-ignore const engineItem: EuiSideNavItemType = enginesItem!.items[0]; expect(engineItem).toEqual({ - href: `/app/enterprise_search/applications/search_applications/${engineName}`, + href: `/app/elasticsearch/applications/search_applications/${engineName}`, id: 'searchApplicationId', name: engineName, }); @@ -470,7 +470,7 @@ describe('useEnterpriseSearchApplicationNav', () => { expect(engineItem).toMatchInlineSnapshot(` Object { - "href": "/app/enterprise_search/applications/search_applications/my-test-engine/content", + "href": "/app/elasticsearch/applications/search_applications/my-test-engine/content", "iconToString": "warning", "id": "enterpriseSearchApplicationsContent", "items": undefined, @@ -535,24 +535,24 @@ describe('useEnterpriseSearchAnalyticsNav', () => { expect(analyticsNav).not.toBeUndefined(); expect(analyticsNav).toEqual({ 'data-test-subj': 'searchSideNav-BehavioralAnalytics', - href: '/app/enterprise_search/analytics', + href: '/app/elasticsearch/analytics', id: 'analyticsCollections', items: [ { id: 'analyticsCollection', items: [ { - href: '/app/enterprise_search/analytics/overview-path', + href: '/app/elasticsearch/analytics/overview-path', id: 'analyticsCollectionOverview', name: 'Overview', }, { - href: '/app/enterprise_search/analytics/explorer-path', + href: '/app/elasticsearch/analytics/explorer-path', id: 'analyticsCollectionExplorer', name: 'Explorer', }, { - href: '/app/enterprise_search/analytics/integration-path', + href: '/app/elasticsearch/analytics/integration-path', id: 'analyticsCollectionIntegration', name: 'Integration', }, diff --git a/x-pack/plugins/enterprise_search/public/navigation_tree.ts b/x-pack/plugins/enterprise_search/public/navigation_tree.ts index dfd639a075520..a098cf9c4883f 100644 --- a/x-pack/plugins/enterprise_search/public/navigation_tree.ts +++ b/x-pack/plugins/enterprise_search/public/navigation_tree.ts @@ -163,7 +163,7 @@ export const getNavigationTreeDefinition = ({ return ( pathNameSerialized === - prepend(`/app/enterprise_search/applications${SEARCH_APPLICATIONS_PATH}`) + prepend(`/app/elasticsearch/applications${SEARCH_APPLICATIONS_PATH}`) ); }, link: 'enterpriseSearchApplications:searchApplications', @@ -190,7 +190,7 @@ export const getNavigationTreeDefinition = ({ if (someSubItemSelected) return false; - return pathNameSerialized === prepend(`/app/enterprise_search/analytics`); + return pathNameSerialized === prepend(`/app/elasticsearch/analytics`); }, link: 'enterpriseSearchAnalytics', renderAs: 'item', diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts index 96c6501200e56..74a161c1fd80f 100644 --- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts @@ -25,7 +25,7 @@ describe('Enterprise Search Analytics API', () => { let mockRouter: MockRouter; const mockClient = {}; - describe('GET /internal/enterprise_search/analytics/collections', () => { + describe('GET /internal/elasticsearch/analytics/collections', () => { beforeEach(() => { const context = { core: Promise.resolve({ elasticsearch: { client: mockClient } }), @@ -34,7 +34,7 @@ describe('Enterprise Search Analytics API', () => { mockRouter = new MockRouter({ context, method: 'get', - path: '/internal/enterprise_search/analytics/collections', + path: '/internal/elasticsearch/analytics/collections', }); const mockDataPlugin = { @@ -99,7 +99,7 @@ describe('Enterprise Search Analytics API', () => { }); }); - describe('GET /internal/enterprise_search/analytics/collections/{id}', () => { + describe('GET /internal/elasticsearch/analytics/collections/{id}', () => { beforeEach(() => { const context = { core: Promise.resolve({ elasticsearch: { client: mockClient } }), @@ -108,7 +108,7 @@ describe('Enterprise Search Analytics API', () => { mockRouter = new MockRouter({ context, method: 'get', - path: '/internal/enterprise_search/analytics/collections/{name}', + path: '/internal/elasticsearch/analytics/collections/{name}', }); const mockDataPlugin = { diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.ts index abdf0673665c8..dcab09156f0b4 100644 --- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.ts +++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.ts @@ -50,7 +50,7 @@ export function registerAnalyticsRoutes({ }: AnalyticsRouteDependencies) { router.get( { - path: '/internal/enterprise_search/analytics/collections', + path: '/internal/elasticsearch/analytics/collections', validate: { query: schema.object({ query: schema.maybe(schema.string()), @@ -75,7 +75,7 @@ export function registerAnalyticsRoutes({ router.get( { - path: '/internal/enterprise_search/analytics/collections/{name}', + path: '/internal/elasticsearch/analytics/collections/{name}', validate: { params: schema.object({ name: schema.string(), @@ -101,7 +101,7 @@ export function registerAnalyticsRoutes({ router.post( { - path: '/internal/enterprise_search/analytics/collections/{name}/api_key', + path: '/internal/elasticsearch/analytics/collections/{name}/api_key', validate: { body: schema.object({ keyName: schema.string(), @@ -127,7 +127,7 @@ export function registerAnalyticsRoutes({ router.post( { - path: '/internal/enterprise_search/analytics/collections', + path: '/internal/elasticsearch/analytics/collections', validate: { body: schema.object({ name: schema.string(), @@ -172,7 +172,7 @@ export function registerAnalyticsRoutes({ router.delete( { - path: '/internal/enterprise_search/analytics/collections/{name}', + path: '/internal/elasticsearch/analytics/collections/{name}', validate: { params: schema.object({ name: schema.string(), @@ -195,7 +195,7 @@ export function registerAnalyticsRoutes({ router.get( { - path: '/internal/enterprise_search/analytics/collection/{name}/events/exist', + path: '/internal/elasticsearch/analytics/collection/{name}/events/exist', validate: { params: schema.object({ name: schema.string(), diff --git a/x-pack/test/accessibility/apps/group3/enterprise_search.ts b/x-pack/test/accessibility/apps/group3/enterprise_search.ts index e2652aef953a1..f048b3804aa46 100644 --- a/x-pack/test/accessibility/apps/group3/enterprise_search.ts +++ b/x-pack/test/accessibility/apps/group3/enterprise_search.ts @@ -106,7 +106,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Playground', () => { before(async () => { - await common.navigateToApp('enterprise_search/applications'); + await common.navigateToApp('elasticsearch/applications'); }); it('loads playground', async function () { @@ -120,7 +120,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Search Applications', () => { before(async () => { - await common.navigateToApp('enterprise_search/applications/search_applications'); + await common.navigateToApp('elasticsearch/applications/search_applications'); }); it('loads search applications list', async function () { @@ -133,7 +133,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); describe('Behavioral Analytics', () => { before(async () => { - await common.navigateToApp('enterprise_search/analytics'); + await common.navigateToApp('elasticsearch/analytics'); }); it('loads Behavioral Analytics page', async function () {