Merge pull request #91 from quickwit-oss/ddelemeny/refactor-datasourc…

…e-mixins

Refactor datasource features as mixins

src/LanguageProvider.ts

@@ -1,14 +1,14 @@
 import { AbstractLabelOperator, AbstractLabelMatcher, LanguageProvider, AbstractQuery } from '@grafana/data';
 
-import { ElasticDatasource } from './datasource';
+import { BaseQuickwitDataSource } from '@/datasource/base';
 import { ElasticsearchQuery } from './types';
 
 export default class ElasticsearchLanguageProvider extends LanguageProvider {
   declare request: (url: string, params?: any) => Promise<any>;
   declare start: () => Promise<any[]>;
-  datasource: ElasticDatasource;
+  datasource: BaseQuickwitDataSource;
 
-  constructor(datasource: ElasticDatasource, initialValues?: any) {
+  constructor(datasource: BaseQuickwitDataSource, initialValues?: any) {
     super();
     this.datasource = datasource;
 

src/LogContext/LogContextProvider.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
-import { lastValueFrom } from 'rxjs';
-import { QuickwitDataSource } from 'datasource';
-import { catchError } from 'rxjs/operators';
+import { lastValueFrom, catchError } from 'rxjs';
+
+import { BaseQuickwitDataSource } from '@/datasource/base';
 
 import {
   CoreApp,
@@ -43,10 +43,10 @@ function createContextTimeRange(rowTimeEpochMs: number, direction: string) {
 }
 
 export class LogContextProvider {
-  datasource: QuickwitDataSource;
+  datasource: BaseQuickwitDataSource;
   contextQuery: string | null;
 
-  constructor(datasource: QuickwitDataSource) {
+  constructor(datasource: BaseQuickwitDataSource) {
     this.datasource = datasource;
     this.contextQuery = null;
   }

src/LogContext/components/LogContextUI.tsx

@@ -8,7 +8,7 @@ import { Button } from "@grafana/ui";
 import { useQueryBuilder } from '@/QueryBuilder/lucene';
 import { LogContextQueryBuilderSidebar } from "./LogContextQueryBuilderSidebar";
 import { DatasourceContext } from "@/components/QueryEditor/ElasticsearchQueryContext";
-import { QuickwitDataSource } from "@/datasource";
+import { BaseQuickwitDataSource } from "@/datasource/base";
 import { useDatasourceFields } from "@/datasource/utils";
 import { Field, FieldContingency, Filter } from "../types";
 
@@ -42,7 +42,7 @@ export interface LogContextProps {
   origQuery?: DataQuery
 }
 export interface LogContextUIProps extends LogContextProps {
-  datasource: QuickwitDataSource,
+  datasource: BaseQuickwitDataSource,
   updateQuery: (query: string) => void
 }
 

src/components/QueryEditor/ElasticsearchQueryContext.tsx

@@ -2,7 +2,7 @@ import React, { createContext, PropsWithChildren, useCallback, useEffect, useSta
 
 import { CoreApp, TimeRange } from '@grafana/data';
 
-import { ElasticDatasource } from '@/datasource';
+import { BaseQuickwitDataSource } from '@/datasource/base';
 import { combineReducers, useStatelessReducer, DispatchContext } from '@/hooks/useStatelessReducer';
 import { ElasticsearchQuery } from '@/types';
 
@@ -17,15 +17,15 @@ export const useRange = getHook(RangeContext);
 export const QueryContext = createContext<ElasticsearchQuery | undefined>(undefined);
 export const useQuery = getHook(QueryContext);
 
-export const DatasourceContext = createContext<ElasticDatasource | undefined>(undefined);
+export const DatasourceContext = createContext<BaseQuickwitDataSource | undefined>(undefined);
 export const useDatasource = getHook(DatasourceContext);
 
 interface Props {
   query: ElasticsearchQuery;
   app: CoreApp;
   onChange: (query: ElasticsearchQuery) => void;
   onRunQuery: () => void;
-  datasource: ElasticDatasource;
+  datasource: BaseQuickwitDataSource;
   range: TimeRange;
 }