IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Expr undefined at runtime (#70010)

Browse Source 
* null/undefined expression default to empty string
This commit is contained in:
Galen Kistler
2023-06-16 07:01:40 -05:00
committed by GitHub
parent 7ec91990ff
commit c1fe8e8927
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/prometheus/querybuilder/state.ts
View File

@@ -36,7 +36,7 @@ function getDefaultEditorMode(expr: string, defaultEditor: QueryEditorMode = Que
* Returns query with defaults, and boolean true/false depending on change was required * Returns query with defaults, and boolean true/false depending on change was required
*/ */
export function getQueryWithDefaults( export function getQueryWithDefaults(
query: PromQuery, query: PromQuery & { expr?: string },
app: CoreApp | undefined, app: CoreApp | undefined,
defaultEditor?: QueryEditorMode defaultEditor?: QueryEditorMode
): PromQuery { ): PromQuery {
@@ -47,7 +47,8 @@ export function getQueryWithDefaults(
} }
// default query expr is now empty string, set in getDefaultQuery // default query expr is now empty string, set in getDefaultQuery
if (query.expr === '') { // While expr is required in the types, it is not always defined at runtime, so we need to check for undefined and default to an empty string to prevent runtime errors
if (!query.expr) {
result = { ...result, expr: '', legendFormat: LegendFormatMode.Auto }; result = { ...result, expr: '', legendFormat: LegendFormatMode.Auto };
} }