Add custom params to API

Author: marcusolsson

src/DataSource.ts

@@ -17,17 +17,15 @@ import { JsonApiQuery, JsonApiVariableQuery, JsonApiDataSourceOptions } from './
 
 export class DataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOptions> {
   api: API;
-  queryParams: string;
 
   constructor(instanceSettings: DataSourceInstanceSettings<JsonApiDataSourceOptions>) {
     super(instanceSettings);
-    this.api = new API(instanceSettings.url!);
-    this.queryParams = instanceSettings.jsonData.queryParams || '';
+    this.api = new API(instanceSettings.url!, instanceSettings.jsonData.queryParams || '');
   }
 
   async query(request: DataQueryRequest<JsonApiQuery>): Promise<DataQueryResponse> {
     const promises = request.targets.map(async query => {
-      const response = await this.api.cachedGet(query.cacheDurationSeconds, this.queryParams);
+      const response = await this.api.cachedGet(query.cacheDurationSeconds);
 
       const fields = query.fields
         .filter(field => field.jsonPath)
@@ -70,7 +68,9 @@ export class DataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOpt
     if (!query.jsonPath) {
       return [];
     }
-    return JSONPath({ path: query.jsonPath, json: await this.api.get() }).map((_: any) => ({ text: _ }));
+    return JSONPath({ path: query.jsonPath, json: await this.api.get() }).map((_: any) => ({
+      text: _,
+    }));
   }
 
   /**
@@ -80,7 +80,7 @@ export class DataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOpt
     const defaultErrorMessage = 'Cannot connect to API';
 
     try {
-      const response = await this.api.test(this.queryParams);
+      const response = await this.api.test();
       if (response.status === 200) {
         return {
           status: 'success',

src/api.ts

@@ -4,19 +4,21 @@ import cache from 'memory-cache';
 export default class Api {
   cache: any;
   baseUrl: string;
+  params: string;
   lastCacheDuration: number | undefined;
 
-  constructor(baseUrl: string) {
+  constructor(baseUrl: string, params: string) {
     this.baseUrl = baseUrl;
+    this.params = params;
     this.cache = new cache.Cache();
   }
 
   /**
    * Queries the API and returns the response data.
    */
-  async get(params?: string) {
+  async get() {
     const req = {
-      url: `${this.baseUrl}${params?.length ? `?${params}` : ''}`,
+      url: `${this.baseUrl}${this.params.length ? `?${this.params}` : ''}`,
       method: 'GET',
     };
 
@@ -28,9 +30,9 @@ export default class Api {
   /**
    * Used as a health check.
    */
-  async test(params?: string) {
+  async test() {
     const req = {
-      url: `${this.baseUrl}${params?.length ? `?${params}` : ''}`,
+      url: `${this.baseUrl}${this.params.length ? `?${this.params}` : ''}`,
       method: 'GET',
     };
     return getBackendSrv().datasourceRequest(req);
@@ -41,7 +43,7 @@ export default class Api {
    */
   async cachedGet(cacheDurationSeconds: number, params?: string) {
     if (cacheDurationSeconds === 0) {
-      return await this.get(params);
+      return await this.get();
     }
 
     const force = this.lastCacheDuration !== cacheDurationSeconds;
@@ -56,7 +58,7 @@ export default class Api {
     }
     this.lastCacheDuration = cacheDurationSeconds;
 
-    const result = await this.get(params);
+    const result = await this.get();
 
     this.cache.put(this.baseUrl, result, Math.max(cacheDurationSeconds * 1000, 1));