From 0aac00839af141d33d8a189ea016303b02beac48 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Mon, 27 Sep 2021 14:34:36 +0100 Subject: [PATCH 1/3] Update dependabot.yml (#39663) --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 289ad906fee..77cb13c8dd8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,6 +21,7 @@ updates: - dependency-name: "husky" - dependency-name: "slate" - dependency-name: "slate-plain-serializer" + - dependency-name: "systemjs" reviewers: - "grafana/frontend-ops" versioning-strategy: "increase-if-necessary" From 184fa2a22720811a1bb10e765ef768a34f62af22 Mon Sep 17 00:00:00 2001 From: Andrew Hackmann <5140848+bossinc@users.noreply.github.com> Date: Mon, 27 Sep 2021 08:40:19 -0500 Subject: [PATCH 2/3] QueryActionComponent: Add dataSourceRef to ActionComponetProps (#39486) * Add dataSourceRef to ActionComponetProps * pass whole datasource instance settings into modal Co-authored-by: Travis Patterson --- public/app/features/query/components/QueryActionComponent.ts | 3 ++- public/app/features/query/components/QueryEditorRow.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/app/features/query/components/QueryActionComponent.ts b/public/app/features/query/components/QueryActionComponent.ts index cbee1ec711d..a4109ea7194 100644 --- a/public/app/features/query/components/QueryActionComponent.ts +++ b/public/app/features/query/components/QueryActionComponent.ts @@ -1,10 +1,11 @@ -import { DataQuery, TimeRange } from '@grafana/data'; +import { DataQuery, DataSourceInstanceSettings, TimeRange } from '@grafana/data'; interface ActionComponentProps { query?: DataQuery; queries?: Array>; onAddQuery?: (q: DataQuery) => void; timeRange?: TimeRange; + dataSource?: DataSourceInstanceSettings; } type QueryActionComponent = React.ComponentType; diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx index 047e977deaf..2e8e137999e 100644 --- a/public/app/features/query/components/QueryEditorRow.tsx +++ b/public/app/features/query/components/QueryEditorRow.tsx @@ -303,13 +303,14 @@ export class QueryEditorRow extends PureComponent { - const { query, queries, data, onAddQuery } = this.props; + const { query, queries, data, onAddQuery, dataSource } = this.props; return RowActionComponents.getAllExtraRenderAction().map((c) => { return React.createElement(c, { query, queries, timeRange: data.timeRange, onAddQuery: onAddQuery as (query: DataQuery) => void, + dataSource: dataSource, }); }); }; From 60f5bceda59ab79000e687cd1d89b1c46ebd06ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:51:54 +0100 Subject: [PATCH 3/3] Bump @types/prettier from 1.18.3 to 2.4.0 (#39653) Bumps [@types/prettier](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/prettier) from 1.18.3 to 2.4.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/prettier) --- updated-dependencies: - dependency-name: "@types/prettier" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/grafana-toolkit/package.json | 2 +- yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 4dcd9b6943c..5cc286ccd0a 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -38,7 +38,7 @@ "@types/inquirer": "^6.0.3", "@types/jest": "26.0.15", "@types/node": "^12.0.4", - "@types/prettier": "^1.16.4", + "@types/prettier": "^2.4.0", "@types/puppeteer-core": "1.9.0", "@types/react-dev-utils": "^9.0.4", "@types/rimraf": "^2.0.3", diff --git a/yarn.lock b/yarn.lock index c3812e65b89..23ce30b7546 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5176,15 +5176,10 @@ resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c" integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA== -"@types/prettier@^1.16.4": - version "1.18.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.18.3.tgz#64ff53329ce16139f17c3db9d3e0487199972cd8" - integrity sha512-48rnerQdcZ26odp+HOvDGX8IcUkYOCuMc2BodWYTe956MqkHlOGAG4oFQ83cjZ0a4GAgj7mb4GUClxYd2Hlodg== - -"@types/prettier@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d" - integrity sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ== +"@types/prettier@^2.0.0", "@types/prettier@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.0.tgz#900b13362610ccd3570fb6eefb911a6732973d00" + integrity sha512-WHRsy5nMpjXfU9B0LqOqPT06EI2+8Xv5NERy0pLxJLbU98q7uhcGogQzfX+rXpU7S5mgHsLxHrLCufZcV/P8TQ== "@types/pretty-hrtime@^1.0.0": version "1.0.1"