Skip to content

[Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage - #49781

Merged
Zacqary merged 12 commits into
elastic:masterfrom
Zacqary:48180-settings-capabilities-fix
Jan 8, 2020
Merged

Zacqary merged 12 commits into
elastic:masterfrom
Zacqary:48180-settings-capabilities-fix

Conversation

@Zacqary

@Zacqary Zacqary commented Oct 30, 2019 •

Copy link
Copy Markdown
Contributor

Summary

Fixes #48180

Goes back to using infrastructure and logs capabilities to determine whether their respective Settings pages should be editable, as opposed to logs determining it for both.

Waiting on issue discussion to determine if this is enough of a fix, or if the Settings Page needs some slight refactoring.

Also splits the Settings Page into two different pages, one displaying only Logs settings and one displaying only Metrics settings.

While we're at it, this also displays the "Loading Data Sources" prompt if the user deeplinks or refreshes directly to the Settings page; previously it would just display a blank page until data sources finished loading.

Screen Shot 2019-10-31 at 1 17 31 PM

Screen Shot 2019-11-11 at 10 42 16 AM

Checklist

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

For maintainers

Zacqary Xeper added 2 commits October 30, 2019 14:10
…pabilities-fix

# Conflicts:
#	x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
@Zacqary Zacqary added bug Fixes for quality problems that affect the customer experience v8.0.0 Feature:Logs UI Logs UI feature Team:Infra Monitoring UI - DEPRECATED DEPRECATED - Label for the Infra Monitoring UI team. Use Team:obs-ux-infra_services v7.6.0 labels Oct 30, 2019
@Zacqary
Zacqary requested a review from a team October 30, 2019 19:18
@elasticmachine

Copy link
Copy Markdown
Contributor

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

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@Zacqary
Zacqary marked this pull request as ready for review October 31, 2019 18:24
@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@Zacqary

Zacqary commented Nov 7, 2019

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@Zacqary

Zacqary commented Nov 14, 2019

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@weltenwort
weltenwort requested review from weltenwort and removed request for weltenwort November 15, 2019 11:41
@Zacqary

Zacqary commented Nov 18, 2019

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@weltenwort

Copy link
Copy Markdown
Member

@elasticmachine update branch

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@weltenwort weltenwort left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems to work well, thank you!

helpText={
{displaySettings === 'metrics' && (
<EuiDescribedFormGroup
idAria="matricIndices"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This was incorrect before, but maybe we can use this opportunity to fix it:

Suggested change
idAria="matricIndices"
idAria="metricIndices"

@weltenwort

Copy link
Copy Markdown
Member

Are we still planning to merge this?

Zacqary Xeper added 2 commits January 8, 2020 12:23
…pabilities-fix

# Conflicts:
#	x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
#	x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
#	x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
#	x-pack/legacy/plugins/infra/public/pages/logs/settings.tsx
…kibana into 48180-settings-capabilities-fix
@kibanamachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

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

@Zacqary
Zacqary merged commit 8edb53d into elastic:master Jan 8, 2020
@Zacqary
Zacqary deleted the 48180-settings-capabilities-fix branch January 8, 2020 19:46
Zacqary added a commit to Zacqary/kibana that referenced this pull request Jan 8, 2020
…Page (elastic#49781)

* [Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage

* Split settings pages in two; add loading screen to settings page

* Restore timestamp field to metrics screen

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jan 9, 2020
* master: (23 commits)
  [Vis: Default editor] Reactify the timelion editor (elastic#52990)
  [Discover] fix histogram min interval (elastic#53979)
  [Telemetry] [Monitoring] Only retry fetching usage once monito… (elastic#54309)
  [docs][APM] Add runtime index config documentation (elastic#53907)
  [SIEM] Detection engine timeline (elastic#53783)
  Filter scripted fields preview field list to source fields (elastic#53826)
  Management - New platform api (elastic#52579)
  Reset region and Account when switching inventory (elastic#54287)
  [SIEM] [Case] Case workflow api schema (elastic#51535)
  Code coverage setup on CI (elastic#49003)
  [ML] DF Analytics Results: adds link to docs (elastic#54189)
  Update schemas boolean, byteSize, and duration to coerce strings (elastic#54177)
  [Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage (elastic#49781)
  [Canvas] Fixes bugs with autoplay and refresh (elastic#53149)
  [ML] DF Analytics Classification: ensure confusion matrix can be fetched (elastic#53629)
  Fix Vega react eslint errors (elastic#54259)
  Remove non existing codeowners (elastic#54274)
  use correct type (elastic#54244)
  [Dashboard] Removing 100% as dshDashboardViewport height (elastic#54263)
  add `examples/` to no-restricted-path config (elastic#54252)
  ...
Zacqary added a commit that referenced this pull request Jan 9, 2020
…Page (#49781) (#54296)

* [Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage

* Split settings pages in two; add loading screen to settings page

* Restore timestamp field to metrics screen

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

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
patrykkopycinski pushed a commit to patrykkopycinski/kibana that referenced this pull request May 6, 2026
…Page (elastic#49781)

* [Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage

* Split settings pages in two; add loading screen to settings page

* Restore timestamp field to metrics screen

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Fixes for quality problems that affect the customer experience Feature:Logs UI Logs 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.6.0 v8.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Metrics settings uses the Logs UI capabilities

4 participants