-
Notifications
You must be signed in to change notification settings - Fork 8.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Removes APM custom breadcrumbs, leaves only chrome.breadcrumbs.set #29286
Merged
jasonrhodes
merged 3 commits into
elastic:master
from
jasonrhodes:remove-apm-breadcrumb
Jan 25, 2019
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
80 changes: 0 additions & 80 deletions
80
x-pack/plugins/apm/public/components/app/Main/Breadcrumbs.js
This file was deleted.
Oops, something went wrong.
58 changes: 58 additions & 0 deletions
58
x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { Location } from 'history'; | ||
import { flatten } from 'lodash'; | ||
import React from 'react'; | ||
// @ts-ignore | ||
import { withBreadcrumbs } from 'react-router-breadcrumbs-hoc'; | ||
import chrome from 'ui/chrome'; | ||
import { toQuery } from '../../shared/Links/url_helpers'; | ||
import { routes } from './routeConfig'; | ||
|
||
interface Props { | ||
location: Location; | ||
breadcrumbs: Array<{ | ||
breadcrumb: any; | ||
match: { | ||
url: string; | ||
}; | ||
}>; | ||
} | ||
|
||
class UpdateBreadcrumbsComponent extends React.Component<Props> { | ||
public updateHeaderBreadcrumbs() { | ||
const { _g = '', kuery = '' } = toQuery(this.props.location.search); | ||
const breadcrumbs = this.props.breadcrumbs.map(({ breadcrumb, match }) => ({ | ||
text: breadcrumb, | ||
href: `#${match.url}?_g=${_g}&kuery=${kuery}` | ||
})); | ||
|
||
chrome.breadcrumbs.set(breadcrumbs); | ||
} | ||
|
||
public componentDidMount() { | ||
this.updateHeaderBreadcrumbs(); | ||
} | ||
|
||
public componentDidUpdate() { | ||
this.updateHeaderBreadcrumbs(); | ||
} | ||
|
||
public render() { | ||
return null; | ||
} | ||
} | ||
|
||
const flatRoutes = flatten( | ||
routes.map(route => (route.switchRoutes ? route.switchRoutes : route)) | ||
); | ||
|
||
const UpdateBreadcrumbs = withBreadcrumbs(flatRoutes)( | ||
UpdateBreadcrumbsComponent | ||
); | ||
|
||
export { UpdateBreadcrumbs }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 0 additions & 120 deletions
120
...ck/plugins/apm/public/components/app/Main/__test__/__snapshots__/Breadcrumbs.test.js.snap
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's strange that this component's only purpose is its side effects. i feel like this is a case where store.subscribe is useful.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed that it's not the best. I thought about looking into changing it but I see we already do this with
Main/LicenseChecker
, so I left it alone.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fine with how you did it here - but if there is a better approach I think we should take that, and update
LicenseChecker
accordingly in another PR.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH I'm not sure if there is a way that's significantly better, sometimes at the top-level you just have some side-effect components (we definitely had these at my last job), and personally I'm fine with that if they're contained up there. If folks have a specific better idea and want to log something, go for it.