From 9201ee5768e7f827b68eec2de4a2c14de8a30d2e Mon Sep 17 00:00:00 2001
From: sam boyer <sdboyer@grafana.com>
Date: Mon, 27 Sep 2021 17:21:18 -0400
Subject: [PATCH] Small tweaks to input cue files

---
 packages/grafana-schema/src/schema/table.cue       | 12 +-----------
 public/app/plugins/panel/histogram/models.cue      |  4 +---
 public/app/plugins/panel/state-timeline/models.cue |  8 ++++----
 public/app/plugins/panel/text/models.cue           |  5 ++---
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/packages/grafana-schema/src/schema/table.cue b/packages/grafana-schema/src/schema/table.cue
index f1df773683d..347b0de40ba 100644
--- a/packages/grafana-schema/src/schema/table.cue
+++ b/packages/grafana-schema/src/schema/table.cue
@@ -3,17 +3,7 @@ package schema
 // TODO -- should not be table specific!
 FieldTextAlignment: "auto" | "left" | "right" | "center" @cuetsy(kind="type")
 
-// FIXME can't write enums as structs, must use disjunctions
-TableCellDisplayMode: {
-	Auto:            "auto"
-	ColorText:       "color-text"
-	ColorBackground: "color-background"
-	GradientGauge:   "gradient-gauge"
-	LcdGauge:        "lcd-gauge"
-	JSONView:        "json-view"
-	BasicGauge:      "basic"
-	Image:           "image"
-} @cuetsy(kind="enum")
+TableCellDisplayMode: "auto" | "color-text" | "color-background" | "gradient-gauge" | "lcd-gauge" | "json-view" | "basic" | "image" @cuetsy(kind="enum",memberNames="Auto|ColorText|ColorBackground|GradientGauge|LcdGauge|JSONView|BasicGauge|Image")
 
 TableFieldOptions: {
 	width?:      number
diff --git a/public/app/plugins/panel/histogram/models.cue b/public/app/plugins/panel/histogram/models.cue
index e29d88ddea4..3dd35689bf5 100644
--- a/public/app/plugins/panel/histogram/models.cue
+++ b/public/app/plugins/panel/histogram/models.cue
@@ -28,9 +28,7 @@ Panel: {
                     combine?: bool
                 }
 
-                PanelFieldConfig: {
-                    ui.GraphFieldConfig
-                }
+                PanelFieldConfig: ui.GraphFieldConfig
             }
         ]
     ]
diff --git a/public/app/plugins/panel/state-timeline/models.cue b/public/app/plugins/panel/state-timeline/models.cue
index 5acb0209d2b..bcdcc190e84 100644
--- a/public/app/plugins/panel/state-timeline/models.cue
+++ b/public/app/plugins/panel/state-timeline/models.cue
@@ -22,18 +22,18 @@ Panel: {
     lineages: [
         [
             {
-                #TimelineMode: "changes" | "samples" @cuetsy(kind="enum")
-                #TimelineValueAlignment: "center" | "left" | "right" @cuetsy(kind="type")
+                TimelineMode: "changes" | "samples" @cuetsy(kind="enum")
+                TimelineValueAlignment: "center" | "left" | "right" @cuetsy(kind="type")
                 PanelOptions: {
                     // FIXME ts comments indicate this shouldn't be in the saved model, but currently is emitted
-                    mode?: #TimelineMode
+                    mode?: TimelineMode
                     ui.OptionsWithLegend
                     ui.OptionsWithTooltip
                     showValue: ui.VisibilityMode | *"auto"
                     rowHeight: number | *0.9
                     colWidth?: number
                     mergeValues?: bool | *true
-                    alignValue?: #TimelineValueAlignment | *"left"
+                    alignValue?: TimelineValueAlignment | *"left"
                 }
                 PanelFieldConfig: {
                     ui.HideableFieldConfig
diff --git a/public/app/plugins/panel/text/models.cue b/public/app/plugins/panel/text/models.cue
index bd4a7840853..7600aa9b0d4 100644
--- a/public/app/plugins/panel/text/models.cue
+++ b/public/app/plugins/panel/text/models.cue
@@ -18,10 +18,9 @@ Panel: {
     lineages: [
         [
             {
-                TextMode: "html" | "markdown" @cuetsy(kind="enum",withName="TextMode")
-
+                TextMode: "html" | "markdown" @cuetsy(kind="enum")
                 PanelOptions: {
-                    mode: TextMode | *"markdown"
+                    mode: *"markdown" | TextMode
                     content: string | *"""
                     # Title