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

Fix Influxdb language order in config page (#76488)

Browse Source 
Fix wrong language display
This commit is contained in:
ismail simsek 2023-10-12 20:16:31 +02:00 committed by GitHub
parent 2442532f57
commit be7fe761a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
View File

@ -6,7 +6,6 @@ import {
DataSourceSettings, DataSourceSettings,
SelectableValue, SelectableValue,
updateDatasourcePluginJsonDataOption, updateDatasourcePluginJsonDataOption,
updateDatasourcePluginResetOption,
} from '@grafana/data/src'; } from '@grafana/data/src';
import { Alert, DataSourceHttpSettings, InlineField, Select, Field, Input, FieldSet } from '@grafana/ui/src'; import { Alert, DataSourceHttpSettings, InlineField, Select, Field, Input, FieldSet } from '@grafana/ui/src';
import { config } from 'app/core/config'; import { config } from 'app/core/config';
@ -18,27 +17,33 @@ import { InfluxFluxConfig } from './InfluxFluxConfig';
import { InfluxInfluxQLConfig } from './InfluxInfluxQLConfig'; import { InfluxInfluxQLConfig } from './InfluxInfluxQLConfig';
import { InfluxSqlConfig } from './InfluxSQLConfig'; import { InfluxSqlConfig } from './InfluxSQLConfig';
const versions: Array<SelectableValue<InfluxVersion>> = [ const versionMap: Record<InfluxVersion, SelectableValue<InfluxVersion>> = {
{ [InfluxVersion.InfluxQL]: {
label: 'InfluxQL', label: 'InfluxQL',
value: InfluxVersion.InfluxQL, value: InfluxVersion.InfluxQL,
description: 'The InfluxDB SQL-like query language.', description: 'The InfluxDB SQL-like query language.',
}, },
{ [InfluxVersion.SQL]: {
label: 'Flux',
value: InfluxVersion.Flux,
description: 'Supported in InfluxDB 2.x and 1.8+',
},
];
const versionsWithSQL: Array<SelectableValue<InfluxVersion>> = [
{ ...versions[0] },
{
label: 'SQL', label: 'SQL',
value: InfluxVersion.SQL, value: InfluxVersion.SQL,
description: 'Native SQL language. Supported in InfluxDB 3.0', description: 'Native SQL language. Supported in InfluxDB 3.0',
}, },
{ ...versions[1] }, [InfluxVersion.Flux]: {
label: 'Flux',
value: InfluxVersion.Flux,
description: 'Supported in InfluxDB 2.x and 1.8+',
},
};
const versions: Array<SelectableValue<InfluxVersion>> = [
versionMap[InfluxVersion.InfluxQL],
versionMap[InfluxVersion.Flux],
];
const versionsWithSQL: Array<SelectableValue<InfluxVersion>> = [
versionMap[InfluxVersion.InfluxQL],
versionMap[InfluxVersion.SQL],
versionMap[InfluxVersion.Flux],
]; ];
export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions>; export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions>;
@ -64,16 +69,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
SQL: 'Support for SQL in Grafana is currently in alpha', SQL: 'Support for SQL in Grafana is currently in alpha',
}; };
// 1x
onResetPassword = () => {
updateDatasourcePluginResetOption(this.props, 'password');
};
// 2x
onResetToken = () => {
updateDatasourcePluginResetOption(this.props, 'token');
};
onVersionChanged = (selected: SelectableValue<InfluxVersion>) => { onVersionChanged = (selected: SelectableValue<InfluxVersion>) => {
const { options, onOptionsChange } = this.props; const { options, onOptionsChange } = this.props;
@ -98,19 +93,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
} }
}; };
getQueryLanguageDropdownValue = (v?: InfluxVersion) => {
switch (v) {
case InfluxVersion.InfluxQL:
return versionsWithSQL[0];
case InfluxVersion.Flux:
return versionsWithSQL[1];
case InfluxVersion.SQL:
return versionsWithSQL[2];
default:
return versionsWithSQL[0];
}
};
renderJsonDataOptions() { renderJsonDataOptions() {
switch (this.props.options.jsonData.version) { switch (this.props.options.jsonData.version) {
case InfluxVersion.InfluxQL: case InfluxVersion.InfluxQL:
@ -136,9 +118,9 @@ export class ConfigEditor extends PureComponent<Props, State> {
<Select <Select
aria-label="Query language" aria-label="Query language"
className="width-30" className="width-30"
value={this.getQueryLanguageDropdownValue(options.jsonData.version)} value={versionMap[options.jsonData.version ?? InfluxVersion.InfluxQL]}
options={config.featureToggles.influxdbSqlSupport ? versionsWithSQL : versions} options={config.featureToggles.influxdbSqlSupport ? versionsWithSQL : versions}
defaultValue={versions[0]} defaultValue={versionMap[InfluxVersion.InfluxQL]}
onChange={this.onVersionChanged} onChange={this.onVersionChanged}
/> />
</Field> </Field>