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.

Sign up for GitHub

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

Jump to bottom

Fixes to service map single node banner #60072

Merged
merged 3 commits into from
Mar 18, 2020
Merged

Fixes to service map single node banner #60072

merged 3 commits into from
Mar 18, 2020

Conversation

smith
Copy link
Contributor

@smith smith commented Mar 12, 2020 •
edited
Loading

  • Make the banner 95% width so it takes up the full width
  • Check the actual count of cytoscape nodes to determine whether or not to show the banner
  • Make the Cytoscape component able to take a function as children so we can access the cytoscape instance directly
  • Update the .NET icon

Fixes #59746.

image

image

@smith smith requested a review from a team as a code owner March 12, 2020 23:26
@smith smith added release_note:skip Skip the PR/issue when compiling release notes v7.7.0 labels Mar 12, 2020
@smith
Copy link
Contributor Author

smith commented Mar 17, 2020

@elasticmachine merge upstream

smith added 2 commits March 17, 2020 16:14
@smith
Fixes to service map single node banner
4dc10f8 
* Make the banner 95% width so it takes up the full width
* Check the actual count of cytoscape nodes to determine whether or not to show the banner
* Make the Cytoscape component able to take a function as children so we can access the cytoscape instance directly
* Update the .NET icon
@smith
rework
3f7cb0f
ogupte
ogupte reviewed Mar 17, 2020
View reviewed changes
x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.tsx
const width =
cy.width() -
parseInt(lightTheme.gutterTypes.gutterExtraLarge, 10) -
parseInt(lightTheme.gutterTypes.gutterLarge, 10);
Copy link
Contributor

Choose a reason for hiding this comment

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

If the user resizes the window, does this width get updated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No. We could observe the cytoscape resize event or the window event but I don't think it's worth the extra complexity.

ogupte
ogupte approved these changes Mar 17, 2020
View reviewed changes
Copy link
Contributor

@ogupte ogupte left a comment

Choose a reason for hiding this comment

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

