Add context window to default values

src/datasource/datasource.ts

@@ -74,6 +74,7 @@ export class CHDataSource
           defaultDateDate32: instanceSettings.jsonData.defaultDateDate32,
         },
         defaultDateTimeType: instanceSettings.jsonData.defaultDateTimeType,
+        contextWindowSize: instanceSettings.jsonData.contextWindowSize,
       };
     }
 

src/types/types.ts

@@ -42,7 +42,7 @@ export interface CHQuery extends DataQuery {
   intervalFactor?: number;
   interval?: string;
   formattedQuery?: string;
-  contextWindowSize?: number;
+  contextWindowSize?: string;
   adHocValuesQuery?: string;
 }
 
@@ -66,6 +66,7 @@ export interface CHDataSourceOptions extends DataSourceJsonData {
   defaultDateDate32?: string;
   defaultDateTimeType?: string;
   adHocValuesQuery: string;
+  contextWindowSize?: string;
 }
 
 /**

src/views/ConfigEditor/ConfigEditor.tsx

@@ -6,8 +6,8 @@ import _ from 'lodash';
 import { DefaultValues } from './FormParts/DefaultValues/DefaultValues';
 import { LANGUAGE_ID } from '../QueryEditor/components/QueryTextEditor/editor/initiateEditor';
 import { MONACO_EDITOR_OPTIONS } from '../constants';
-import {COMPRESSION_TYPE_OPTIONS} from "./constants";
-import {DEFAULT_VALUES_QUERY} from "../../datasource/adhoc";
+import { COMPRESSION_TYPE_OPTIONS } from './constants';
+import { DEFAULT_VALUES_QUERY } from '../../datasource/adhoc';
 
 export interface CHSecureJsonData {
   password?: string;

src/views/ConfigEditor/FormParts/DefaultValues/DefaultValues.tsx

@@ -13,12 +13,7 @@ interface DefaultValuesInterface {
   onFieldChange: any;
 }
 
-export const DefaultValues = ({
-  jsonData,
-  newOptions,
-  onSwitchToggle,
-  onFieldChange,
-}: DefaultValuesInterface) => {
+export const DefaultValues = ({ jsonData, newOptions, onSwitchToggle, onFieldChange }: DefaultValuesInterface) => {
   const [defaultDateTime64Options, setDefaultDateTime64Options] = useState<any[]>([]);
   const [defaultDateTimeOptions, setDefaultDateTimeOptions] = useState<any[]>([]);
   const [defaultUint32Options, setDefaultUint32Options] = useState<any[]>([]);
@@ -242,6 +237,18 @@ export const DefaultValues = ({
               options={defaultDateDate32Options}
             />
           </InlineField>
+          <h6>Logs settings</h6>
+          <InlineField label="Context window" labelWidth={32} style={{ marginLeft: '30px' }}>
+            <Select
+              width={24}
+              data-testid="context-window-size-select"
+              onChange={(changeEvent) => {
+                onFieldChange({ value: changeEvent ? changeEvent.value : undefined }, 'contextWindowSize');
+              }}
+              options={['10', '20', '50', '100'].map((value) => ({ label: value + ' entries', value }))}
+              value={jsonData.contextWindowSize}
+            />
+          </InlineField>
         </>
       )}
     </div>

src/views/ConfigEditor/constants.ts

@@ -3,4 +3,4 @@ export const COMPRESSION_TYPE_OPTIONS = [
   { label: 'br', value: 'br' },
   { label: 'deflate', value: 'deflate' },
   { label: 'zstd', value: 'zstd' },
-]
+];

src/views/QueryEditor/QueryEditor.tsx

@@ -10,7 +10,7 @@ import { useQueryState } from './hooks/useQueryState';
 import { useFormattedData } from './hooks/useFormattedData';
 import { initializeQueryDefaults } from './helpers/initializeQueryDefaults';
 import './QueryEditor.css';
-import {getAdhocFilters} from "./helpers/getAdHocFilters";
+import { getAdhocFilters } from './helpers/getAdHocFilters';
 
 export function QueryEditor(props: QueryEditorProps<CHDataSource, CHQuery, CHDataSourceOptions>) {
   const { datasource, query, onChange, onRunQuery } = props;
@@ -23,11 +23,11 @@ export function QueryEditor(props: QueryEditorProps<CHDataSource, CHQuery, CHDat
   const onSqlChange = (sql: string) => onChange({ ...initializedQuery, query: sql });
   const onFieldChange = (field: any) => onChange({ ...initializedQuery, [field.fieldName]: field.value });
   const onTriggerQuery = () => onRunQuery();
-  
+
   // @ts-ignore
-  const adHocFilters = getAdhocFilters(datasource?.name, query.datasource?.uid)
+  const adHocFilters = getAdhocFilters(datasource?.name, query.datasource?.uid);
   // @ts-ignore
-  const adHocFiltersKey = adHocFilters.map(({key,operator,value }) => `${key}${operator}${value}`).join(',');
+  const adHocFiltersKey = adHocFilters.map(({ key, operator, value }) => `${key}${operator}${value}`).join(',');
   const areAdHocFiltersAvailable = !!adHocFilters.length;
 
   useEffect(() => {

src/views/QueryEditor/components/QueryHeader/QueryHeader.constants.ts

@@ -1,6 +1,6 @@
-import {SelectableValue} from "@grafana/data";
-import {EditorMode} from "../../../../types/types";
-import {E2ESelectors} from "@grafana/e2e-selectors";
+import { SelectableValue } from '@grafana/data';
+import { EditorMode } from '../../../../types/types';
+import { E2ESelectors } from '@grafana/e2e-selectors';
 
 const Components = {
   QueryEditor: {

src/views/QueryEditor/components/QueryHeader/QueryHeader.types.ts

@@ -1,5 +1,5 @@
-import {CHQuery, EditorMode} from "../../../../types/types";
-import {CHDataSource} from "../../../../datasource/datasource";
+import { CHQuery, EditorMode } from '../../../../types/types';
+import { CHDataSource } from '../../../../datasource/datasource';
 
 export interface QueryHeaderProps {
   isAnnotationView: boolean;

src/views/QueryEditor/components/QueryHeader/helpers/findDifferences.ts

@@ -1,5 +1,5 @@
-import {CHQuery, TimestampFormat} from "../../../../../types/types";
-import {CHDataSource} from "../../../../../datasource/datasource";
+import { CHQuery, TimestampFormat } from '../../../../../types/types';
+import { CHDataSource } from '../../../../../datasource/datasource';
 
 export function findDifferences(query: CHQuery, datasource: CHDataSource) {
   const { defaultValues } = datasource;
@@ -74,6 +74,15 @@ export function findDifferences(query: CHQuery, datasource: CHDataSource) {
         fieldName: 'dateColDataType',
       });
     }
+
+    if (query.contextWindowSize !== defaultValues.contextWindowSize) {
+      differences.push({
+        key: 'Logs context window size',
+        original: checkValue(query.contextWindowSize),
+        updated: defaultValues.contextWindowSize,
+        fieldName: 'contextWindowSize',
+      });
+    }
   }
 
   return differences;

src/views/QueryEditor/components/QueryTextEditor/QueryTextEditor.tsx

@@ -78,12 +78,7 @@ export const QueryTextEditor = ({
 
   return (
     <>
-      <SQLCodeEditor
-        datasource={datasource}
-        onSqlChange={onSqlChange}
-        query={query}
-        onRunQuery={onRunQuery}
-      />
+      <SQLCodeEditor datasource={datasource} onSqlChange={onSqlChange} query={query} onRunQuery={onRunQuery} />
       {!areAdHocFiltersAvailable && adhocFilters.length > 0 && (
         <TagsInput
           className={'adhoc-filters-tags'}
@@ -154,7 +149,7 @@ export const QueryTextEditor = ({
                 width={'auto'}
                 data-testid="context-window-size-select"
                 onChange={(e) => handleContextWindowChange(e.value)}
-                options={[10, 20, 50, 100].map((value) => ({ label: value + ' entries', value }))}
+                options={['10', '20', '50', '100'].map((value) => ({ label: value + ' entries', value }))}
                 value={query.contextWindowSize}
               />
             </InlineField>

src/views/QueryEditor/helpers/getAdHocFilters.ts

@@ -1,9 +1,11 @@
-import {getTemplateSrv} from "@grafana/runtime";
-import {AdHocVariableModel} from "@grafana/data";
+import { getTemplateSrv } from '@grafana/runtime';
+import { AdHocVariableModel } from '@grafana/data';
 
 export const getAdhocFilters = (datasourceName, datasourceUid: any) => {
-  const templateSrv= getTemplateSrv()
-  const adhocVariables: any[] = templateSrv.getVariables().filter(variable => variable.type === 'adhoc') as AdHocVariableModel[];
+  const templateSrv = getTemplateSrv();
+  const adhocVariables: any[] = templateSrv
+    .getVariables()
+    .filter((variable) => variable.type === 'adhoc') as AdHocVariableModel[];
   let filters: AdHocVariableModel[] = [];
   // ts-ignore
   for (const variable of adhocVariables) {
@@ -14,5 +16,5 @@ export const getAdhocFilters = (datasourceName, datasourceUid: any) => {
     }
   }
 
-  return filters
-}
+  return filters;
+};

src/views/QueryEditor/helpers/initializeQueryDefaults.ts

@@ -21,7 +21,7 @@ export const initializeQueryDefaults = (
     query: query.query || defaultQuery,
     formattedQuery: query.formattedQuery || query.query,
     editorMode: query.database && query.table ? EditorMode.SQL : EditorMode.Builder,
-    contextWindowSize: query.contextWindowSize || 10,
+    contextWindowSize: query.contextWindowSize || '10',
     adHocValuesQuery: query.adHocValuesQuery || '',
   };
 
@@ -58,6 +58,10 @@ export const initializeQueryDefaults = (
       initializedQuery.dateTimeColDataType = datasource.defaultValues.dateTime.defaultUint32;
     }
 
+    if (datasource.defaultValues.contextWindowSize && !query.contextWindowSize) {
+      initializedQuery.contextWindowSize = datasource.defaultValues.contextWindowSize;
+    }
+
     onChange({ ...query, ...initializedQuery, initialized: true });
   }
 

src/views/constants.ts

@@ -6,7 +6,6 @@ export const DEFAULT_DATE_TIME_TYPE = TimestampFormat.DateTime;
 export const DEFAULT_ROUND = '0s';
 export const DEFAULT_INTERVAL_FACTOR = 1;
 
-
 export const MONACO_EDITOR_OPTIONS: any = {
   scrollBeyondLastLine: false,
   wordWrap: 'on',