public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: reverts unintentional changes

Browse Source
This commit is contained in:
Hugo Häggmark
2020-12-07 09:06:42 +01:00
parent f2ed9acdae
commit 2dbc3811df
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/sqlstore.go
-1
View File
@@ -363,7 +363,6 @@ func InitTestDB(t ITestDB) *SQLStore {
// set test db config // set test db config
testSQLStore.Cfg = setting.NewCfg() testSQLStore.Cfg = setting.NewCfg()
sec, err := testSQLStore.Cfg.Raw.NewSection("database") sec, err := testSQLStore.Cfg.Raw.NewSection("database")
if err != nil { if err != nil {
t.Fatalf("Failed to create section: %s", err) t.Fatalf("Failed to create section: %s", err)
public/app/features/variables/editor/getVariableQueryEditor.tsx
+5 -5
View File
@@ -20,11 +20,6 @@ export async function getVariableQueryEditor<
datasource: DataSourceApi<TQuery, TOptions>, datasource: DataSourceApi<TQuery, TOptions>,
importDataSourcePluginFunc = importDataSourcePlugin importDataSourcePluginFunc = importDataSourcePlugin
): Promise<VariableQueryEditorType> { ): Promise<VariableQueryEditorType> {
if (hasLegacyVariableSupport(datasource)) {
const dsPlugin = await importDataSourcePluginFunc(datasource.meta!);
return dsPlugin.components.VariableQueryEditor ?? LegacyVariableQueryEditor;
}
if (hasCustomVariableSupport(datasource)) { if (hasCustomVariableSupport(datasource)) {
return datasource.variables.editor; return datasource.variables.editor;
} }
@@ -43,6 +38,11 @@ export async function getVariableQueryEditor<
return StandardVariableQueryEditor; return StandardVariableQueryEditor;
} }
if (hasLegacyVariableSupport(datasource)) {
const dsPlugin = await importDataSourcePluginFunc(datasource.meta!);
return dsPlugin.components.VariableQueryEditor ?? LegacyVariableQueryEditor;
}
return null; return null;
} }