From 21021502b5577eef6f84617d4f2ddd9c3c98d61a Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Fri, 2 Jun 2023 13:26:20 +0200
Subject: [PATCH] Loki: Remove unused datasource prop from
 LokiQueryBuilderOptions (#69445)

Loki: Remove unused props from LokiQueryBuilderOptions
---
 .../datasource/loki/components/LokiQueryEditor.tsx     |  1 -
 .../components/LokiQueryBuilderOptions.test.tsx        |  2 --
 .../components/LokiQueryBuilderOptions.tsx             | 10 ++++------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index ad57e77ad55..9e3a407178e 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -203,7 +203,6 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
           onRunQuery={onRunQuery}
           app={app}
           maxLines={datasource.maxLines}
-          datasource={datasource}
           queryStats={queryStats}
         />
       </EditorRows>
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx
index 248154444df..6b7657ce59b 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx
@@ -2,7 +2,6 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { createLokiDatasource } from '../../mocks';
 import { LokiQuery, LokiQueryType } from '../../types';
 
 import { LokiQueryBuilderOptions } from './LokiQueryBuilderOptions';
@@ -48,7 +47,6 @@ function setup(queryOverrides: Partial<LokiQuery> = {}) {
     onRunQuery: jest.fn(),
     onChange: jest.fn(),
     maxLines: 20,
-    datasource: createLokiDatasource(),
     queryStats: { streams: 0, chunks: 0, bytes: 0, entries: 0 },
   };
 
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
index 83874e9d541..508d0788d4b 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
@@ -7,7 +7,6 @@ import { AutoSizeInput, RadioButtonGroup, Select } from '@grafana/ui';
 import { QueryOptionGroup } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryOptionGroup';
 
 import { preprocessMaxLines, queryTypeOptions, RESOLUTION_OPTIONS } from '../../components/LokiOptionFields';
-import { LokiDatasource } from '../../datasource';
 import { isLogsQuery } from '../../queryUtils';
 import { LokiQuery, LokiQueryType, QueryStats } from '../../types';
 
@@ -17,13 +16,12 @@ export interface Props {
   onRunQuery: () => void;
   maxLines: number;
   app?: CoreApp;
-  datasource: LokiDatasource;
   queryStats: QueryStats | null;
 }
 
 export const LokiQueryBuilderOptions = React.memo<Props>(
-  ({ app, query, onChange, onRunQuery, maxLines, datasource, queryStats }) => {
-    const [splitDurationValid, setsplitDurationValid] = useState(true);
+  ({ app, query, onChange, onRunQuery, maxLines, queryStats }) => {
+    const [splitDurationValid, setSplitDurationValid] = useState(true);
 
     const onQueryTypeChange = (value: LokiQueryType) => {
       onChange({ ...query, queryType: value });
@@ -42,10 +40,10 @@ export const LokiQueryBuilderOptions = React.memo<Props>(
     const onChunkRangeChange = (evt: React.FormEvent<HTMLInputElement>) => {
       const value = evt.currentTarget.value;
       if (!isValidDuration(value)) {
-        setsplitDurationValid(false);
+        setSplitDurationValid(false);
         return;
       }
-      setsplitDurationValid(true);
+      setSplitDurationValid(true);
       onChange({ ...query, splitDuration: value });
       onRunQuery();
     };