DataSourceSrv: include alias in type filter (#104308) (#104336)

devenv/dev-dashboards/panel-barchart/barchart-autosizing.json

@@ -29,10 +29,7 @@
   "liveNow": false,
   "panels": [
     {
-      "datasource": {
+      "datasource": { "type": "testdata" },
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -110,10 +107,7 @@
       "type": "barchart"
     },
     {
-      "datasource": {
+      "datasource": { "type": "testdata" },
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
       "description": "Should be smaller given the longer value",
       "fieldConfig": {
         "defaults": {
@@ -193,10 +187,7 @@
       "type": "barchart"
     },
     {
-      "datasource": {
+      "datasource": { "type": "testdata" },
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -274,10 +265,7 @@
       "type": "barchart"
     },
     {
-      "datasource": {
+      "datasource": { "type": "testdata" },
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -436,10 +424,7 @@
       "type": "barchart"
     },
     {
-      "datasource": {
+      "datasource": { "type": "testdata" },
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -518,10 +503,7 @@
       "type": "barchart"
     },
     {
-      "datasource": {
+      "datasource": { "type": "testdata" },
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
       "description": "",
       "fieldConfig": {
         "defaults": {

public/app/features/plugins/datasource_srv.ts

@@ -259,9 +259,15 @@ export class DatasourceSrv implements DataSourceService {
       if (filters.filter && !filters.filter(x)) {
         return false;
       }
-      if (filters.type && (Array.isArray(filters.type) ? !filters.type.includes(x.type) : filters.type !== x.type)) {
+      if (filters.type) {
+        if (Array.isArray(filters.type)) {
+          if (!filters.type.includes(x.type)) {
             return false;
           }
+        } else if (!(x.type === filters.type || x.meta.aliasIDs?.includes(filters.type!))) {
+          return false;
+        }
+      }
       if (
         !filters.all &&
         x.meta.metrics !== true &&