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

[Metrics UI] Limit group by selector to only 2 fields #56800

Merged
merged 4 commits into from
Feb 7, 2020
Merged

[Metrics UI] Limit group by selector to only 2 fields #56800

merged 4 commits into from
Feb 7, 2020

Conversation

simianhacker
Copy link
Member

Summary

This PR fixes #49857 by changing the behavior of the group by selector to the following:

  • When 2 groupings are selected the rest of the options are disabled
  • When the user selects a custom field, it now only displays fields that are not already selected.

This change should prevent the duplicate custom fields issue and it should reduce confusion when the users tries to change the groupings.

group-by-menu

Checklist

Use strikethroughs to remove checklist items you don't feel are applicable to this PR.

@simianhacker simianhacker added release_note:fix Feature:Metrics UI Metrics UI feature v8.0.0 Team:Infra Monitoring UI - DEPRECATED DEPRECATED - Label for the Infra Monitoring UI team. Use Team:obs-ux-infra_services v7.7.0 labels Feb 4, 2020
@simianhacker simianhacker requested a review from a team as a code owner February 4, 2020 21:26
@elasticmachine
Copy link
Contributor

Pinging @elastic/logs-metrics-ui (Team:logs-metrics-ui)

@simianhacker
Copy link
Member Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

afgomez
afgomez reviewed Feb 6, 2020
View reviewed changes
x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
content: <CustomFieldPanel onSubmit={this.handleCustomField} fields={this.props.fields} />,
content: (
<CustomFieldPanel
currentOptions={this.props.customOptions}
Copy link
Contributor

@afgomez afgomez Feb 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

shouldn't this be this.props.currentOptions ?

Edit: nevermind. I see the currentOptions prop was added in a different file.

@simianhacker simianhacker merged commit 6d03ad4 into elastic:master Feb 7, 2020
@simianhacker simianhacker mentioned this pull request Feb 7, 2020
Merged
simianhacker added a commit to simianhacker/kibana that referenced this pull request Feb 7, 2020
@simianhacker @elasticmachine
[Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
544296b 
* [Metrics UI] Limit group by selector to only 2 fields

* Removing unused variable

* Removing unused import

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
simianhacker added a commit that referenced this pull request Feb 7, 2020
@simianhacker @elasticmachine
[Metrics UI] Limit group by selector to only 2 fields (#56800) (#57103)
612a3a5 
* [Metrics UI] Limit group by selector to only 2 fields

* Removing unused variable

* Removing unused import

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
chrisronline pushed a commit to chrisronline/kibana that referenced this pull request Feb 7, 2020
@simianhacker @elasticmachine @chrisronline
[Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
a410758 
* [Metrics UI] Limit group by selector to only 2 fields

* Removing unused variable

* Removing unused import

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 9, 2020
@gmmorris
Merge remote-tracking branch 'upstream/master' into alerting/get-aler…
03c405f 
…t-state

* upstream/master: (96 commits)
  top nav ts arg support (elastic#56984)
  [SIEM][detection engine] Limit network rules to filebeat source semantics (elastic#57130)
  Add docs for alerting and action settings (elastic#57035)
  Add Test to Verify Endpoint App Landing Page (elastic#57129)
  Update `markdown-to-jsx` (`6.9.3` → `6.11.0`) and `url-parse` (`1.4.4` → `1.4.7`) dependencies. (elastic#57126)
  chore(NA): removes use of parallel option in the terser minimizer (elastic#57077)
  [ML] New Platform server shim: update file data visualizer routes to use new platform router (elastic#56972)
  Specifying valid licenses for the Graph feature (elastic#55911)
  [APM][docs] Add troubleshooting for non-indexed fields (elastic#54948)
  [ML] DF Analytics creation: update schema definition for create route (elastic#56979)
  Remove Kibana a11y guide in favor of EUI (elastic#57021)
  [Logs UI] Set streamLive false in URL state when arriving from link-to (elastic#56329)
  [docs] Fix spaces api example json (elastic#50411)
  Add new config for filebeat index name (elastic#56920)
  [Metrics-UI] Fix toolbar popover for metrics table row (elastic#56796)
  Saved Objects testing (elastic#56965)
  Disabled categorization stats validation (elastic#57087)
  [Rollups] Server NP migration (elastic#55606)
  [Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
  fix auto closing new vis modal when navigating to lens or when navigating away with browser history (elastic#56998)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 9, 2020
@gmmorris
Merge branch 'master' into alerting/alert-instances
187589f 
* master: (96 commits)
  top nav ts arg support (elastic#56984)
  [SIEM][detection engine] Limit network rules to filebeat source semantics (elastic#57130)
  Add docs for alerting and action settings (elastic#57035)
  Add Test to Verify Endpoint App Landing Page (elastic#57129)
  Update `markdown-to-jsx` (`6.9.3` → `6.11.0`) and `url-parse` (`1.4.4` → `1.4.7`) dependencies. (elastic#57126)
  chore(NA): removes use of parallel option in the terser minimizer (elastic#57077)
  [ML] New Platform server shim: update file data visualizer routes to use new platform router (elastic#56972)
  Specifying valid licenses for the Graph feature (elastic#55911)
  [APM][docs] Add troubleshooting for non-indexed fields (elastic#54948)
  [ML] DF Analytics creation: update schema definition for create route (elastic#56979)
  Remove Kibana a11y guide in favor of EUI (elastic#57021)
  [Logs UI] Set streamLive false in URL state when arriving from link-to (elastic#56329)
  [docs] Fix spaces api example json (elastic#50411)
  Add new config for filebeat index name (elastic#56920)
  [Metrics-UI] Fix toolbar popover for metrics table row (elastic#56796)
  Saved Objects testing (elastic#56965)
  Disabled categorization stats validation (elastic#57087)
  [Rollups] Server NP migration (elastic#55606)
  [Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
  fix auto closing new vis modal when navigating to lens or when navigating away with browser history (elastic#56998)
  ...
majagrubic pushed a commit to majagrubic/kibana that referenced this pull request Feb 10, 2020
@simianhacker @elasticmachine
[Metrics UI] Limit group by selector to only 2 fields (elastic#56800)
f09e842 
* [Metrics UI] Limit group by selector to only 2 fields

* Removing unused variable

* Removing unused import

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@simianhacker simianhacker deleted the issue-49857-duplicate-custom-group-by branch April 17, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afgomez afgomez afgomez approved these changes

Assignees
No one assigned
Labels
Feature:Metrics UI Metrics UI feature release_note:fix Team:Infra Monitoring UI - DEPRECATED DEPRECATED - Label for the Infra Monitoring UI team. Use Team:obs-ux-infra_services v7.7.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Metrics UI] Group-by dropdown allows duplicate entries for custom fields
4 participants
@simianhacker @elasticmachine @kibanamachine @afgomez