Skip to content

Commit 3553f9e

Browse files
Fix linting issues
1 parent dd7d891 commit 3553f9e

File tree

4 files changed

+28
-21
lines changed

4 files changed

+28
-21
lines changed

src/components/configEditor/HttpHeadersConfig.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ export const HttpHeadersConfig = (props: HttpHeadersConfigProps) => {
103103
/>
104104
</Field>
105105
{logHeadersAsComment && (
106-
<Field
107-
label={labels.logHeadersAsCommentRegex.label}
108-
description={labels.logHeadersAsCommentRegex.tooltip}
109-
>
106+
<Field label={labels.logHeadersAsCommentRegex.label} description={labels.logHeadersAsCommentRegex.tooltip}>
110107
<Input
111108
data-testid={selectors.logHeadersAsCommentRegexInput}
112109
value={logHeadersAsCommentRegex}

src/views/CHConfigEditor.tsx

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ export const ConfigEditor: React.FC<ConfigEditorProps> = (props) => {
7171
const onSwitchToggle = (
7272
key: keyof Pick<
7373
CHConfig,
74-
'secure' | 'validateSql' | 'enableSecureSocksProxy' | 'forwardGrafanaHeaders' | 'logHeadersAsComment' | 'enableRowLimit'
74+
| 'secure'
75+
| 'validateSql'
76+
| 'enableSecureSocksProxy'
77+
| 'forwardGrafanaHeaders'
78+
| 'logHeadersAsComment'
79+
| 'enableRowLimit'
7580
>,
7681
value: boolean
7782
) => {
@@ -181,15 +186,15 @@ export const ConfigEditor: React.FC<ConfigEditorProps> = (props) => {
181186

182187
const hasAdditionalSettings = Boolean(
183188
window.location.hash || // if trying to link to section on page, open all settings (React breaks this?)
184-
options.jsonData.defaultDatabase ||
185-
options.jsonData.defaultTable ||
186-
options.jsonData.dialTimeout ||
187-
options.jsonData.queryTimeout ||
188-
options.jsonData.validateSql ||
189-
options.jsonData.enableSecureSocksProxy ||
190-
options.jsonData.customSettings ||
191-
options.jsonData.logs ||
192-
options.jsonData.traces
189+
options.jsonData.defaultDatabase ||
190+
options.jsonData.defaultTable ||
191+
options.jsonData.dialTimeout ||
192+
options.jsonData.queryTimeout ||
193+
options.jsonData.validateSql ||
194+
options.jsonData.enableSecureSocksProxy ||
195+
options.jsonData.customSettings ||
196+
options.jsonData.logs ||
197+
options.jsonData.traces
193198
);
194199

195200
const defaultPort = jsonData.secure

src/views/config-v2/HttpHeadersConfigV2.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ describe('HttpHeadersConfigV2', () => {
133133
it('should call onLogHeadersAsCommentRegexChange when input is changed', () => {
134134
renderWith({ logHeadersAsComment: true, logHeadersAsCommentRegex: '' });
135135

136-
const logHeadersAsCommentRegexInput = screen.getByTestId(selectors.components.Config.HttpHeaderConfig.logHeadersAsCommentRegexInput);
136+
const logHeadersAsCommentRegexInput = screen.getByTestId(
137+
selectors.components.Config.HttpHeaderConfig.logHeadersAsCommentRegexInput
138+
);
137139
expect(logHeadersAsCommentRegexInput).toBeInTheDocument();
138140
fireEvent.change(logHeadersAsCommentRegexInput, { target: { value: 'test' } });
139141
expect(onOptionsChangeMock).toHaveBeenCalledTimes(1);

src/views/config-v2/HttpHeadersConfigV2.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import { CHConfig, CHHttpHeader, CHSecureConfig } from 'types/config';
44
import allLabels from './labelsV2';
55
import { styles } from 'styles';
66
import { selectors as allSelectors } from 'selectors';
7-
import { DataSourcePluginOptionsEditorProps, KeyValue, onUpdateDatasourceJsonDataOptionChecked, onUpdateDatasourceJsonDataOption } from '@grafana/data';
7+
import {
8+
DataSourcePluginOptionsEditorProps,
9+
KeyValue,
10+
onUpdateDatasourceJsonDataOptionChecked,
11+
onUpdateDatasourceJsonDataOption,
12+
} from '@grafana/data';
813

914
interface HttpHeadersConfigProps extends DataSourcePluginOptionsEditorProps<CHConfig, CHSecureConfig> {
1015
headers?: CHHttpHeader[];
@@ -22,7 +27,8 @@ export const HttpHeadersConfigV2 = (props: HttpHeadersConfigProps) => {
2227
const [forwardGrafanaHeaders, setForwardGrafanaHeaders] = useState<boolean>(props.forwardGrafanaHeaders || false);
2328
const [logHeadersAsComment, setLogHeadersAsComment] = useState<boolean>(props.logHeadersAsComment || false);
2429
const [logHeadersAsCommentRegex, setLogHeadersAsCommentRegex] = useState<string>(
25-
props.options.jsonData.logHeadersAsCommentRegex || allLabels.components.Config.HttpHeadersConfig.logHeadersAsCommentRegex.placeholder
30+
props.options.jsonData.logHeadersAsCommentRegex ||
31+
allLabels.components.Config.HttpHeadersConfig.logHeadersAsCommentRegex.placeholder
2632
);
2733
const labels = allLabels.components.Config.HttpHeadersConfig;
2834
const selectors = allSelectors.components.Config.HttpHeaderConfig;
@@ -101,10 +107,7 @@ export const HttpHeadersConfigV2 = (props: HttpHeadersConfigProps) => {
101107
/>
102108

103109
{logHeadersAsComment && (
104-
<Field
105-
label={labels.logHeadersAsCommentRegex.label}
106-
description={labels.logHeadersAsCommentRegex.tooltip}
107-
>
110+
<Field label={labels.logHeadersAsCommentRegex.label} description={labels.logHeadersAsCommentRegex.tooltip}>
108111
<Input
109112
data-testid={selectors.logHeadersAsCommentRegexInput}
110113
value={logHeadersAsCommentRegex}

0 commit comments

Comments
 (0)