Revert: Future-proofing query and data source model in Dashboard Sche… (#107985)

* Revert: Future-proofing query and data source model in Dashboard Schema v2

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

apps/dashboard/kinds/v2alpha1/dashboard_spec.cue

@@ -111,8 +111,6 @@ DashboardLink: {
 	keepTime: bool | *false
 }
 
-// Keeping this for backwards compatibility for GroupByVariableSpec and AdhocVariableSpec
-// This type is widely used in the codebase and changing it will have a big impact
 DataSourceRef: {
 	// The plugin type-id
 	type?: string
@@ -387,7 +385,8 @@ VizConfigKind: {
 }
 
 AnnotationQuerySpec: {
-	query:      DataQueryKind
+	datasource?: DataSourceRef
+	query?:      DataQueryKind
 	enable:      bool
 	hide:        bool
 	iconColor:   string
@@ -413,19 +412,15 @@ QueryOptionsSpec: {
 }
 
 DataQueryKind: {
-	kind: "DataQuery"
-	group: string
-	version: string | *"v0"
-	// New type for datasource reference
-	// Not creating a new type until we figure out how to handle DS refs for group by, adhoc, and every place that uses DataSourceRef in TS.
-	datasource?: {
-		name?: string
-	}
+	// The kind of a DataQueryKind is the datasource type
+	kind: string
 	spec: [string]: _
 }
 
 PanelQuerySpec: {
 	query:       DataQueryKind
+	datasource?: DataSourceRef
+
 	refId:  string
 	hidden: bool
 }
@@ -728,6 +723,7 @@ QueryVariableSpec: {
 	refresh:      VariableRefresh
 	skipUrlSync:  bool | *false
 	description?: string
+	datasource?:  DataSourceRef
 	query:        DataQueryKind
 	regex:        string | *""
 	sort:         VariableSort