From fa3de12456890b13e3cc68a80397d4bbdf52abb8 Mon Sep 17 00:00:00 2001 From: Mikhail Volkov <47795110+mikhailredis@users.noreply.github.com> Date: Sun, 13 Feb 2022 21:45:12 -0500 Subject: [PATCH] Rebuild using 8.3.6 (#13) --- CHANGELOG.md | 6 + package.json | 12 +- src/components/QueryEditor/QueryEditor.tsx | 12 +- yarn.lock | 898 +++++++++++---------- 4 files changed, 478 insertions(+), 450 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 386100c..5f3d6d6 100644 --- 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 index 45a8973..dea45ef 100644 --- 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 index a5a831b..924fa3c 100644 --- 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 { const query = defaults(this.props.query, defaultQuery); return ( - <> - - Return + +