Rebuild using 8.3.6 (#13)

VolkovLabs · Feb 14, 2022 · fa3de12 · fa3de12
1 parent 42a9e15
commit fa3de12
Show file tree

Hide file tree

Showing 4 changed files with 478 additions and 450 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.4.0 (IN PROGRESS)
+
+### Features / Enhancements
+
+- Rebuild using 8.3.6
+
 ## 1.3.1 (2022-02-02)
 
 ### Bug fixes

diff --git a/package.json b/package.json
@@ -2,15 +2,15 @@
   "author": "Volkov Labs",
   "description": "RSS/Atom data source plugin for Grafana",
   "devDependencies": {
-    "@grafana/data": "8.3.4",
-    "@grafana/runtime": "8.3.4",
-    "@grafana/toolkit": "8.3.4",
-    "@grafana/ui": "8.3.4",
+    "@grafana/data": "8.3.6",
+    "@grafana/runtime": "8.3.6",
+    "@grafana/toolkit": "8.3.6",
+    "@grafana/ui": "8.3.6",
     "@types/enzyme": "^3.10.11",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",
-    "fast-xml-parser": "^4.0.1"
+    "fast-xml-parser": "^4.0.2"
   },
   "engines": {
     "node": ">=14"
@@ -27,5 +27,5 @@
     "upgrade": "yarn upgrade --latest",
     "watch": "grafana-toolkit plugin:dev --watch"
   },
-  "version": "1.3.1"
+  "version": "1.4.0"
 }
diff --git a/src/components/QueryEditor/QueryEditor.tsx b/src/components/QueryEditor/QueryEditor.tsx
@@ -2,7 +2,7 @@ import { defaults } from 'lodash';
 import React, { PureComponent } from 'react';
 import { css } from '@emotion/css';
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
-import { InlineFieldRow, InlineFormLabel, Select } from '@grafana/ui';
+import { InlineField, InlineFieldRow, Select } from '@grafana/ui';
 import { FeedType, FeedTypeValue } from '../../constants';
 import { DataSource } from '../../datasource';
 import { DataSourceOptions, defaultQuery, Query } from '../../types';
@@ -32,20 +32,18 @@ export class QueryEditor extends PureComponent<Props> {
     const query = defaults(this.props.query, defaultQuery);
 
     return (
-      <>
-        <InlineFieldRow>
-          <InlineFormLabel width={8}>Return</InlineFormLabel>
+      <InlineFieldRow>
+        <InlineField label="Return" labelWidth={8} grow={true}>
           <Select
             className={css`
               margin-right: 5px;
             `}
-            width={40}
             options={FeedType}
             value={FeedType.find((type) => type.value === query.feedType)}
             onChange={this.onFeedTypeChange}
           />
-        </InlineFieldRow>
-      </>
+        </InlineField>
+      </InlineFieldRow>
     );
   }
 }