Bug 1797027: Monitoring Dashboards: Fix variables handling #4184
Conversation
Fixes a bug where some variable dropdowns were not rendered, which in turn caused cards that used the variable to not be rendered. Also fixes a bug where the variable values were getting reset when the Time Range option was changed.
|
@kyoto: This pull request references Bugzilla bug 1797027, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci-robot
added
bugzilla/valid-bug
| @@ -30,53 +31,128 @@ const evaluateTemplate = (s: string, variables: VariablesMap) => | |||
| _.reduce( | |||
| variables, | |||
| (result: string, v: Variable, k: string): string => { | |||
| return result.replace(new RegExp(`\\$${k}`, 'g'), v.value); | |||
| return result.replace(new RegExp(`\\$${k}`, 'g'), v.value === undefined ? '' : v.value); | |||
There was a problem hiding this comment.
Assuming null should also be '', we could use
| return result.replace(new RegExp(`\\$${k}`, 'g'), v.value === undefined ? '' : v.value); | |
| return result.replace(new RegExp(`\\$${k}`, 'g'), v.value || ''); |
There was a problem hiding this comment.
👍 Thanks. v.value is a string so we don't need to worry about 0 values, etc.
Changed by #4221
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kyoto, spadgett The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
13 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@kyoto: All pull requests linked via external trackers have merged. Bugzilla bug 1797027 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Fixes a bug where some variable dropdowns were not rendered, which in
turn caused cards that used the variable to not be rendered.
Also fixes a bug where the variable values were getting reset when the
Time Range option was changed.
Move the logic for loading variable options into the
SingleVariableDropdowncomponent.Add error message when the variable options fail to load.