make getAll return array instead of object

pull/14135/head
Erik Sundell 7 years ago
parent df75fb0e6d
commit 3d45b5ba73
  1. 2
      public/app/features/explore/Explore.tsx
  2. 3
      public/app/features/plugins/datasource_srv.ts

@ -144,7 +144,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
if (!datasourceSrv) {
throw new Error('No datasource service passed as props.');
}
const datasources = Object['values'](datasourceSrv.getAll());
const datasources = datasourceSrv.getAll();
const exploreDatasources = datasources.map(ds => ({
value: ds.name,
label: ds.name,

@ -74,7 +74,8 @@ export class DatasourceSrv {
}
getAll() {
return config.datasources;
const { datasources } = config;
return Object.keys(datasources).map(name => datasources[name]);
}
getAnnotationSources() {

Loading…
Cancel
Save