Merge pull request #26 from epam/main-1.1

New Release

README.md

@@ -2,7 +2,7 @@
 
 TimeBase Grafana plugin allows visualizing [TimeBase](https://kb.timebase.info/) streams data in [Grafana](https://grafana.com/).
 
-[Link to plugin distribution](https://github.com/epam/TimeBaseGrafanaPlugin/releases/download/1.0.13/epam-timebase-datasource.zip)
+[Link to plugin distribution](https://github.com/epam/TimeBaseGrafanaPlugin/releases/download/1.1.1/epam-timebase-datasource.zip)
 
 [Link to QQL (TimeBase Query language) tutorial](https://kb.timebase.info/community/development/qql/QQL%205.5/qql-tut-intro)
 
@@ -18,6 +18,7 @@ TimeBase plugin uses [TimeBase Web Admin](https://webadmin.timebase.info/api/v0/
 ---
 **IMPORTANT NOTICE**
 
+
 Supported TimeBase versions: `[5.5.6, 5.7.*]`
 Supported TimeBase Web Admin versions: `[0.5.5, 1.2.*]`
 Supported Grafana versions: `[10.2+, 11+]`

src/components/view/Filter/Filter.tsx

@@ -1,5 +1,5 @@
 import { SelectableValue } from '@grafana/data';
-import { Button, Input, MultiSelect, Segment, Select } from '@grafana/ui';
+import { Input, MultiSelect, Segment, Select } from '@grafana/ui';
 import { css, cx } from '@emotion/css';
 import React, { PureComponent } from 'react';
 
@@ -242,22 +242,6 @@ class Filter extends PureComponent<FilterProps, FilterState> {
     return this.state.filterValues;
   };
 
-  private getContentForItems = (otherProps: any) => {
-    return otherProps.value?.value === VALUE_KEY ? (
-      <Input
-        {...otherProps}
-        value={this.state.filterValues[0] == null ? '' : this.state.filterValues[0]}
-        className={cx('w-100', commonStyles)}
-        onKeyDown={this.onKeyPress}
-        onChange={this.onChangeInputValue}
-      />
-    ) : (
-      <Button {...otherProps} variant="secondary" className={cx('flex-justify w-100', styles, commonStyles)}>
-        {otherProps.value?.value}
-      </Button>
-    );
-  };
-
   render() {
     const [type, field] = separateTypeAndField(this.props.selectedField);
     return (
@@ -279,13 +263,12 @@ class Filter extends PureComponent<FilterProps, FilterState> {
         {showSpecialValues(this.props.selectedOperators as Operator) ? (
           <Select
             width={15}
-            className={cx('mr-4', styles)}
+            className={cx('select mr-4' , styles)}
             options={this.state.values}
             value={this.state.selectedItem}
             onChange={this.onChangeValue}
             backspaceRemovesValue={true}
-            isClearable={true}
-            renderControl={this.getContentForItems}
+            classNamePrefix="grafana-custom"
           />
         ) : (
           this.getContent()