fix(custom): allow withCurrent on non-multi variables (#178)

grafana · Mar 19, 2024 · 6cdabe2 · 6cdabe2
1 parent b64295d
commit 6cdabe2
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/custom/dashboard/variable.libsonnet b/custom/dashboard/variable.libsonnet
@@ -97,10 +97,10 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet';
           ),
           withCurrent(key, value=key): {
             local multi(v) =
-              if self.multi
-                 && std.isArray(v)
-              then v
-              else [v],
+              if std.get(self, 'multi', false)
+                 && !std.isArray(v)
+              then [v]
+              else v,
             current: {
               selected: false,
               text: multi(key),

diff --git a/gen/grafonnet-v10.0.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v10.0.0/custom/dashboard/variable.libsonnet
diff --git a/gen/grafonnet-v10.1.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v10.1.0/custom/dashboard/variable.libsonnet
diff --git a/gen/grafonnet-v10.2.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v10.2.0/custom/dashboard/variable.libsonnet
diff --git a/gen/grafonnet-v10.3.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v10.3.0/custom/dashboard/variable.libsonnet
diff --git a/gen/grafonnet-v10.4.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v10.4.0/custom/dashboard/variable.libsonnet
diff --git a/gen/grafonnet-v9.4.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v9.4.0/custom/dashboard/variable.libsonnet
diff --git a/gen/grafonnet-v9.5.0/custom/dashboard/variable.libsonnet b/gen/grafonnet-v9.5.0/custom/dashboard/variable.libsonnet