Merge remote-tracking branch 'origin/main' into ivana/prom-backend-both

.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"

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",

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<Partial<DataQuery>>;
   onAddQuery?: (q: DataQuery) => void;
   timeRange?: TimeRange;
+  dataSource?: DataSourceInstanceSettings;
 }
 
 type QueryActionComponent = React.ComponentType<ActionComponentProps>;

public/app/features/query/components/QueryEditorRow.tsx

@@ -303,13 +303,14 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   }
 
   renderExtraActions = () => {
-    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,
       });
     });
   };

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"