Remove templateSrv from datasource constructor #9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because the datasource class has two arguments in the constructor, so there is angular injection at this line:
https://github.com/ryantxu/grafana/blob/6c2375e495a2987c674fa5a11ac44d99d527f275/public/app/features/plugins/datasource_srv.ts#L79
The plugin currently fails at this step, either @ngInject annotation needs to be added to datasource constructor or we remove templateSrv from the constructor to skip angular injection. I think the latter is better since TemplateSrv is no longer an Angular injected dependency and this is more consistent with how the other services are handled for React components. This PR removes
templateSrvfrom the datasource constructor, replacestemplateSrvproperty references with thegetTemplateSrv()call, and updates the affected tests by mockinggetTemplateSrv()instead.