Annotations: Fix issue with annotation queries editors (#21712)

d9e1cb44 · Dominik Prokop · GitHub · 5e87af8b · d9e1cb44
Commit d9e1cb44 authored Jan 24, 2020 by Dominik Prokop Committed by GitHub Jan 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

public/app/features/plugins/plugin_component.ts
+5 -2

No files found.
--- a/public/app/features/plugins/plugin_component.ts
+++ b/public/app/features/plugins/plugin_component.ts
@@ -126,10 +126,13 @@ function pluginDirectiveLoader(
      }
      // Annotations
      case 'annotations-query-ctrl': {
+        const baseUrl = scope.ctrl.currentDatasource.meta.baseUrl;
+        const pluginId = scope.ctrl.currentDatasource.meta.id;
+
        return importDataSourcePlugin(scope.ctrl.currentDatasource.meta).then(dsPlugin => {
          return {
-            baseUrl: scope.ctrl.currentDatasource.meta.baseUrl,
-            name: 'annotations-query-ctrl-' + scope.ctrl.currentDatasource.meta.id,
+            baseUrl,
+            name: 'annotations-query-ctrl-' + pluginId,
            bindings: { annotation: '=', datasource: '=' },
            attrs: {
              annotation: 'ctrl.currentAnnotation',