[Backend] Merge 'master' changes into the backend #875
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| module.exports = { | ||
| "presets": [ | ||
| [ "@babel/preset-env", { "targets": { "node": "current" } } ], | ||
| "@babel/react" | ||
| ], | ||
| "retainLines": true | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,7 +47,7 @@ angular | |
| } | ||
|
|
||
| $scope.$apply(function() { | ||
| $scope.ctrl.addFunction(funcDef); | ||
| }); | ||
|
|
||
| $input.trigger('blur'); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| import React, { PureComponent } from 'react'; | ||
| import { parseLegacyVariableQuery } from '../utils'; | ||
| import { Select, Input, AsyncSelect, FormLabel } from '@grafana/ui'; | ||
| import { SelectableValue } from '@grafana/data'; | ||
| import { VariableQuery, VariableQueryTypes, VariableQueryProps, VariableQueryData } from '../types'; | ||
| import { ZabbixInput } from './ZabbixInput'; | ||
|
|
||
| export class ZabbixVariableQueryEditor extends PureComponent<VariableQueryProps, VariableQueryData> { | ||
| queryTypes: Array<SelectableValue<VariableQueryTypes>> = [ | ||
| { value: VariableQueryTypes.Group, label: 'Group'}, | ||
| { value: VariableQueryTypes.Host, label: 'Host' }, | ||
| { value: VariableQueryTypes.Application, label: 'Application' }, | ||
| { value: VariableQueryTypes.Item, label: 'Item' }, | ||
| ]; | ||
|
|
||
| defaults: VariableQueryData = { | ||
| selectedQueryType: { value: VariableQueryTypes.Group, label: 'Group' }, | ||
| queryType: VariableQueryTypes.Group, | ||
| group: '/.*/', | ||
| host: '', | ||
| application: '', | ||
| item: '', | ||
| }; | ||
|
|
||
| constructor(props: VariableQueryProps) { | ||
| super(props); | ||
|
|
||
| if (this.props.query && typeof this.props.query === 'string') { | ||
| // Backward compatibility | ||
| const query = parseLegacyVariableQuery(this.props.query); | ||
| const selectedQueryType = this.getSelectedQueryType(query.queryType); | ||
| this.state = { | ||
| selectedQueryType, | ||
| legacyQuery: this.props.query, | ||
| ...query | ||
| }; | ||
| } else if (this.props.query) { | ||
| const query = (this.props.query as VariableQuery); | ||
| const selectedQueryType = this.getSelectedQueryType(query.queryType); | ||
| this.state = { | ||
| ...this.defaults, | ||
| ...query, | ||
| selectedQueryType, | ||
| }; | ||
| } else { | ||
| this.state = this.defaults; | ||
| } | ||
| } | ||
|
|
||
| getSelectedQueryType(queryType: VariableQueryTypes) { | ||
| return this.queryTypes.find(q => q.value === queryType); | ||
| } | ||
|
|
||
| handleQueryUpdate = (evt: React.ChangeEvent<HTMLInputElement>, prop: string) => { | ||
| const value = evt.currentTarget.value; | ||
| this.setState((prevState: VariableQueryData) => { | ||
| const newQuery = { | ||
| ...prevState, | ||
| }; | ||
| newQuery[prop] = value; | ||
|
|
||
| return { | ||
| ...newQuery, | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| handleQueryChange = () => { | ||
| const { queryType, group, host, application, item } = this.state; | ||
| const queryModel = { queryType, group, host, application, item }; | ||
| this.props.onChange(queryModel, `Zabbix - ${queryType}`); | ||
| } | ||
|
|
||
| handleQueryTypeChange = (selectedItem: SelectableValue<VariableQueryTypes>) => { | ||
| this.setState({ | ||
| ...this.state, | ||
| selectedQueryType: selectedItem, | ||
| queryType: selectedItem.value, | ||
| }); | ||
|
|
||
| const { group, host, application, item } = this.state; | ||
| const queryType = selectedItem.value; | ||
| const queryModel = { queryType, group, host, application, item }; | ||
| this.props.onChange(queryModel, `Zabbix - ${queryType}`); | ||
| } | ||
|
|
||
| render() { | ||
| const { selectedQueryType, legacyQuery, group, host, application, item } = this.state; | ||
|
|
||
| return ( | ||
| <> | ||
| <div className="gf-form max-width-21"> | ||
| <FormLabel width={10}>Query Type</FormLabel> | ||
| <Select | ||
| width={11} | ||
| value={selectedQueryType} | ||
| options={this.queryTypes} | ||
| onChange={this.handleQueryTypeChange} | ||
| /> | ||
| </div> | ||
| <div className="gf-form-inline"> | ||
| <div className="gf-form max-width-30"> | ||
| <FormLabel width={10}>Group</FormLabel> | ||
| <ZabbixInput | ||
| value={group} | ||
| onChange={evt => this.handleQueryUpdate(evt, 'group')} | ||
| onBlur={this.handleQueryChange} | ||
| /> | ||
| </div> | ||
| {selectedQueryType.value !== VariableQueryTypes.Group && | ||
| <div className="gf-form max-width-30"> | ||
| <FormLabel width={10}>Host</FormLabel> | ||
| <ZabbixInput | ||
| value={host} | ||
| onChange={evt => this.handleQueryUpdate(evt, 'host')} | ||
| onBlur={this.handleQueryChange} | ||
| /> | ||
| </div> | ||
| } | ||
| </div> | ||
| {(selectedQueryType.value === VariableQueryTypes.Application || | ||
| selectedQueryType.value === VariableQueryTypes.Item) && | ||
| <div className="gf-form-inline"> | ||
| <div className="gf-form max-width-30"> | ||
| <FormLabel width={10}>Application</FormLabel> | ||
| <ZabbixInput | ||
| value={application} | ||
| onChange={evt => this.handleQueryUpdate(evt, 'application')} | ||
| onBlur={this.handleQueryChange} | ||
| /> | ||
| </div> | ||
| {selectedQueryType.value === VariableQueryTypes.Item && | ||
| <div className="gf-form max-width-30"> | ||
| <FormLabel width={10}>Item</FormLabel> | ||
| <ZabbixInput | ||
| value={item} | ||
| onChange={evt => this.handleQueryUpdate(evt, 'item')} | ||
| onBlur={this.handleQueryChange} | ||
| /> | ||
| </div> | ||
| } | ||
| </div> | ||
| } | ||
|
|
||
| {legacyQuery && | ||
| <div className="gf-form"> | ||
| <FormLabel width={10} tooltip="Original query string, read-only">Legacy Query</FormLabel> | ||
| <Input | ||
| value={legacyQuery} | ||
| readOnly={true} | ||
| /> | ||
| </div> | ||
| } | ||
| </> | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| import React, { FC } from 'react'; | ||
| import { css, cx } from 'emotion'; | ||
| import { Themeable, withTheme, Input, EventsWithValidation, ValidationEvents } from '@grafana/ui'; | ||
| import { GrafanaTheme } from '@grafana/data'; | ||
| import { isRegex, variableRegex } from '../utils'; | ||
|
|
||
| const variablePattern = RegExp(`^${variableRegex.source}`); | ||
|
|
||
| const getStyles = (theme: GrafanaTheme) => ({ | ||
| inputRegex: css` | ||
| color: ${theme.colors.orange} | ||
| `, | ||
| inputVariable: css` | ||
| color: ${theme.colors.variable} | ||
| `, | ||
| }); | ||
|
|
||
| const zabbixInputValidationEvents: ValidationEvents = { | ||
| [EventsWithValidation.onBlur]: [ | ||
| { | ||
| rule: value => { | ||
| if (!value) { | ||
| return true; | ||
| } | ||
| if (value.length > 1 && value[0] === '/') { | ||
| if (value[value.length - 1] !== '/') { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| }, | ||
| errorMessage: 'Not a valid regex', | ||
| }, | ||
| { | ||
| rule: value => { | ||
| if (value === '*') { | ||
| return false; | ||
| } | ||
| return true; | ||
| }, | ||
| errorMessage: 'Wildcards not supported. Use /.*/ instead', | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| interface Props extends React.ComponentProps<typeof Input>, Themeable { | ||
| } | ||
|
|
||
| const UnthemedZabbixInput: FC<Props> = ({ theme, value, ref, validationEvents, ...restProps }) => { | ||
| const styles = getStyles(theme); | ||
|
|
||
| let inputClass; | ||
| if (variablePattern.test(value as string)) { | ||
| inputClass = styles.inputVariable; | ||
| } | ||
| if (isRegex(value)) { | ||
| inputClass = styles.inputRegex; | ||
| } | ||
|
|
||
| return ( | ||
| <Input | ||
| className={inputClass} | ||
| value={value} | ||
| validationEvents={zabbixInputValidationEvents} | ||
| {...restProps} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export const ZabbixInput = withTheme(UnthemedZabbixInput); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's currently an issue that's failing unit tests if we don't mock @grafana/ui and @grafana/runtime: grafana/grafana#20921
However there's also apparently an issue in master that's causing a different error entirely. Neither one works, but we're going to need 6.6 (or whatever release has the fix).
tl;dr Jest tests are broken because of Grafana packages, we can't fix it and need to wait for a good version of @grafana/ui
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aha, ok, that makes sense. I'll try to investigate. It seems, I remember some build error in grafana/ui related to Table interface.