Update dependency @types/lodash to v4.17.1 (#87419)

* Update dependency @types/lodash to v4.17.1 * fix grafana-data * simpler grafana-data fix * simpler code * commit a betterer crime (it was already doing this implicitly before...) --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com> Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2025-02-25 18:55:37 -06:00 · 2024-05-10 13:56:27 +01:00
parent 39aafde8cb
commit 0793a9033a
21 changed files with 59 additions and 49 deletions
--- a/public/app/plugins/datasource/azuremonitor/package.json
+++ b/public/app/plugins/datasource/azuremonitor/package.json
@@ -31,7 +31,7 @@
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/prismjs": "1.26.4",
    "@types/react": "18.2.79",
--- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
@@ -256,7 +256,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
    }

    if (has(query, 'metricQuery') && ['metrics', QueryType.ANNOTATION].includes(query.queryType ?? '')) {
-      const metricQuery: MetricQuery = get(query, 'metricQuery')!;
+      const metricQuery = get(query, 'metricQuery') as MetricQuery;
      if (metricQuery.editorMode === 'mql') {
        query.timeSeriesQuery = {
          projectName: metricQuery.projectName,
@@ -288,7 +288,10 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
    }

    if (query.queryType === QueryType.SLO && has(query, 'sloQuery.aliasBy')) {
-      query.aliasBy = get(query, 'sloQuery.aliasBy');
+      const sloQuery = get(query, 'sloQuery.aliasBy');
+      if (typeof sloQuery === 'string') {
+        query.aliasBy = sloQuery;
+      }
      query = omit(query, 'sloQuery.aliasBy');
    }

--- a/public/app/plugins/datasource/cloud-monitoring/package.json
+++ b/public/app/plugins/datasource/cloud-monitoring/package.json
@@ -33,7 +33,7 @@
    "@testing-library/user-event": "14.5.2",
    "@types/debounce-promise": "3.1.9",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/prismjs": "1.26.4",
    "@types/react": "18.2.79",
--- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
@@ -21,7 +21,7 @@
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/react": "18.2.79",
    "@types/testing-library__jest-dom": "5.14.9",
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
@@ -26,7 +26,7 @@
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/prismjs": "1.26.4",
    "@types/react": "18.2.79",
--- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
@@ -29,7 +29,7 @@
    "@testing-library/user-event": "14.5.2",
    "@types/d3-random": "^3.0.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/react": "18.2.79",
    "@types/react-dom": "18.2.25",
--- a/public/app/plugins/datasource/jaeger/package.json
+++ b/public/app/plugins/datasource/jaeger/package.json
@@ -29,7 +29,7 @@
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/logfmt": "^1.2.3",
    "@types/node": "20.12.11",
    "@types/react": "18.2.79",
--- a/public/app/plugins/datasource/mysql/package.json
+++ b/public/app/plugins/datasource/mysql/package.json
@@ -21,7 +21,7 @@
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/react": "18.2.79",
    "@types/testing-library__jest-dom": "5.14.9",
--- a/public/app/plugins/datasource/parca/package.json
+++ b/public/app/plugins/datasource/parca/package.json
@@ -22,7 +22,7 @@
    "@testing-library/dom": "10.0.0",
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/react": "18.2.79",
    "@types/react-dom": "18.2.25",
--- a/public/app/plugins/datasource/tempo/package.json
+++ b/public/app/plugins/datasource/tempo/package.json
@@ -45,7 +45,7 @@
    "@testing-library/react": "15.0.2",
    "@testing-library/user-event": "14.5.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/prismjs": "1.26.4",
    "@types/react": "18.2.79",
--- a/public/app/plugins/datasource/zipkin/package.json
+++ b/public/app/plugins/datasource/zipkin/package.json
@@ -24,7 +24,7 @@
    "@testing-library/jest-dom": "6.4.2",
    "@testing-library/react": "15.0.2",
    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.1",
    "@types/node": "20.12.11",
    "@types/react": "18.2.79",
    "@types/react-dom": "18.2.25",