[TSVB] Fix more than one empty labels in markdown breaks the values for all other labels #100432
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
alexwizp
changed the title
alexwizp
changed the title
Kuznietsov
changed the title
alexwizp
approved these changes
May 24, 2021
alexwizp
added
v7.14.0
v8.0.0
Feature:TSVB
|
Pinging @elastic/kibana-app (Team:KibanaApp) |
|
@elasticmachine merge upstream |
|
Jenkins, test this |
stratoula
reviewed
May 24, 2021
Sure, I'll write tests. |
|
@elasticmachine merge upstream |
|
Jenkins, test this |
stratoula
reviewed
May 25, 2021
| @@ -14,7 +14,8 @@ import { i18n } from '@kbn/i18n'; | |||
| export function replaceVars(str, args = {}, vars = {}) { | |||
| try { | |||
| // we need add '[]' for emptyLabel because this value contains special characters. (https://handlebarsjs.com/guide/expressions.html#literal-segments) | |||
| const template = handlebars.compile(str.replace(emptyLabel, `[${emptyLabel}]`), { | |||
| // ''.split(...).join(...) as a save alternative of the replaceAll... | |||
There was a problem hiding this comment.
nit: I think this comment is not needed here.
stratoula
approved these changes
May 25, 2021
|
Jenkins, test this |
💚 Build SucceededMetrics [docs]Async chunks
History
To update your PR or re-run it, just comment with: cc @Kunzetsov |
Kuznietsov
added a commit
to Kuznietsov/kibana
that referenced
this pull request
May 25, 2021
…or all other labels (elastic#100432) * Fixed multiple empty labels monitoring with []. * Fixed regexp group behavior and replaced by ''.replaceAll. * Changed ''.replaceAll with ''.split(...).join(...) * Added test for (empty) label case. * Removed not necessary comment. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Kuznietsov
added a commit
that referenced
this pull request
May 26, 2021
…or all other labels (#100432) (#100548) * Fixed multiple empty labels monitoring with []. * Fixed regexp group behavior and replaced by ''.replaceAll. * Changed ''.replaceAll with ''.split(...).join(...) * Added test for (empty) label case. * Removed not necessary comment. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
ecezalp
pushed a commit
to ecezalp/kibana
that referenced
this pull request
May 26, 2021
…or all other labels (elastic#100432) * Fixed multiple empty labels monitoring with []. * Fixed regexp group behavior and replaced by ''.replaceAll. * Changed ''.replaceAll with ''.split(...).join(...) * Added test for (empty) label case. * Removed not necessary comment. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
ecezalp
pushed a commit
to ecezalp/kibana
that referenced
this pull request
May 26, 2021
…or all other labels (elastic#100432) * Fixed multiple empty labels monitoring with []. * Fixed regexp group behavior and replaced by ''.replaceAll. * Changed ''.replaceAll with ''.split(...).join(...) * Added test for (empty) label case. * Removed not necessary comment. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #98760.
When the user created a markdown with more than one variables based on empty labels, the markdown appeared broken.
This PR replaces single adding of brackets to empty label with global by using regexp.
Before:
After:
