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

(cherry picked from commit d9e1cb44c8)
2020-01-27 13:32:03 +01:00
parent cfb8912200
commit 18a92cc540
1 changed files with 5 additions and 2 deletions
@@ -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',