looks good, nothing to block it from merging, just some questions in comments

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@smith smith merged commit c8b2b05 into elastic:master Mar 18, 2020
@smith smith deleted the nls/banner-fix branch March 18, 2020 14:23
@smith smith mentioned this pull request Mar 18, 2020
Merged
smith added a commit to smith/kibana that referenced this pull request Mar 18, 2020
@smith @ogupte
Fixes to service map single node banner (elastic#60072)
6bfd4db 
* Fixes to service map single node banner

* Make the banner 95% width so it takes up the full width
* Check the actual count of cytoscape nodes to determine whether or not to show the banner
* Make the Cytoscape component able to take a function as children so we can access the cytoscape instance directly
* Update the .NET icon

* rework

* Update x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.tsx

Co-Authored-By: Oliver Gupte <[email protected]>

Co-authored-by: Oliver Gupte <[email protected]>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 18, 2020
@gmmorris
Merge branch 'master' into alerting/view-in-app
02b6be3 
* master:
  [NP] Cutover ensureDefaultIndexPattern to kibana_utils (elastic#59895)
  Closes elastic#60265. Adds Beta badge to service map (elastic#60482)
  [Visualize] Duplicated query filters in es request (elastic#60106)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (elastic#60072)
  [Uptime] replace fetch with kibana http (elastic#59881)
  Upgrade @types/node to match Node.js runtime (elastic#60368)
smith added a commit that referenced this pull request Mar 18, 2020
@smith @ogupte
Fixes to service map single node banner (#60072) (#60515)
26352d5 
* Fixes to service map single node banner

* Make the banner 95% width so it takes up the full width
* Check the actual count of cytoscape nodes to determine whether or not to show the banner
* Make the Cytoscape component able to take a function as children so we can access the cytoscape instance directly
* Update the .NET icon

* rework

* Update x-pack/legacy/plugins/apm/public/components/app/ServiceMap/EmptyBanner.tsx

Co-Authored-By: Oliver Gupte <[email protected]>

Co-authored-by: Oliver Gupte <[email protected]>

Co-authored-by: Oliver Gupte <[email protected]>
jloleysens added a commit that referenced this pull request Mar 18, 2020
@jloleysens
Merge branch 'app/painless' of github.com:elastic/kibana into app/pai…
8733480 
…nless

* 'app/painless' of github.com:elastic/kibana: (64 commits)
  Fix filter scope in bool query (#60488)
  change index pattern id to be the same as index pattern title (#60436)
  [Endpoint] resolver v1 events (#59233)
  Branding fixes for dashboard, loader and space selector (#60073)
  skip flaky suite (#60535)
  [SIEM][Detection Engine] Fixes bug with timeline templates not working
  Fixed errors which are happening if switch between alert types (#60453)
  [EPM] Add mapping field types to index template generation v2 (#60266)
  [NP] Cutover ensureDefaultIndexPattern to kibana_utils (#59895)
  Closes #60265. Adds Beta badge to service map (#60482)
  [Visualize] Duplicated query filters in es request (#60106)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (#60072)
  [Uptime] replace fetch with kibana http (#59881)
  Upgrade @types/node to match Node.js runtime (#60368)
  [License Management] NP migration (#60250)
  Fix create alert button from not showing in alerts list (#60444)
  [SIEM][Case] Update connector through flyout (#60307)
  add data-test-subj where possible on SO management table (#60226)
  Enforce `required` presence for value/key validation of `recordOf` and `mapOf`. (#60406)
  ...
jloleysens added a commit to jloleysens/kibana that referenced this pull request Mar 19, 2020
@jloleysens
Merge remote-tracking branch 'upstream/app/painless' into minor-refactor
3f00238 
* upstream/app/painless: (66 commits)
  Another i18n issue
  Fix i18n
  Fix filter scope in bool query (elastic#60488)
  change index pattern id to be the same as index pattern title (elastic#60436)
  [Endpoint] resolver v1 events (elastic#59233)
  Branding fixes for dashboard, loader and space selector (elastic#60073)
  skip flaky suite (elastic#60535)
  [SIEM][Detection Engine] Fixes bug with timeline templates not working
  Fixed errors which are happening if switch between alert types (elastic#60453)
  [EPM] Add mapping field types to index template generation v2 (elastic#60266)
  [NP] Cutover ensureDefaultIndexPattern to kibana_utils (elastic#59895)
  Closes elastic#60265. Adds Beta badge to service map (elastic#60482)
  [Visualize] Duplicated query filters in es request (elastic#60106)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (elastic#60072)
  [Uptime] replace fetch with kibana http (elastic#59881)
  Upgrade @types/node to match Node.js runtime (elastic#60368)
  [License Management] NP migration (elastic#60250)
  Fix create alert button from not showing in alerts list (elastic#60444)
  [SIEM][Case] Update connector through flyout (elastic#60307)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 19, 2020
@gmmorris
rge branch 'alerting/tls-warning' of github.com:gmmorris/kibana into …
38c5e1e 
…alerting/tls-warning

* 'alerting/tls-warning' of github.com:gmmorris/kibana: (33 commits)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (elastic#60072)
  [Uptime] replace fetch with kibana http (elastic#59881)
  Upgrade @types/node to match Node.js runtime (elastic#60368)
  [License Management] NP migration (elastic#60250)
  Fix create alert button from not showing in alerts list (elastic#60444)
  [SIEM][Case] Update connector through flyout (elastic#60307)
  add data-test-subj where possible on SO management table (elastic#60226)
  Enforce `required` presence for value/key validation of `recordOf` and `mapOf`. (elastic#60406)
  [ML] Re-enabling file upload telemetry (elastic#60418)
  [NP] Use local helper shortenDottedString for discover (elastic#60271)
  [Console] Fix for `_settings` and x-pack autocomplete (elastic#60246)
  Task/host enhancements (elastic#59671)
  [Search service] Asynchronous ES search strategy (elastic#53538)
  Index Action - Moved index params fields to connector config (elastic#60349)
  Edits UI text for ML nodes and job button (elastic#60184)
  Publish getIsNavDrawerLocked$ method on core chrome service. (elastic#60191)
  Disabled edit alert button on management ui for non registered UI alert types (elastic#60439)
  Revert "[Console] Fix bool filter autocompletions and refactor (elastic#60361)"
  [Console] Fix bool filter autocompletions and refactor (elastic#60361)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ogupte ogupte ogupte approved these changes

Assignees
No one assigned
Labels
release_note:skip Skip the PR/issue when compiling release notes v7.7.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[APM UI] Service Maps: No connections callout positioning and display
3 participants
@smith @kibanamachine @ogupte