replace template variables in query

Author: speakyourcode

.circleci/config.yml

@@ -77,7 +77,5 @@ jobs:
             - coverage/lcov.info
       - store_artifacts:
           path: ci
-      - store_artifacts:
-          path: coverage/lcov.info
       - store_test_results:
-          path: coverage
+          path: ci/jobs/build/coverage

src/buttonPanel.test.tsx

@@ -5,7 +5,12 @@ import {
   LoadingState,
   PanelProps,
 } from '@grafana/data';
-import { getBackendSrv, getDataSourceSrv, SystemJS } from '@grafana/runtime';
+import {
+  getBackendSrv,
+  getDataSourceSrv,
+  getTemplateSrv,
+  SystemJS,
+} from '@grafana/runtime';
 import { Button, HorizontalGroup, VerticalGroup } from '@grafana/ui';
 import { shallow } from 'enzyme';
 import React from 'react';
@@ -64,6 +69,10 @@ describe('button panel', () => {
     ];
     wrapper.setProps({ options: { buttons: buttons } });
 
+    const mockTemplate = jest.fn().mockReturnValue('{}');
+    (getTemplateSrv as jest.Mock<any>).mockImplementation(() => ({
+      replace: mockTemplate,
+    }));
     const mockGet = jest.fn().mockReturnValue({ id: 1 });
     (getDataSourceSrv as jest.Mock<any>).mockImplementation(() => ({
       get: mockGet,
@@ -88,6 +97,7 @@ describe('button panel', () => {
       expect(b.text()).toBe(buttons[i].text);
       b.simulate('click');
       setImmediate(() => {
+        expect(mockTemplate).toHaveBeenCalled();
         expect(mockGet).toHaveBeenCalledWith(buttons[i].datasource);
         expect(mockDataSourceRequest).toHaveBeenCalled();
         expect(mockEmit).toHaveBeenCalledWith(AppEvents.alertSuccess, [
@@ -108,6 +118,10 @@ describe('button panel', () => {
     (getDataSourceSrv as jest.Mock<any>).mockImplementation(() => ({
       get: mockGet,
     }));
+    const mockTemplate = jest.fn().mockReturnValue('{}');
+    (getTemplateSrv as jest.Mock<any>).mockImplementation(() => ({
+      replace: mockTemplate,
+    }));
     const msg = 'msg';
     const mockDataSourceRequest = jest.fn().mockRejectedValue({
       status: statusError,

src/buttonPanel.tsx

@@ -1,5 +1,10 @@
 import { AppEvents, PanelProps } from '@grafana/data';
-import { getBackendSrv, getDataSourceSrv, SystemJS } from '@grafana/runtime';
+import {
+  getBackendSrv,
+  getDataSourceSrv,
+  getTemplateSrv,
+  SystemJS,
+} from '@grafana/runtime';
 import { Button, HorizontalGroup, VerticalGroup } from '@grafana/ui';
 import React from 'react';
 import { ButtonOptions, Options } from 'types';
@@ -15,7 +20,9 @@ export const ButtonPanel: React.FC<Props> = ({ options }) => {
           key={index}
           variant={b.variant}
           onClick={async () => {
-            const payload = JSON.parse(b.query || '{}');
+            const payload = JSON.parse(
+              await getTemplateSrv().replace(b.query || '{}')
+            );
             const ds = await getDataSourceSrv().get(b.datasource);
             try {
               const resp = await getBackendSrv().datasourceRequest({