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

Revert "feat: Highlight vizpicker input when there are no panels matching the search query"

Browse Source 
This reverts commit 11db48e76e.
This commit is contained in:
Johannes Schill 2019-02-13 07:46:14 +01:00
parent 11db48e76e
commit 44eaa3eaa8
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/panel_editor/EditorTabBody.tsx
View File

@ -36,7 +36,7 @@ export class EditorTabBody extends PureComponent<Props, State> {
toolbarItems: [], toolbarItems: [],
}; };
constructor(props: Props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {

21
public/app/features/dashboard/panel_editor/VisualizationTab.tsx
View File

@ -1,5 +1,5 @@
// Libraries // Libraries
import React, { PureComponent, ChangeEvent } from 'react'; import React, { PureComponent } from 'react';
// Utils & Services // Utils & Services
import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader'; import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
@ -31,7 +31,6 @@ interface Props {
interface State { interface State {
isVizPickerOpen: boolean; isVizPickerOpen: boolean;
searchQuery: string; searchQuery: string;
searchResults: PanelPlugin[];
scrollTop: number; scrollTop: number;
} }
@ -40,13 +39,12 @@ export class VisualizationTab extends PureComponent<Props, State> {
angularOptions: AngularComponent; angularOptions: AngularComponent;
searchInput: HTMLElement; searchInput: HTMLElement;
constructor(props: Props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
isVizPickerOpen: this.props.urlOpenVizPicker, isVizPickerOpen: this.props.urlOpenVizPicker,
searchQuery: '', searchQuery: '',
searchResults: [],
scrollTop: 0, scrollTop: 0,
}; };
} }
@ -172,7 +170,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
this.setState({ isVizPickerOpen: false }); this.setState({ isVizPickerOpen: false });
}; };
onSearchQueryChange = (evt: ChangeEvent<HTMLInputElement>) => { onSearchQueryChange = evt => {
const value = evt.target.value; const value = evt.target.value;
this.setState({ this.setState({
searchQuery: value, searchQuery: value,
@ -189,7 +187,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
<label className="gf-form--has-input-icon"> <label className="gf-form--has-input-icon">
<input <input
type="text" type="text"
className={`gf-form-input width-13 ${!this.hasSearchResults ? 'gf-form-input--invalid' : ''}`} className="gf-form-input width-13"
placeholder="" placeholder=""
onChange={this.onSearchQueryChange} onChange={this.onSearchQueryChange}
value={searchQuery} value={searchQuery}
@ -221,16 +219,6 @@ export class VisualizationTab extends PureComponent<Props, State> {
} }
}; };
setSearchResults = (searchResults: PanelPlugin[]) => {
this.setState({
searchResults: searchResults
});
};
get hasSearchResults () {
return this.state.searchResults && this.state.searchResults.length > 0;
}
renderHelp = () => <PluginHelp plugin={this.props.plugin} type="help" />; renderHelp = () => <PluginHelp plugin={this.props.plugin} type="help" />;
setScrollTop = (event: React.MouseEvent<HTMLElement>) => { setScrollTop = (event: React.MouseEvent<HTMLElement>) => {
@ -263,7 +251,6 @@ export class VisualizationTab extends PureComponent<Props, State> {
onTypeChanged={this.onTypeChanged} onTypeChanged={this.onTypeChanged}
searchQuery={searchQuery} searchQuery={searchQuery}
onClose={this.onCloseVizPicker} onClose={this.onCloseVizPicker}
onPluginListChange={this.setSearchResults}
/> />
</FadeIn> </FadeIn>
{this.renderPanelOptions()} {this.renderPanelOptions()}

6
public/app/features/dashboard/panel_editor/VizTypePicker.tsx
View File

@ -10,14 +10,13 @@ export interface Props {
onTypeChanged: (newType: PanelPlugin) => void; onTypeChanged: (newType: PanelPlugin) => void;
searchQuery: string; searchQuery: string;
onClose: () => void; onClose: () => void;
onPluginListChange: (searchResults: PanelPlugin[]) => void;
} }
export class VizTypePicker extends PureComponent<Props> { export class VizTypePicker extends PureComponent<Props> {
searchInput: HTMLElement; searchInput: HTMLElement;
pluginList = this.getPanelPlugins(''); pluginList = this.getPanelPlugins('');
constructor(props: Props) { constructor(props) {
super(props); super(props);
} }
@ -51,7 +50,7 @@ export class VizTypePicker extends PureComponent<Props> {
}; };
getFilteredPluginList = (): PanelPlugin[] => { getFilteredPluginList = (): PanelPlugin[] => {
const { searchQuery, onPluginListChange } = this.props; const { searchQuery } = this.props;
const regex = new RegExp(searchQuery, 'i'); const regex = new RegExp(searchQuery, 'i');
const pluginList = this.pluginList; const pluginList = this.pluginList;
@ -59,7 +58,6 @@ export class VizTypePicker extends PureComponent<Props> {
return regex.test(item.name); return regex.test(item.name);
}); });
onPluginListChange(filtered);
return filtered; return filtered;
}; };