IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: minor code cleanups

Browse Source
This commit is contained in:
Matias Chomicki 2022-09-20 12:13:32 +02:00
parent c3a62ac72d
commit 35d2c3b7ed
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.betterer.results
View File

@ -6869,8 +6869,7 @@ exports[`better eslint`] = {
], ],
"public/app/plugins/datasource/loki/components/LokiQueryField.tsx:5381": [ "public/app/plugins/datasource/loki/components/LokiQueryField.tsx:5381": [
[0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "0"],
[0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "1"]
[0, 0, 0, "Do not use any type assertions.", "2"]
], ],
"public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx:5381": [ "public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx:5381": [
[0, 0, 0, "Unexpected any. Specify a different type.", "0"] [0, 0, 0, "Unexpected any. Specify a different type.", "0"]

8
public/app/plugins/datasource/loki/components/LokiQueryField.tsx
View File

@ -189,9 +189,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
} = this.props; } = this.props;
const { labelsLoaded, labelBrowserVisible } = this.state; const { labelsLoaded, labelBrowserVisible } = this.state;
const lokiLanguageProvider = datasource.languageProvider as LokiLanguageProvider; const hasLogLabels = datasource.languageProvider.getLabelKeys().length > 0;
const cleanText = datasource.languageProvider ? lokiLanguageProvider.cleanText : undefined;
const hasLogLabels = lokiLanguageProvider.getLabelKeys().length > 0;
const chooserText = getChooserText(labelsLoaded, hasLogLabels); const chooserText = getChooserText(labelsLoaded, hasLogLabels);
const buttonDisabled = !(labelsLoaded && hasLogLabels); const buttonDisabled = !(labelsLoaded && hasLogLabels);
@ -225,7 +223,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
) : ( ) : (
<QueryField <QueryField
additionalPlugins={this.plugins} additionalPlugins={this.plugins}
cleanText={cleanText} cleanText={datasource.languageProvider.cleanText}
query={query.expr} query={query.expr}
onTypeahead={this.onTypeahead} onTypeahead={this.onTypeahead}
onWillApplySuggestion={willApplySuggestion} onWillApplySuggestion={willApplySuggestion}
@ -241,7 +239,7 @@ export class LokiQueryField extends React.PureComponent<LokiQueryFieldProps, Lok
{labelBrowserVisible && ( {labelBrowserVisible && (
<div className="gf-form"> <div className="gf-form">
<LokiLabelBrowser <LokiLabelBrowser
languageProvider={lokiLanguageProvider} languageProvider={datasource.languageProvider}
onChange={this.onChangeLabelBrowser} onChange={this.onChangeLabelBrowser}
lastUsedLabels={lastUsedLabels || []} lastUsedLabels={lastUsedLabels || []}
storeLastUsedLabels={onLastUsedLabelsSave} storeLastUsedLabels={onLastUsedLabelsSave}

9
public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
View File

@ -76,11 +76,10 @@ const getStyles = (theme: GrafanaTheme2) => {
}; };
}; };
const MonacoQueryField = (props: Props) => { const MonacoQueryField = ({ languageProvider, history, onBlur, onRunQuery, initialValue }: Props) => {
// we need only one instance of `overrideServices` during the lifetime of the react component // we need only one instance of `overrideServices` during the lifetime of the react component
const overrideServicesRef = useRef(getOverrideServices()); const overrideServicesRef = useRef(getOverrideServices());
const containerRef = useRef<HTMLDivElement>(null); const containerRef = useRef<HTMLDivElement>(null);
const { languageProvider, history, onBlur, onRunQuery, initialValue } = props;
const langProviderRef = useLatest(languageProvider); const langProviderRef = useLatest(languageProvider);
const historyRef = useLatest(history); const historyRef = useLatest(history);
@ -194,9 +193,5 @@ const MonacoQueryField = (props: Props) => {
); );
}; };
// we will lazy-load this module using React.lazy, // Default export for lazy load.
// and that only supports default-exports,
// so we have to default-export this, even if
// it is against the style-guidelines.
export default MonacoQueryField; export default MonacoQueryField;