diff --git a/public/components/application_analytics/components/application.tsx b/public/components/application_analytics/components/application.tsx index d986730a9..fa362460f 100644 --- a/public/components/application_analytics/components/application.tsx +++ b/public/components/application_analytics/components/application.tsx @@ -275,7 +275,7 @@ export function Application(props: AppDetailProps) { const childBreadcrumbs = [ { - text: 'Application analytics', + text: 'Applications', href: '#/', }, { @@ -295,6 +295,7 @@ export function Application(props: AppDetailProps) { endTime={appEndTime} setStartTime={setStartTimeForApp} setEndTime={setEndTimeForApp} + parentBreadcrumb={parentBreadcrumbs[0]} childBreadcrumbs={childBreadcrumbs} toasts={toasts} /> @@ -314,6 +315,7 @@ export function Application(props: AppDetailProps) { page="app" nameColumnAction={nameColumnAction} traceColumnAction={traceColumnAction} + parentBreadcrumb={parentBreadcrumbs[0]} childBreadcrumbs={childBreadcrumbs} startTime={appStartTime} endTime={appEndTime} @@ -337,6 +339,7 @@ export function Application(props: AppDetailProps) { { fill data-test-subj="editApplicationButton" onClick={() => { - window.location.assign(`${last(parentBreadcrumbs)!.href}/edit/${appId}`); + window.location.assign(`#/edit/${appId}`); }} > Edit diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap index 520dd098a..8d437c451 100644 --- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap +++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap @@ -58,7 +58,29 @@ exports[`Dashboard component renders dashboard 1`] = ` "setAppTitle": [MockFunction], "setBadge": [MockFunction], "setBrand": [MockFunction], - "setBreadcrumbs": [MockFunction], + "setBreadcrumbs": [MockFunction] { + "calls": Array [ + Array [ + Array [ + undefined, + Object { + "href": "#/trace_analytics/home", + "text": "Trace analytics", + }, + Object { + "href": "#/trace_analytics/home", + "text": "Dashboard", + }, + ], + ], + ], + "results": Array [ + Object { + "type": "return", + "value": undefined, + }, + ], + }, "setCustomNavLink": [MockFunction], "setHelpExtension": [MockFunction], "setHelpSupportUrl": [MockFunction], @@ -305,7 +327,29 @@ exports[`Dashboard component renders dashboard 1`] = ` "setAppTitle": [MockFunction], "setBadge": [MockFunction], "setBrand": [MockFunction], - "setBreadcrumbs": [MockFunction], + "setBreadcrumbs": [MockFunction] { + "calls": Array [ + Array [ + Array [ + undefined, + Object { + "href": "#/trace_analytics/home", + "text": "Trace analytics", + }, + Object { + "href": "#/trace_analytics/home", + "text": "Dashboard", + }, + ], + ], + ], + "results": Array [ + Object { + "type": "return", + "value": undefined, + }, + ], + }, "setCustomNavLink": [MockFunction], "setHelpExtension": [MockFunction], "setHelpSupportUrl": [MockFunction], @@ -2372,7 +2416,29 @@ exports[`Dashboard component renders empty dashboard 1`] = ` "setAppTitle": [MockFunction], "setBadge": [MockFunction], "setBrand": [MockFunction], - "setBreadcrumbs": [MockFunction], + "setBreadcrumbs": [MockFunction] { + "calls": Array [ + Array [ + Array [ + undefined, + Object { + "href": "#/trace_analytics/home", + "text": "Trace analytics", + }, + Object { + "href": "#/trace_analytics/home", + "text": "Dashboard", + }, + ], + ], + ], + "results": Array [ + Object { + "type": "return", + "value": undefined, + }, + ], + }, "setCustomNavLink": [MockFunction], "setHelpExtension": [MockFunction], "setHelpSupportUrl": [MockFunction], @@ -2614,7 +2680,29 @@ exports[`Dashboard component renders empty dashboard 1`] = ` "setAppTitle": [MockFunction], "setBadge": [MockFunction], "setBrand": [MockFunction], - "setBreadcrumbs": [MockFunction], + "setBreadcrumbs": [MockFunction] { + "calls": Array [ + Array [ + Array [ + undefined, + Object { + "href": "#/trace_analytics/home", + "text": "Trace analytics", + }, + Object { + "href": "#/trace_analytics/home", + "text": "Dashboard", + }, + ], + ], + ], + "results": Array [ + Object { + "type": "return", + "value": undefined, + }, + ], + }, "setCustomNavLink": [MockFunction], "setHelpExtension": [MockFunction], "setHelpSupportUrl": [MockFunction], @@ -4654,7 +4742,29 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = ` "setAppTitle": [MockFunction], "setBadge": [MockFunction], "setBrand": [MockFunction], - "setBreadcrumbs": [MockFunction], + "setBreadcrumbs": [MockFunction] { + "calls": Array [ + Array [ + Array [ + undefined, + Object { + "href": "#/trace_analytics/home", + "text": "Trace analytics", + }, + Object { + "href": "#/trace_analytics/home", + "text": "Dashboard", + }, + ], + ], + ], + "results": Array [ + Object { + "type": "return", + "value": undefined, + }, + ], + }, "setCustomNavLink": [MockFunction], "setHelpExtension": [MockFunction], "setHelpSupportUrl": [MockFunction], @@ -4902,7 +5012,29 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = ` "setAppTitle": [MockFunction], "setBadge": [MockFunction], "setBrand": [MockFunction], - "setBreadcrumbs": [MockFunction], + "setBreadcrumbs": [MockFunction] { + "calls": Array [ + Array [ + Array [ + undefined, + Object { + "href": "#/trace_analytics/home", + "text": "Trace analytics", + }, + Object { + "href": "#/trace_analytics/home", + "text": "Dashboard", + }, + ], + ], + ], + "results": Array [ + Object { + "type": "return", + "value": undefined, + }, + ], + }, "setCustomNavLink": [MockFunction], "setHelpExtension": [MockFunction], "setHelpSupportUrl": [MockFunction], diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap index 25deb6fbc..0d88b2139 100644 --- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap +++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap @@ -109,13 +109,11 @@ exports[`Services component renders empty services page 1`] = ` } nameColumnAction={[Function]} page="services" - parentBreadcrumbs={ - Array [ - Object { - "href": "test#/", - "text": "test", - }, - ] + parentBreadcrumb={ + Object { + "href": "test#/", + "text": "test", + } } query="" setEndTime={[MockFunction]} @@ -378,13 +376,11 @@ exports[`Services component renders empty services page 1`] = ` } nameColumnAction={[Function]} page="services" - parentBreadcrumbs={ - Array [ - Object { - "href": "test#/", - "text": "test", - }, - ] + parentBreadcrumb={ + Object { + "href": "test#/", + "text": "test", + } } query="" setEndTime={[MockFunction]} @@ -1957,10 +1953,7 @@ exports[`Services component renders jaeger services page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", @@ -2232,10 +2225,7 @@ exports[`Services component renders jaeger services page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", @@ -3361,10 +3351,7 @@ exports[`Services component renders services page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", @@ -3635,10 +3622,7 @@ exports[`Services component renders services page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", diff --git a/public/components/trace_analytics/components/services/__tests__/services.test.tsx b/public/components/trace_analytics/components/services/__tests__/services.test.tsx index d427239da..5dca84b91 100644 --- a/public/components/trace_analytics/components/services/__tests__/services.test.tsx +++ b/public/components/trace_analytics/components/services/__tests__/services.test.tsx @@ -39,7 +39,7 @@ describe('Services component', () => { { endTime="now" setEndTime={setEndTime} page="services" - mode='data_prepper' + mode="data_prepper" dataPrepperIndicesExist={true} modes={modes} /> @@ -99,7 +99,7 @@ describe('Services component', () => { endTime="now" setEndTime={setEndTime} page="services" - mode='data_prepper' + mode="data_prepper" dataPrepperIndicesExist={true} modes={modes} /> @@ -145,7 +145,7 @@ describe('Services component', () => { endTime="now" setEndTime={setEndTime} page="services" - mode='jaeger' + mode="jaeger" dataPrepperIndicesExist={false} jaegerIndicesExist={true} modes={modes} diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap index e0acd2e97..c39db34c1 100644 --- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap +++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap @@ -108,13 +108,11 @@ exports[`Traces component renders empty traces page 1`] = ` ] } page="traces" - parentBreadcrumbs={ - Array [ - Object { - "href": "test#/", - "text": "test", - }, - ] + parentBreadcrumb={ + Object { + "href": "test#/", + "text": "test", + } } query="" setEndTime={[MockFunction]} @@ -376,13 +374,11 @@ exports[`Traces component renders empty traces page 1`] = ` ] } page="traces" - parentBreadcrumbs={ - Array [ - Object { - "href": "test#/", - "text": "test", - }, - ] + parentBreadcrumb={ + Object { + "href": "test#/", + "text": "test", + } } query="" setEndTime={[MockFunction]} @@ -1423,10 +1419,7 @@ exports[`Traces component renders jaeger traces page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", @@ -1697,10 +1690,7 @@ exports[`Traces component renders jaeger traces page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", @@ -2815,10 +2805,7 @@ exports[`Traces component renders traces page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", @@ -3088,10 +3075,7 @@ exports[`Traces component renders traces page 1`] = ` "calls": Array [ Array [ Array [ - Object { - "href": "test#/", - "text": "test", - }, + undefined, Object { "href": "#/trace_analytics/home", "text": "Trace analytics", diff --git a/public/components/trace_analytics/components/traces/__tests__/traces.test.tsx b/public/components/trace_analytics/components/traces/__tests__/traces.test.tsx index 8128b99be..cfd56c99f 100644 --- a/public/components/trace_analytics/components/traces/__tests__/traces.test.tsx +++ b/public/components/trace_analytics/components/traces/__tests__/traces.test.tsx @@ -38,7 +38,7 @@ describe('Traces component', () => { { endTime="now" setEndTime={setEndTime} page="traces" - mode='data_prepper' + mode="data_prepper" dataPrepperIndicesExist={true} modes={modes} /> @@ -94,7 +94,7 @@ describe('Traces component', () => { setStartTime={setStartTime} endTime="now" setEndTime={setEndTime} - mode='data_prepper' + mode="data_prepper" page="traces" modes={modes} dataPrepperIndicesExist={true} @@ -138,7 +138,7 @@ describe('Traces component', () => { setStartTime={setStartTime} endTime="now" setEndTime={setEndTime} - mode='jaeger' + mode="jaeger" page="traces" modes={modes} dataPrepperIndicesExist={false}