Refactor variable interop (#36)

Author: haohanyang

src/components/QueryHelper.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { QueryEditorHelpProps } from "@grafana/data";
-import {Divider, Text} from "@grafana/ui";
+import { Divider, Text } from "@grafana/ui";
 
 export function QueryHelper(_props: QueryEditorHelpProps) {
   return (

src/datasource.ts

@@ -1,8 +1,8 @@
-import { DataSourceInstanceSettings, CoreApp, ScopedVars, DataQueryRequest, DataQueryResponse, LegacyMetricFindQueryOptions, MetricFindValue, dateTime } from "@grafana/data";
+import { DataSourceInstanceSettings, CoreApp, ScopedVars, DataQueryRequest, LegacyMetricFindQueryOptions, MetricFindValue, dateTime } from "@grafana/data";
 import { DataSourceWithBackend, getTemplateSrv } from "@grafana/runtime";
-import { parseJsQuery, datetimeToJson, getBucketCount, parseJsQueryLegacy, randomId, getMetricValues } from "./utils";
+import { parseJsQuery, getBucketCount, parseJsQueryLegacy, randomId, getMetricValues, datetimeToJson } from "./utils";
 import { MongoQuery, MongoDataSourceOptions, DEFAULT_QUERY, QueryLanguage, VariableQuery } from "./types";
-import { Observable, firstValueFrom } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 
 export class DataSource extends DataSourceWithBackend<MongoQuery, MongoDataSourceOptions> {
@@ -14,10 +14,47 @@ export class DataSource extends DataSourceWithBackend<MongoQuery, MongoDataSourc
     return DEFAULT_QUERY;
   }
 
+
   applyTemplateVariables(query: MongoQuery, scopedVars: ScopedVars) {
+    let queryText = query.queryText!;
+
+    if (query.queryLanguage === QueryLanguage.JAVASCRIPT || query.queryLanguage === QueryLanguage.JAVASCRIPT_SHADOW) {
+      const { jsonQuery } =
+        query.queryLanguage === QueryLanguage.JAVASCRIPT_SHADOW
+          ? parseJsQuery(queryText)
+          : parseJsQueryLegacy(queryText);
+      queryText = jsonQuery!;
+    }
+
+    const from = getTemplateSrv().replace("$__from", {});
+    const to = getTemplateSrv().replace("$__to", {});
+
+    // Compatible with legacy plugin $from
+    if (from !== "$__from") {
+      queryText = queryText.replaceAll(/"\$from"/g, datetimeToJson(from));
+    }
+
+    // Compatible with legacy plugin $to
+    if (to !== "$__to") {
+      queryText = queryText.replaceAll(/"\$to"/g, datetimeToJson(to));
+    }
+
+    const interval = scopedVars["__interval_ms"]?.value;
+
+    // Compatible with legacy plugin $dateBucketCount
+    if (interval && from && to) {
+      queryText = queryText.replaceAll(
+        /"\$dateBucketCount"/g,
+        getBucketCount(from, to, interval).toString()
+      );
+    }
+
+    const text = getTemplateSrv().replace(queryText, scopedVars);
+
+    console.log(text);
     return {
       ...query,
-      queryText: getTemplateSrv().replace(query.queryText, scopedVars),
+      queryText: text
     };
   }
 
@@ -59,29 +96,4 @@ export class DataSource extends DataSourceWithBackend<MongoQuery, MongoDataSourc
     return !!query.queryText && !!query.collection;
   }
 
-  query(request: DataQueryRequest<MongoQuery>): Observable<DataQueryResponse> {
-    const queries = request.targets.map((query) => {
-      let queryText = query.queryText!;
-      if (query.queryLanguage === QueryLanguage.JAVASCRIPT || query.queryLanguage === QueryLanguage.JAVASCRIPT_SHADOW) {
-        const { jsonQuery } =
-          query.queryLanguage === QueryLanguage.JAVASCRIPT_SHADOW
-            ? parseJsQuery(queryText)
-            : parseJsQueryLegacy(queryText);
-        queryText = jsonQuery!;
-      }
-
-      return {
-        ...query,
-        queryText: queryText
-          .replaceAll(/"\$from"/g, datetimeToJson(request.range.from))
-          .replaceAll(/"\$to"/g, datetimeToJson(request.range.to))
-          .replaceAll(
-            /"\$dateBucketCount"/g,
-            getBucketCount(request.range.from, request.range.to, request.intervalMs).toString()
-          ),
-      };
-    });
-
-    return super.query({ ...request, targets: queries });
-  }
 }

src/types.ts

@@ -14,7 +14,7 @@ export interface MongoQuery extends DataQuery {
   aggregateAllowDiskUse?: boolean;
   aggregateMaxAwaitTime?: number;
   aggregateBypassDocumentValidation?: boolean;
-  
+
 }
 
 export const QueryType = {

src/utils.ts

@@ -1,4 +1,4 @@
-import { DataFrameSchema, DataQueryResponse, DateTime, FieldType, MetricFindValue } from "@grafana/data";
+import { DataFrameSchema, DataQueryResponse, FieldType, MetricFindValue } from "@grafana/data";
 import { JsQueryResult } from "types";
 import shadow from "shadowrealm-api";
 import { getTemplateSrv } from "@grafana/runtime";
@@ -65,19 +65,17 @@ export function parseJsQuery(queryText: string): JsQueryResult {
     }
 }
 
-
-
-export function datetimeToJson(datetime: DateTime) {
+export function datetimeToJson(datetime: string) {
     return JSON.stringify({
         $date: {
-            $numberLong: datetime.toDate().getTime().toString()
+            $numberLong: datetime
         }
     });
 }
 
-export function getBucketCount(from: DateTime, to: DateTime, intervalMs: number) {
-    let current = from.toDate().getTime();
-    const toMs = to.toDate().getTime();
+export function getBucketCount(from: string, to: string, intervalMs: number) {
+    let current = parseInt(from, 10);
+    const toMs = parseInt(to, 10);
     let count = 0;
     while (current < toMs) {
         current += intervalMs;