Merge branch 'issue-330' of github.com:Altinity/clickhouse-grafana in…

…to issue-330
Altinity · Nov 17, 2024 · a9aa533 · a9aa533
2 parents a10941e + 1a87670
commit a9aa533
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/datasource/sql-query/sql_query.ts b/src/datasource/sql-query/sql_query.ts
@@ -43,7 +43,6 @@ export default class SqlQuery {
     let intervalMs = SqlQueryHelper.convertInterval(i, this.target.intervalFactor || 1, true);
     let adhocCondition: any[] = [];
 
-    adhocFilters = this.target.adHocFilters
     try {
       let ast = scanner.toAST();
       let topQueryAST = ast;

diff --git a/src/views/QueryEditor/QueryEditor.tsx b/src/views/QueryEditor/QueryEditor.tsx
@@ -29,12 +29,12 @@ export function QueryEditor(props: QueryEditorProps<CHDataSource, CHQuery, CHDat
   const areAdHocFiltersAvailable = !!adHocFilters.length;
 
   useEffect(() => {
-    if (adHocFilters.length > 0 && initializedQuery.format === 'logs') {
+    if (props.app !== 'explore') {
       onChange({ ...initializedQuery, adHocFilters: adHocFilters });
     }
 
     // eslint-disable-next-line
-  }, [adHocFilters.length, initializedQuery.format]);
+  }, [props.app, adHocFilters.length]);
 
   return (
     <>

diff --git a/src/views/QueryEditor/hooks/useFormattedData.ts b/src/views/QueryEditor/hooks/useFormattedData.ts
@@ -15,9 +15,7 @@ export const useFormattedData = (query: CHQuery, datasource: CHDataSource): [str
     try {
       if (datasource.options && datasource.templateSrv) {
         const queryModel = new SqlQuery(query, datasource.templateSrv, datasource.options);
-        // @ts-ignore
-        const adHocFilters = datasource.templateSrv.getAdhocFilters(datasource.name);
-        const replaced = queryModel.replace(datasource.options, adHocFilters);
+        const replaced = queryModel.replace(datasource.options, query.adHocFilters);
         setFormattedData(replaced);
         setError(null);
       }