github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.x] [Ent Search Deprecation] Update enterprise_search URLs to elasticsearch for elasticsearch->content (#202838) (#203890)

Browse source 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Ent Search Deprecation] Update enterprise_search URLs to
elasticsearch for elasticsearch->content
(#202838)](https://github.com/elastic/kibana/pull/202838)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Saikat
Sarkar","email":"132922331+saikatsarkar056@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-12-11T05:30:55Z","message":"[Ent
Search Deprecation] Update enterprise_search URLs to elasticsearch for
elasticsearch->content (#202838)\n\nThis PR resolves
this\r\n[issue](https://github.com/elastic/search-team/issues/7961). In
this PR,\r\nwe changed the following Urls by replacing
'enterprise_search' with\r\n'elasticsearch'.\r\n\r\n| Old URL | New URL
|\r\n| :-------------------------------------
|\r\n:------------------------------------- |\r\n|
app/enterprise_search/overview | app/elasticsearch/overview | \r\n|
app/enterprise_search/content/search_indices
|\r\napp/elasticsearch/content/search_indices |\r\n|
app/enterprise_search/content/connectors
|\r\napp/elasticsearch/content/connectors |​\r\n|
app/enterprise_search/content/crawlers
|\r\napp/elasticsearch/content/crawlers
|\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine
<elasticmachine@users.noreply.github.com>","sha":"c5e8b7e72293d3fc6e39e603045b42afdfba8cc6","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:EnterpriseSearch","backport:prev-minor","v8.18.0"],"number":202838,"url":"https://github.com/elastic/kibana/pull/202838","mergeCommit":{"message":"[Ent
Search Deprecation] Update enterprise_search URLs to elasticsearch for
elasticsearch->content (#202838)\n\nThis PR resolves
this\r\n[issue](https://github.com/elastic/search-team/issues/7961). In
this PR,\r\nwe changed the following Urls by replacing
'enterprise_search' with\r\n'elasticsearch'.\r\n\r\n| Old URL | New URL
|\r\n| :-------------------------------------
|\r\n:------------------------------------- |\r\n|
app/enterprise_search/overview | app/elasticsearch/overview | \r\n|
app/enterprise_search/content/search_indices
|\r\napp/elasticsearch/content/search_indices |\r\n|
app/enterprise_search/content/connectors
|\r\napp/elasticsearch/content/connectors |​\r\n|
app/enterprise_search/content/crawlers
|\r\napp/elasticsearch/content/crawlers
|\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine
<elasticmachine@users.noreply.github.com>","sha":"c5e8b7e72293d3fc6e39e603045b42afdfba8cc6"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/202838","number":202838,"mergeCommit":{"message":"[Ent
Search Deprecation] Update enterprise_search URLs to elasticsearch for
elasticsearch->content (#202838)\n\nThis PR resolves
this\r\n[issue](https://github.com/elastic/search-team/issues/7961). In
this PR,\r\nwe changed the following Urls by replacing
'enterprise_search' with\r\n'elasticsearch'.\r\n\r\n| Old URL | New URL
|\r\n| :-------------------------------------
|\r\n:------------------------------------- |\r\n|
app/enterprise_search/overview | app/elasticsearch/overview | \r\n|
app/enterprise_search/content/search_indices
|\r\napp/elasticsearch/content/search_indices |\r\n|
app/enterprise_search/content/connectors
|\r\napp/elasticsearch/content/connectors |​\r\n|
app/enterprise_search/content/crawlers
|\r\napp/elasticsearch/content/crawlers
|\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine
<elasticmachine@users.noreply.github.com>","sha":"c5e8b7e72293d3fc6e39e603045b42afdfba8cc6"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
This commit is contained in:
Saikat Sarkar 2024-12-12 15:06:29 -07:00 • committed by GitHub
parent 7c867abae6
commit 8bc619d9dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/plugins/console/public/application/lib/load_from.test.ts
View file

@ -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);

2
src/plugins/navigation/common/constants.ts
View file

@ -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',
};

4
x-pack/plugins/enterprise_search/common/constants.ts
View file

@ -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/',
};

10
x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts
View file

@ -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}/`;
};

2
x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts
View file

@ -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';

12
x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
View file

@ -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),
},
{

16
x-pack/plugins/enterprise_search/public/applications/shared/layout/classic_nav_helpers.test.ts
View file

@ -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<string, ChromeNavLink | undefined>;
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',

16
x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
View file

@ -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',

2
x-pack/plugins/enterprise_search/public/navigation_tree.ts
View file

@ -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',

4
x-pack/plugins/enterprise_search/server/integrations.ts
View file

@ -28,7 +28,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',
@ -49,7 +49,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',

22
x-pack/plugins/search_solution/search_navigation/public/classic_navigation.test.ts
View file

@ -15,23 +15,23 @@ describe('classicNavigationFactory', function () {
const mockedNavLinks: Array<Partial<ChromeNavLink>> = [
{
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',

4
x-pack/test/accessibility/apps/group3/enterprise_search.ts
View file

@ -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 () {
@ -59,7 +59,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 () {

2
x-pack/test/functional/config.base.js
View file

@ -197,7 +197,7 @@ export default async function ({ readConfigFile }) {
pathname: '/app/management/kibana/observabilityAiAssistantManagement',
},
enterpriseSearch: {
pathname: '/app/enterprise_search/overview',
pathname: '/app/elasticsearch/overview',
},
},