Add RefId to Query as mandatory for the upcoming release (#55)

* Add RefId to Query as required in the Grafana master * Fix tests
RedisGrafana · Apr 19, 2021 · 12db1bb · 12db1bb
1 parent 37c267a
commit 12db1bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/components/root-page/root-page.test.tsx b/src/components/root-page/root-page.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
 import { Observable } from 'rxjs';
 import { AppPluginMeta, PluginType } from '@grafana/data';
 import { InfoBox } from '@grafana/ui';
@@ -137,7 +137,7 @@ describe('RootPage', () => {
 
       setImmediate(() => {
         expect(getRedisMock).toHaveBeenCalledWith('redis');
-        expect(redisMock.query).toHaveBeenCalledWith({ targets: [{ query: RedisCommand.COMMAND }] });
+        expect(redisMock.query).toHaveBeenCalledWith({ targets: [{ refId: 'A', query: RedisCommand.COMMAND }] });
         expect(wrapper.state().loading).toBeFalsy();
         expect(wrapper.state().dataSources).toEqual([
           {

diff --git a/src/components/root-page/root-page.tsx b/src/components/root-page/root-page.tsx
@@ -104,7 +104,7 @@ export class RootPage extends PureComponent<Props, State> {
          * Execute query
          */
         const query = (redis.query({
-          targets: [{ query: RedisCommand.COMMAND }],
+          targets: [{ refId: 'A', query: RedisCommand.COMMAND }],
         } as DataQueryRequest<RedisQuery>) as unknown) as Observable<DataQueryResponse>;
 
         if (!query.toPromise) {

diff --git a/src/redis-cli-panel/components/redis-cli-panel/redis-cli-panel.tsx b/src/redis-cli-panel/components/redis-cli-panel/redis-cli-panel.tsx
@@ -65,7 +65,7 @@ export const RedisCLIPanel: React.FC<PanelProps<PanelOptions>> = ({
      * Run Query
      */
     const res = await ((ds.query({
-      targets: [{ query: replaceVariables(query), cli: !options.raw }],
+      targets: [{ refId: 'A', query: replaceVariables(query), cli: !options.raw }],
     } as DataQueryRequest<RedisQuery>) as unknown) as Observable<DataQueryResponse>)
       .pipe(
         switchMap$((response) => {