Skip to content

Commit ebbca82

Browse files
thompsonglthompsongl
committed
Merge branch 'master' into eui/34.2
2 parents 9381cc0 + 045a32b commit ebbca82

87 files changed

Lines changed: 1823 additions & 840 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎x-pack/plugins/apm/public/components/app/RumDashboard/ActionMenu/index.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ export function UXActionMenu({
4747

4848
const uxExploratoryViewLink = createExploratoryViewUrl(
4949
{
50-
'ux-series': {
50+
'ux-series': ({
5151
dataType: 'ux',
52+
isNew: true,
5253
time: { from: rangeFrom, to: rangeTo },
53-
} as SeriesUrl,
54+
} as unknown) as SeriesUrl,
5455
},
5556
http?.basePath.get()
5657
);

‎x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export function PageLoadDistribution() {
8989
{
9090
[`${serviceName}-page-views`]: {
9191
dataType: 'ux',
92-
reportType: 'dist',
92+
reportType: 'data-distribution',
9393
time: { from: rangeFrom!, to: rangeTo! },
9494
reportDefinitions: {
9595
'service.name': serviceName as string[],

‎x-pack/plugins/apm/public/components/app/RumDashboard/PageViewsTrend/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export function PageViewsTrend() {
6464
{
6565
[`${serviceName}-page-views`]: {
6666
dataType: 'ux',
67-
reportType: 'kpi',
67+
reportType: 'kpi-over-time',
6868
time: { from: rangeFrom!, to: rangeTo! },
6969
reportDefinitions: {
7070
'service.name': serviceName as string[],

‎x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
EuiButton,
2323
} from '@elastic/eui';
2424

25+
import { ENGINES_TITLE } from '../engines';
2526
import { AppSearchPageTemplate } from '../layout';
2627

2728
import {
@@ -43,7 +44,7 @@ export const EngineCreation: React.FC = () => {
4344

4445
return (
4546
<AppSearchPageTemplate
46-
pageChrome={[ENGINE_CREATION_TITLE]}
47+
pageChrome={[ENGINES_TITLE, ENGINE_CREATION_TITLE]}
4748
pageHeader={{ pageTitle: ENGINE_CREATION_TITLE }}
4849
data-test-subj="EngineCreation"
4950
>

‎x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('EmptyState', () => {
5353
});
5454

5555
it('sends a user to engine creation', () => {
56-
expect(button.prop('to')).toEqual('/engine_creation');
56+
expect(button.prop('to')).toEqual('/engines/new');
5757
});
5858
});
5959
});

‎x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { setMockValues } from '../../../__mocks__/kea_logic';
99

1010
jest.mock('../../../shared/layout', () => ({
11-
generateNavLink: jest.fn(({ to }) => ({ href: to })),
11+
generateNavLink: jest.fn(({ to, items }) => ({ href: to, items })),
1212
}));
1313
jest.mock('../engine/engine_nav', () => ({
1414
useEngineNav: () => [],

‎x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/nav.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ export const useAppSearchNav = () => {
2828
{
2929
id: 'engines',
3030
name: ENGINES_TITLE,
31-
...generateNavLink({ to: ENGINES_PATH, isRoot: true }),
32-
items: useEngineNav(),
31+
...generateNavLink({
32+
to: ENGINES_PATH,
33+
isRoot: true,
34+
shouldShowActiveForSubroutes: true,
35+
items: useEngineNav(),
36+
}),
3337
},
3438
];
3539

‎x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
} from '@elastic/eui';
2626

2727
import { AppLogic } from '../../app_logic';
28+
import { ENGINES_TITLE } from '../engines';
2829
import { AppSearchPageTemplate } from '../layout';
2930

3031
import {
@@ -73,7 +74,7 @@ export const MetaEngineCreation: React.FC = () => {
7374

7475
return (
7576
<AppSearchPageTemplate
76-
pageChrome={[META_ENGINE_CREATION_TITLE]}
77+
pageChrome={[ENGINES_TITLE, META_ENGINE_CREATION_TITLE]}
7778
pageHeader={{
7879
pageTitle: META_ENGINE_CREATION_TITLE,
7980
description: (

‎x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
104104
<Route exact path={ENGINES_PATH}>
105105
<EnginesOverview />
106106
</Route>
107-
<Route path={ENGINE_PATH}>
108-
<EngineRouter />
109-
</Route>
110107
{canManageEngines && (
111108
<Route exact path={ENGINE_CREATION_PATH}>
112109
<EngineCreation />
@@ -117,6 +114,9 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
117114
<MetaEngineCreation />
118115
</Route>
119116
)}
117+
<Route path={ENGINE_PATH}>
118+
<EngineRouter />
119+
</Route>
120120
{canViewSettings && (
121121
<Route exact path={SETTINGS_PATH}>
122122
<Settings />

‎x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const CREDENTIALS_PATH = '/credentials';
1818
export const ROLE_MAPPINGS_PATH = '/role_mappings';
1919

2020
export const ENGINES_PATH = '/engines';
21-
export const ENGINE_CREATION_PATH = '/engine_creation';
21+
export const ENGINE_CREATION_PATH = `${ENGINES_PATH}/new`; // This is safe from conflicting with an :engineName path because new is a reserved name
2222
export const ENGINE_PATH = `${ENGINES_PATH}/:engineName`;
2323

2424
export const ENGINE_ANALYTICS_PATH = `${ENGINE_PATH}/analytics`;
@@ -39,7 +39,7 @@ export const ENGINE_REINDEX_JOB_PATH = `${ENGINE_SCHEMA_PATH}/reindex_job/:reind
3939
export const ENGINE_CRAWLER_PATH = `${ENGINE_PATH}/crawler`;
4040
export const ENGINE_CRAWLER_DOMAIN_PATH = `${ENGINE_CRAWLER_PATH}/domains/:domainId`;
4141

42-
export const META_ENGINE_CREATION_PATH = '/meta_engine_creation';
42+
export const META_ENGINE_CREATION_PATH = `${ENGINES_PATH}/new_meta_engine`; // This is safe from conflicting with an :engineName path because engine names cannot have underscores
4343
export const META_ENGINE_SOURCE_ENGINES_PATH = `${ENGINE_PATH}/engines`;
4444

4545
export const ENGINE_RELEVANCE_TUNING_PATH = `${ENGINE_PATH}/relevance_tuning`;

0 commit comments

Comments
 (0)