From ea96c42545976bbe7a1a740b1f53f0fb73fbb9e0 Mon Sep 17 00:00:00 2001 From: sam boyer Date: Thu, 5 May 2022 10:56:53 -0500 Subject: [PATCH] schemas: Update to cuetsy v0.0.1 (#48753) * Add explicit cuetsy annotations to all models.cue * Update to first cuetsy release * Clean up cuetsify a bit; remove unification * Update changes to news codegen output --- go.mod | 9 ++++---- go.sum | 21 ++++++++++++------- .../grafana-cli/commands/cuetsify_command.go | 15 ++----------- public/app/plugins/panel/barchart/models.cue | 6 +++--- public/app/plugins/panel/bargauge/models.cue | 4 ++-- .../app/plugins/panel/candlestick/models.cue | 4 ++-- public/app/plugins/panel/canvas/models.cue | 2 +- public/app/plugins/panel/dashlist/models.cue | 4 ++-- public/app/plugins/panel/gauge/models.cue | 4 ++-- .../app/plugins/panel/heatmap-new/models.cue | 4 ++-- public/app/plugins/panel/histogram/models.cue | 4 ++-- public/app/plugins/panel/news/models.cue | 2 +- public/app/plugins/panel/news/models.gen.ts | 2 +- public/app/plugins/panel/stat/models.cue | 4 ++-- .../plugins/panel/state-timeline/models.cue | 6 +++--- .../plugins/panel/status-history/models.cue | 6 +++--- public/app/plugins/panel/table/models.cue | 4 ++-- public/app/plugins/panel/text/models.cue | 4 ++-- .../app/plugins/panel/timeseries/models.cue | 4 ++-- 19 files changed, 52 insertions(+), 57 deletions(-) diff --git a/go.mod b/go.mod index 5d7ab9c25e3..28e966b25e3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ replace github.com/russellhaering/goxmldsig@v1.1.0 => github.com/russellhaering/ require ( cloud.google.com/go/storage v1.21.0 - cuelang.org/go v0.4.1 + cuelang.org/go v0.4.3 github.com/Azure/azure-sdk-for-go v59.3.0+incompatible github.com/Azure/go-autorest/autorest v0.11.22 github.com/BurntSushi/toml v0.3.1 @@ -50,7 +50,7 @@ require ( github.com/google/wire v0.5.0 github.com/gorilla/websocket v1.4.2 github.com/gosimple/slug v1.9.0 - github.com/grafana/cuetsy v0.0.0-20211119211437-8c25464cc9bf + github.com/grafana/cuetsy v0.0.1 github.com/grafana/grafana-aws-sdk v0.10.3 github.com/grafana/grafana-azure-sdk-go v1.1.0 github.com/grafana/grafana-plugin-sdk-go v0.134.0 @@ -107,7 +107,7 @@ require ( golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 - golang.org/x/tools v0.1.9 + golang.org/x/tools v0.1.10 gonum.org/v1/gonum v0.11.0 google.golang.org/api v0.74.0 google.golang.org/grpc v1.45.0 @@ -234,7 +234,7 @@ require ( go.uber.org/goleak v1.1.12 // indirect golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect @@ -290,6 +290,7 @@ require ( github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pierrec/lz4/v4 v4.1.8 // indirect github.com/segmentio/asm v1.1.1 // indirect + github.com/xlab/treeprint v1.1.0 // indirect github.com/yudai/pp v2.0.1+incompatible // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 // indirect go.opentelemetry.io/proto/otlp v0.15.0 // indirect diff --git a/go.sum b/go.sum index f038edcc4fc..073095a20d6 100644 --- a/go.sum +++ b/go.sum @@ -88,9 +88,9 @@ contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeS contrib.go.opencensus.io/exporter/prometheus v0.3.0/go.mod h1:rpCPVQKhiyH8oomWgm34ZmgIdZa8OVYO5WAIygPbBBE= contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= -cuelang.org/go v0.4.0/go.mod h1:tz/edkPi+T37AZcb5GlPY+WJkL6KiDlDVupKwL3vvjs= -cuelang.org/go v0.4.1 h1:rxG2cyZzdAymrNICI0L/wagK2EitoR8Xsiiq2D7qkaQ= cuelang.org/go v0.4.1/go.mod h1:P09/R4UfAEzLkV9DXxwlxQnIZbkaT4uIhiEgs6Vsz2Q= +cuelang.org/go v0.4.3 h1:W3oBBjDTm7+IZfCKZAmC8uDG0eYfJL4Pp/xbbCMKaVo= +cuelang.org/go v0.4.3/go.mod h1:7805vR9H+VoBNdWFdI7jyDR3QLUPp4+naHfbcgp55HI= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= @@ -1411,8 +1411,8 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosimple/slug v1.9.0 h1:r5vDcYrFz9BmfIAMC829un9hq7hKM4cHUrsv36LbEqs= github.com/gosimple/slug v1.9.0/go.mod h1:AMZ+sOVe65uByN3kgEyf9WEBKBCSS+dJjMX9x4vDJbg= -github.com/grafana/cuetsy v0.0.0-20211119211437-8c25464cc9bf h1:RY69RBqlr3yWNgpAqrSRiUvqa/Jw6uqVqiHNHLzifhU= -github.com/grafana/cuetsy v0.0.0-20211119211437-8c25464cc9bf/go.mod h1:H9Ei+Q808FCWyeEzpaW5GMfBvXCuFOfQa4x/vzKY+Fg= +github.com/grafana/cuetsy v0.0.1 h1:HEoYBiEb8zRq70kc0WSVG+bZ85W8nQ8BQr4l7f2kl0s= +github.com/grafana/cuetsy v0.0.1/go.mod h1:h8fQHb+IHbLjJ6UpaAuRtd8qV6D2JEm+j9rSk3G2Dik= github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f h1:FvvSVEbnGeM2bUivGmsiXTi8URJyBU7TcFEEoRe5wWI= github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM= github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 h1:GplhUk6Xes5JIhUUrggPcPBhOn+eT8+WsHiebvq7GgA= @@ -2383,8 +2383,9 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= @@ -2511,6 +2512,7 @@ github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJ github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -2681,6 +2683,7 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xlab/treeprint v1.0.0/go.mod h1:IoImgRak9i3zJyuxOKUP1v4UZd1tMoKkq/Cimt1uhCg= +github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xorcare/pointer v1.1.0 h1:sFwXOhRF8QZ0tyVZrtxWGIoVZNEmRzBCaFWdONPQIUM= github.com/xorcare/pointer v1.1.0/go.mod h1:6KLhkOh6YbuvZkT4YbxIbR/wzLBjyMxOiNzZhJTor2Y= @@ -2990,6 +2993,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -3449,15 +3453,17 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= @@ -3779,7 +3785,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/cmd/grafana-cli/commands/cuetsify_command.go b/pkg/cmd/grafana-cli/commands/cuetsify_command.go index 8ce9853bb68..44d0d96a1fb 100644 --- a/pkg/cmd/grafana-cli/commands/cuetsify_command.go +++ b/pkg/cmd/grafana-cli/commands/cuetsify_command.go @@ -95,15 +95,6 @@ func (cmd Command) generateTypescript(c utils.CommandLine) error { Module: "github.com/grafana/grafana", } - // One-time load of the panel-plugin scuemata family def, for unifying to easily apply cuetsy attributes - clcfg.Dir = "cue/scuemata" - v := ctx.BuildInstance(cload.Instances(nil, clcfg)[0]) - if v.Err() != nil { - return v.Err() - } - ppf := v.LookupPath(cue.ParsePath("#PanelSchema")) - _ = ppf - // FIXME hardcoding paths to exclude is not the way to handle this excl := map[string]bool{ "cue.mod": true, @@ -172,7 +163,6 @@ func (cmd Command) generateTypescript(c utils.CommandLine) error { } bi := insts[0] - // dumpBuildInst(bi) v := ctx.BuildInstance(bi) if v.Err() != nil { return v.Err() @@ -202,7 +192,7 @@ func (cmd Command) generateTypescript(c utils.CommandLine) error { } // val := v.LookupPath(cue.ParsePath("Panel.lineages[0][0]")) - // Extract the latest schema and its version number + // Extract the latest schema and its version number. (All of this goes away with Thema, whew) f.V = &tsModver{} lins := v.LookupPath(cue.ParsePath("Panel.lineages")) f.V.Lin, _ = lins.Len().Int64() @@ -212,8 +202,7 @@ func (cmd Command) generateTypescript(c utils.CommandLine) error { f.V.Sch = f.V.Sch - 1 latest := schs.LookupPath(cue.MakePath(cue.Index(int(f.V.Sch)))) - sch := latest.UnifyAccept(ppf, latest) - b, err = cuetsy.Generate(sch, cuetsy.Config{}) + b, err = cuetsy.Generate(latest, cuetsy.Config{}) default: b, err = cuetsy.Generate(v, cuetsy.Config{}) } diff --git a/public/app/plugins/panel/barchart/models.cue b/public/app/plugins/panel/barchart/models.cue index c39a85e0ce9..6c67992ae11 100644 --- a/public/app/plugins/panel/barchart/models.cue +++ b/public/app/plugins/panel/barchart/models.cue @@ -32,16 +32,16 @@ Panel: { showValue: ui.VisibilityMode barWidth: number groupWidth: number - } + } @cuetsy(kind="interface") PanelFieldConfig: { ui.AxisConfig ui.HideableFieldConfig lineWidth?: number fillOpacity?: number gradientMode?: ui.GraphGradientMode - } + } @cuetsy(kind="interface") } ] ] migrations: [] -} \ No newline at end of file +} diff --git a/public/app/plugins/panel/bargauge/models.cue b/public/app/plugins/panel/bargauge/models.cue index 52e7d0ddc10..30a7a4515f7 100644 --- a/public/app/plugins/panel/bargauge/models.cue +++ b/public/app/plugins/panel/bargauge/models.cue @@ -24,9 +24,9 @@ Panel: { ui.SingleStatBaseOptions displayMode: ui.BarGaugeDisplayMode showUnfilled: bool - } + } @cuetsy(kind="interface") } ] ] migrations: [] -} \ No newline at end of file +} diff --git a/public/app/plugins/panel/candlestick/models.cue b/public/app/plugins/panel/candlestick/models.cue index 1bb9205ed9a..38d0a0ee6e6 100644 --- a/public/app/plugins/panel/candlestick/models.cue +++ b/public/app/plugins/panel/candlestick/models.cue @@ -21,11 +21,11 @@ Panel: { PanelOptions: { // anything for now ... - } + } @cuetsy(kind="interface") PanelFieldConfig: { // anything for now ... - } + } @cuetsy(kind="interface") } ] ] diff --git a/public/app/plugins/panel/canvas/models.cue b/public/app/plugins/panel/canvas/models.cue index 2bade18a534..23ed67c7635 100644 --- a/public/app/plugins/panel/canvas/models.cue +++ b/public/app/plugins/panel/canvas/models.cue @@ -21,7 +21,7 @@ Panel: { PanelOptions: { // anything for now ... - } + } @cuetsy(kind="interface") } ] ] diff --git a/public/app/plugins/panel/dashlist/models.cue b/public/app/plugins/panel/dashlist/models.cue index 153f609e9c9..b13be7c61d0 100644 --- a/public/app/plugins/panel/dashlist/models.cue +++ b/public/app/plugins/panel/dashlist/models.cue @@ -28,8 +28,8 @@ Panel: { query: string | *"" folderId?: int tags: [...string] | *[] - }, - } + } @cuetsy(kind="interface") + }, ] ] migrations: [] diff --git a/public/app/plugins/panel/gauge/models.cue b/public/app/plugins/panel/gauge/models.cue index 640363a4aea..b180c966220 100644 --- a/public/app/plugins/panel/gauge/models.cue +++ b/public/app/plugins/panel/gauge/models.cue @@ -24,9 +24,9 @@ Panel: { ui.SingleStatBaseOptions showThresholdLabels: bool showThresholdMarkers: bool - } + } @cuetsy(kind="interface") } ] ] migrations: [] -} \ No newline at end of file +} diff --git a/public/app/plugins/panel/heatmap-new/models.cue b/public/app/plugins/panel/heatmap-new/models.cue index 1bb9205ed9a..38d0a0ee6e6 100644 --- a/public/app/plugins/panel/heatmap-new/models.cue +++ b/public/app/plugins/panel/heatmap-new/models.cue @@ -21,11 +21,11 @@ Panel: { PanelOptions: { // anything for now ... - } + } @cuetsy(kind="interface") PanelFieldConfig: { // anything for now ... - } + } @cuetsy(kind="interface") } ] ] diff --git a/public/app/plugins/panel/histogram/models.cue b/public/app/plugins/panel/histogram/models.cue index 3dd35689bf5..e85440f0edd 100644 --- a/public/app/plugins/panel/histogram/models.cue +++ b/public/app/plugins/panel/histogram/models.cue @@ -26,9 +26,9 @@ Panel: { bucketSize?: int bucketOffset: int | *0 combine?: bool - } + } @cuetsy(kind="interface") - PanelFieldConfig: ui.GraphFieldConfig + PanelFieldConfig: ui.GraphFieldConfig & {} @cuetsy(kind="interface") } ] ] diff --git a/public/app/plugins/panel/news/models.cue b/public/app/plugins/panel/news/models.cue index b4e632e9c66..7ab474371a3 100644 --- a/public/app/plugins/panel/news/models.cue +++ b/public/app/plugins/panel/news/models.cue @@ -22,7 +22,7 @@ Panel: { // empty/missing will default to grafana blog feedUrl?: string showImage?: bool | *true - } + } @cuetsy(kind="interface") } ] ] diff --git a/public/app/plugins/panel/news/models.gen.ts b/public/app/plugins/panel/news/models.gen.ts index fa953457c4a..6351ddcbc67 100644 --- a/public/app/plugins/panel/news/models.gen.ts +++ b/public/app/plugins/panel/news/models.gen.ts @@ -11,6 +11,6 @@ export interface PanelOptions { showImage?: boolean; } -export const defaultPanelOptions: PanelOptions = { +export const defaultPanelOptions: Partial = { showImage: true, }; diff --git a/public/app/plugins/panel/stat/models.cue b/public/app/plugins/panel/stat/models.cue index e5a13591d2a..37da0bf3fa2 100644 --- a/public/app/plugins/panel/stat/models.cue +++ b/public/app/plugins/panel/stat/models.cue @@ -26,9 +26,9 @@ Panel: { colorMode: ui.BigValueColorMode justifyMode: ui.BigValueJustifyMode textMode: ui.BigValueTextMode - } + } @cuetsy(kind="interface") } ] ] migrations: [] -} \ No newline at end of file +} diff --git a/public/app/plugins/panel/state-timeline/models.cue b/public/app/plugins/panel/state-timeline/models.cue index bcdcc190e84..e32a9b7e9de 100644 --- a/public/app/plugins/panel/state-timeline/models.cue +++ b/public/app/plugins/panel/state-timeline/models.cue @@ -34,14 +34,14 @@ Panel: { colWidth?: number mergeValues?: bool | *true alignValue?: TimelineValueAlignment | *"left" - } + } @cuetsy(kind="interface") PanelFieldConfig: { ui.HideableFieldConfig lineWidth?: number | *0 fillOpacity?: number | *70 - } + } @cuetsy(kind="interface") } ] ] migrations: [] -} \ No newline at end of file +} diff --git a/public/app/plugins/panel/status-history/models.cue b/public/app/plugins/panel/status-history/models.cue index 96250734e6a..69f760ef4fd 100644 --- a/public/app/plugins/panel/status-history/models.cue +++ b/public/app/plugins/panel/status-history/models.cue @@ -29,14 +29,14 @@ Panel: { rowHeight: number colWidth?: number alignValue: "center" | *"left" | "right" - } + } @cuetsy(kind="interface") PanelFieldConfig: { ui.HideableFieldConfig lineWidth?: number | *1 fillOpacity?: number | *70 - } + } @cuetsy(kind="interface") } ] ] migrations: [] -} \ No newline at end of file +} diff --git a/public/app/plugins/panel/table/models.cue b/public/app/plugins/panel/table/models.cue index 5d4b481ec8a..40fab037763 100644 --- a/public/app/plugins/panel/table/models.cue +++ b/public/app/plugins/panel/table/models.cue @@ -27,8 +27,8 @@ Panel: { showHeader: bool | *true showTypeIcons: bool | *false sortBy?: [...ui.TableSortByFieldState] - } - PanelFieldConfig: ui.TableFieldOptions + } @cuetsy(kind="interface") + PanelFieldConfig: ui.TableFieldOptions & {} @cuetsy(kind="interface") }, ] ] diff --git a/public/app/plugins/panel/text/models.cue b/public/app/plugins/panel/text/models.cue index ea5c77aef8e..a4a5a3a114d 100644 --- a/public/app/plugins/panel/text/models.cue +++ b/public/app/plugins/panel/text/models.cue @@ -20,13 +20,13 @@ Panel: { { TextMode: "html" | "markdown" @cuetsy(kind="enum",memberNames="HTML|Markdown") PanelOptions: { - mode: TextMode | *"markdown" + mode: TextMode | *"markdown" content: string | *""" # Title For markdown syntax help: [commonmark.org/help](https://commonmark.org/help/) """ - } + } @cuetsy(kind="interface") } ] ] diff --git a/public/app/plugins/panel/timeseries/models.cue b/public/app/plugins/panel/timeseries/models.cue index 7e1148bb69c..5560ae3f71a 100644 --- a/public/app/plugins/panel/timeseries/models.cue +++ b/public/app/plugins/panel/timeseries/models.cue @@ -25,8 +25,8 @@ Panel: { PanelOptions: { legend: ui.VizLegendOptions tooltip: ui.VizTooltipOptions - } - PanelFieldConfig: ui.GraphFieldConfig + } @cuetsy(kind="interface") + PanelFieldConfig: ui.GraphFieldConfig & {} @cuetsy(kind="interface") } ] ]