Skip to content
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

[APM] Service maps fix for service name/env filtering & centering #59726

Merged
merged 6 commits into from
Mar 13, 2020

Conversation

ogupte
Copy link
Contributor

@ogupte ogupte commented Mar 10, 2020

Closes #59720, #59168, #59747.

service-maps-layout-4

  • fixes missing query params in the generated hrefs for details and focused service navigation
  • fixes layout bug by passing undefined for roots (instead of []) in service maps layout when no roots are found
  • removes environment filter when querying for sample trace ids
  • re-centers the already focused service node when the focus button is clicked
  • adds primary color highlighting to connected edges of the focused service
  • fixes z-indexing issues with overlapping edges when hovering on a service node
  • always centers on the focused service node after layout reflows

@ogupte ogupte added release_note:skip Skip the PR/issue when compiling release notes v7.7.0 labels Mar 10, 2020
@ogupte ogupte requested a review from a team as a code owner March 10, 2020 09:22
Copy link
Contributor

@smith smith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This an improvement overall, but I'm not sure about the focus button behavior and I think we should animate the centering.

: undefined
}
>
<EuiButton color="secondary" href={focusUrl} onClick={onFocusClick}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why doesn't this get disabled any more? Now clicking it just does nothing.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Er, I guess it centers the map on that element but that kind of changes the meaning of what "focus" is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The expectation of user flow is: click focus button -> navigate to and render map centered on a selected node. With this update, it flow is the same, except it skips the loading/navigation since it's already loaded. No matter when I click that button, the end state should be the same. At least that's what i felt after playing with it for a while. Having the button disabled felt more jarring.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems ok I guess.

@@ -85,6 +85,14 @@ export function Popover({ focusedServiceName }: PopoverProps) {
}
}, [popoverRef, x, y]);

const centerSelectedNode = useCallback(() => {
if (cy) {
cy.center(cy.getElementById(selectedNodeServiceName));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of center, we should animate it with cy.animate({ center: { eles: cy.getElementById(selectedNodeServiceName) } })

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now animations are being initiated between data load, so it gets a little jumpy. we'll have to fix it in another PR, but this makes sense to animate right now.

@ogupte
Copy link
Contributor Author

ogupte commented Mar 12, 2020

@elasticmachine merge upstream

ogupte added 6 commits March 13, 2020 00:26
…ervice

- fixes z-indexing issues with overlapping edges when hovering on a service node
- always centers on the focused service node after layout reflows
…ocused service navigation

- fix layout bug by passing undefined for roots (instead of []) in service maps layout when no roots are found
This reverts commit d482aa124b1f2c47da01d4386c2b88108bc94275.
@ogupte ogupte force-pushed the apm-59720-fix-filtering-centering branch from 5aa411f to 33ed314 Compare March 13, 2020 07:43
@ogupte ogupte merged commit 71400f9 into elastic:master Mar 13, 2020
ogupte added a commit to ogupte/kibana that referenced this pull request Mar 13, 2020
…astic#59726)

* - adds primary color highlighting to connected edges of the focused service
- fixes z-indexing issues with overlapping edges when hovering on a service node
- always centers on the focused service node after layout reflows

* re-centers the already focused service node when the focus button is clicked

* remove environemnt filter when querying for sample trace ids

* - fixes missing query params in the generated hrefs for details and focused service navigation
- fix layout bug by passing undefined for roots (instead of []) in service maps layout when no roots are found

* Revert "remove environemnt filter when querying for sample trace ids"

This reverts commit d482aa124b1f2c47da01d4386c2b88108bc94275.

* Fixes extra prop from a merge conflict
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

ogupte added a commit that referenced this pull request Mar 13, 2020
…9726) (#60129)

* - adds primary color highlighting to connected edges of the focused service
- fixes z-indexing issues with overlapping edges when hovering on a service node
- always centers on the focused service node after layout reflows

* re-centers the already focused service node when the focus button is clicked

* remove environemnt filter when querying for sample trace ids

* - fixes missing query params in the generated hrefs for details and focused service navigation
- fix layout bug by passing undefined for roots (instead of []) in service maps layout when no roots are found

* Revert "remove environemnt filter when querying for sample trace ids"

This reverts commit d482aa124b1f2c47da01d4386c2b88108bc94275.

* Fixes extra prop from a merge conflict
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes v7.7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[APM] Service maps fix query filtering and service centering
3 participants