diff --git a/CHANGELOG.md b/CHANGELOG.md index 169ff943..3008d7f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +## 1.12.0 + +- Update grafana/aws-sdk-go to 0.20.0 in [#273](https://github.com/grafana/grafana-iot-twinmaker-app/pull/273) +- Upgrade UxSDK to add path query feature for query editor in [#272](https://github.com/grafana/grafana-iot-twinmaker-app/pull/272) + ## 1.11.1 - Query Editor: Disable delete if only one filter, fix tooltip (new form styling) in [#268](https://github.com/grafana/grafana-iot-twinmaker-app/pull/268) diff --git a/go.mod b/go.mod index 60db7a57..2293d40b 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go v1.44.323 github.com/google/uuid v1.3.1 github.com/gorilla/mux v1.8.0 - github.com/grafana/grafana-aws-sdk v0.19.2 + github.com/grafana/grafana-aws-sdk v0.20.0 github.com/grafana/grafana-plugin-sdk-go v0.193.0 github.com/magefile/mage v1.15.0 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/go.sum b/go.sum index ec1b5b5f..61f4d0aa 100644 --- a/go.sum +++ b/go.sum @@ -188,6 +188,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grafana/grafana-aws-sdk v0.19.2 h1:GCLdo3oz7gp/ZJvbgFktMP5LKdNLnhxh/nLGzuxnJPA= github.com/grafana/grafana-aws-sdk v0.19.2/go.mod h1:IDhwY+LF6jD1zute5UvbZ5DY8aI4DQ+LjU8RjfayD20= +github.com/grafana/grafana-aws-sdk v0.20.0 h1:oIYkuLsxFYRlSGcyevU463upeZ2QN5giO+uDkU7RqvM= +github.com/grafana/grafana-aws-sdk v0.20.0/go.mod h1:ID7Yr4AtErNiTI1rIdsH7Jr5Q10+e2Zr2s2je+iH5p8= github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M= github.com/grafana/grafana-plugin-sdk-go v0.193.0 h1:vRL96urrUfb+XWd4G6/317wpJBWTvoR9+Lrb+yGXZho= github.com/grafana/grafana-plugin-sdk-go v0.193.0/go.mod h1:6Igwuc+iWyYNWXhJhsWUQpPn2ugNIo6r36vtn7GyIiE= diff --git a/package.json b/package.json index 70f30f39..181e74f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grafana-iot-twinmaker-app", - "version": "1.11.1", + "version": "1.12.0", "description": "Grafana IoT TwinMaker App Plugin", "scripts": { "build": "NODE_OPTIONS='--max-old-space-size=4096' webpack -c webpack.config.ts --env production ", diff --git a/src/datasource/components/QueryEditor.test.tsx b/src/datasource/components/QueryEditor.test.tsx index 187b5d32..bf17af38 100644 --- a/src/datasource/components/QueryEditor.test.tsx +++ b/src/datasource/components/QueryEditor.test.tsx @@ -88,7 +88,7 @@ const getDefaultProps = (grafanaLive: boolean) => ({ }); describe('QueryEditor', () => { - function runGrafanaLiveEnabled() { + function run() { it.each([ [TwinMakerQueryType.GetAlarms, ['Filter', 'Max. Alarms', 'Interval', 'Stream'], {}], [TwinMakerQueryType.ListEntities, ['Component Type'], { isStreaming: true }], @@ -142,7 +142,7 @@ describe('QueryEditor', () => { afterAll(() => { cleanup(); }); - runGrafanaLiveEnabled(); + run(); }); describe('QueryEditor with awsDatasourcesNewFormStyling feature toggle enabled', () => { beforeAll(() => { @@ -151,7 +151,7 @@ describe('QueryEditor', () => { afterAll(() => { cleanup(); }); - runGrafanaLiveEnabled(); + run(); }); function runGrafanaLiveDisabled() { it.each([