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

[Watcher UI] Not possible to edit a watch that was created with the API if the ID contains a dot #59383

Merged
merged 5 commits into from
Mar 13, 2020

Conversation

jkelastic
Copy link
Contributor

@jkelastic jkelastic commented Mar 4, 2020

Summary

Fixes #57636

Checklist

Delete any items that are not applicable to this PR.

For maintainers

Release note

This PR fixes an issue where a user was unable to edit a watch with an ID that contained a dot.

@cla-checker-service
Copy link

cla-checker-service bot commented Mar 4, 2020

💚 CLA has been signed

@jkelastic jkelastic added the Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more label Mar 4, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/es-ui (Team:Elasticsearch UI)

@alisonelizabeth
Copy link
Contributor

@elasticmachine merge upstream

Copy link
Contributor

@alisonelizabeth alisonelizabeth left a comment

Choose a reason for hiding this comment

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

LGTM. Nice job @jkelastic!

@alisonelizabeth
Copy link
Contributor

@jkelastic It looks like there is a jest test that needs to be updated as part of this change. Can you take a look? See https://github.com/elastic/kibana/blob/master/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts#L79.

@jkelastic jkelastic removed the v7.6.2 label Mar 12, 2020
@alisonelizabeth
Copy link
Contributor

@elasticmachine merge upstream

@jkelastic jkelastic force-pushed the bug/Watcher_contain_dot_error branch 2 times, most recently from ca3bc5f to e545dd2 Compare March 12, 2020 22:03
@jkelastic jkelastic requested review from a team as code owners March 12, 2020 22:03
@jkelastic jkelastic force-pushed the bug/Watcher_contain_dot_error branch from e545dd2 to 9d37bd5 Compare March 12, 2020 22:22
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@mshustov mshustov removed the request for review from a team March 13, 2020 15:57
@jkelastic jkelastic merged commit 4eba818 into elastic:master Mar 13, 2020
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 14, 2020
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 59383 or prevent reminders by adding the backport:skip label.

1 similar comment
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 59383 or prevent reminders by adding the backport:skip label.

gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 16, 2020
…o alerting/view-in-app

* 'alerting/view-in-app' of github.com:gmmorris/kibana: (33 commits)
  [SIEM] Adds 'Closes and opens signals' Cypress test (elastic#59950)
  [NP] Graph migration (elastic#59409)
  [ML] Clone analytics job  (elastic#59791)
  Move VALUE_CLICK_TRIGGER and APPLY_FILTER_TRIGGER to ui_action… (elastic#60202)
  Handle improperly defined Watcher Logging Action text parameter. (elastic#60169)
  Move select range trigger to uiActions (elastic#60168)
  [SIEM][CASES] Configure cases: Final (elastic#59358)
  Closes elastic#59784. Sets xpack.apm.serviceMapEnabled default value true. (elastic#60153)
  [siem/cypress] update junit filename to be picked up by runbld (elastic#60156)
  OSS logic added to test environment  (elastic#60134)
  Move canvas setup into app mount (elastic#59926)
  enable triggers_actions_ui plugin by default (elastic#60137)
  Expose Elasticsearch from start and deprecate from setup (elastic#59886)
  [SIEM] [Case] Insert timeline bugfix and limit 25 cases (elastic#60136)
  [ML] Client side cut over (elastic#60100)
  Disable query bar on service map routes (elastic#60118)
  Move subscribe_with_scope to kibana_legacy (elastic#59781)
  [Ingest] Agent Config create with sys monitoring (elastic#60111)
  [Watcher UI] Not possible to edit a watch that was created with the API if the ID contains a dot (elastic#59383)
  Actually fetch functionbeat fields needed for telemetry (elastic#60054)
  ...
@alisonelizabeth
Copy link
Contributor

@jkelastic can you backport this PR to 7.x?

jkelastic added a commit to jkelastic/kibana that referenced this pull request Mar 16, 2020
…PI if the ID contains a dot (elastic#59383)

* Add . period to the isRegex variable L34

* Undo ID2 back to ID , done for testing

* Updated the Jest test message to include period

* Undo exception message to include periods

* Removed duplicate comments
@jkelastic
Copy link
Contributor Author

jkelastic commented Mar 16, 2020

@alisonelizabeth

@jkelastic can you backport this PR to 7.x?

Just complete this, thanks.

@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

jkelastic added a commit that referenced this pull request Mar 16, 2020
…PI if the ID contains a dot (#59383) (#60297)

* Add . period to the isRegex variable L34

* Undo ID2 back to ID , done for testing

* Updated the Jest test message to include period

* Undo exception message to include periods

* Removed duplicate comments
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature:Watcher release_note:fix Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more v7.7.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Watcher UI] Not possible to edit a watch that was created with the API if the ID contains a dot
5 participants