From 97a0527b44b00557cb6f9cd355a3ff37e9672c4e Mon Sep 17 00:00:00 2001
From: juanicabanas <juan.cabanas@grafana.com>
Date: Tue, 18 Apr 2023 22:24:56 -0300
Subject: [PATCH] Variables: Add new format id (#66793)

---
 .../grafana-schema/src/common/common.gen.ts   |  1 +
 .../grafana-schema/src/common/variables.cue   | 36 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index d096dc2cd61..b3d8ac000c1 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -771,6 +771,7 @@ export enum VariableFormatID {
   SQLString = 'sqlstring',
   SingleQuote = 'singlequote',
   Text = 'text',
+  UriEncode = 'uriencode',
 }
 
 export interface DataSourceRef {
diff --git a/packages/grafana-schema/src/common/variables.cue b/packages/grafana-schema/src/common/variables.cue
index 4d706e05257..e16db2f54a1 100644
--- a/packages/grafana-schema/src/common/variables.cue
+++ b/packages/grafana-schema/src/common/variables.cue
@@ -2,36 +2,38 @@ package common
 
 // Optional formats for the template variable replace functions
 // See also https://grafana.com/docs/grafana/latest/dashboards/variables/variable-syntax/#advanced-variable-format-options
-VariableFormatID: 
+VariableFormatID:
     // Values are lucene escaped and multi-valued variables generate an OR expression
-    "lucene" | 
+    "lucene" |
     // Raw values
-    "raw" | 
+    "raw" |
     // Values are regex escaped and multi-valued variables generate a (<value>|<value>) expression
-    "regex" | 
+    "regex" |
     // Values are separated by | character
-    "pipe" | 
+    "pipe" |
     // Multiple values are formatted like variable=value
-    "distributed" | 
+    "distributed" |
     // Comma seperated values
-    "csv" | 
+    "csv" |
     // HTML escaped
-    "html" | 
+    "html" |
     // JSON values
-    "json" | 
+    "json" |
     // Percent encode
-    "percentencode" | 
+    "percentencode" |
+    // Uri encode
+    "uriencode" |
     // Single quote
-    "singlequote" | 
+    "singlequote" |
     // Double quote
-    "doublequote" | 
+    "doublequote" |
     // SQL string quoting and commas for use in IN statements and other scenarios
-    "sqlstring" | 
+    "sqlstring" |
     // Date
-    "date" | 
+    "date" |
     // Format multi-valued variables using glob syntax, example {value1,value2}
-    "glob" | 
+    "glob" |
     // Format variables in their text representation. Example in multi-variable scenario A + B + C.
-    "text" | 
+    "text" |
     // Format variables as URL parameters. Example in multi-variable scenario A + B + C => var-foo=A&var-foo=B&var-foo=C.
-    "queryparam"  @cuetsy(kind="enum",memberNames="Lucene|Raw|Regex|Pipe|Distributed|CSV|HTML|JSON|PercentEncode|SingleQuote|DoubleQuote|SQLString|Date|Glob|Text|QueryParam")
\ No newline at end of file
+    "queryparam"  @cuetsy(kind="enum",memberNames="Lucene|Raw|Regex|Pipe|Distributed|CSV|HTML|JSON|PercentEncode|UriEncode|SingleQuote|DoubleQuote|SQLString|Date|Glob|Text|QueryParam")