root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 73 Packages Projects Releases Wiki Activity

make getAll return array instead of object

This commit is contained in:
Erik Sundell 2018-11-30 09:48:59 +01:00
parent df75fb0e6d
commit 3d45b5ba73
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/explore/Explore.tsx
View File

@ -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,

3
public/app/features/plugins/datasource_srv.ts
View File

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