diff --git a/package.json b/package.json index f63b0b5fdb9..e9bb19092bc 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "@types/jquery": "3.5.32", "@types/js-yaml": "^4.0.5", "@types/jsurl": "^1.2.28", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/logfmt": "^1.2.3", "@types/lucene": "^2", "@types/node": "20.16.15", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 35fe81f5124..4be4533b18a 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -65,7 +65,7 @@ "@rollup/plugin-node-resolve": "15.3.0", "@types/dompurify": "^3.0.0", "@types/history": "4.7.11", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/papaparse": "5.3.15", "@types/react": "18.3.3", diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index 1169ad8514b..e3eb85bba5d 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -67,7 +67,7 @@ "@testing-library/user-event": "14.5.2", "@types/d3": "^7", "@types/jest": "^29.5.4", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "@types/react-virtualized-auto-sizer": "1.0.4", diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 7c95f89ebb8..511ee6fd32a 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -91,7 +91,7 @@ "@types/eslint": "9.6.1", "@types/jest": "29.5.14", "@types/jquery": "3.5.32", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/pluralize": "^0.0.33", "@types/prismjs": "1.26.5", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 905cc200757..d3965fdc82a 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -58,7 +58,7 @@ "@types/angular": "1.8.9", "@types/history": "4.7.11", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "@types/systemjs": "6.15.1", diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index af59e8c3ec1..32105e354ee 100644 --- a/packages/grafana-sql/package.json +++ b/packages/grafana-sql/package.json @@ -41,7 +41,7 @@ "@testing-library/react-hooks": "^8.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "^29.5.4", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 4bd28dbf09d..f7f631e3d05 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -65,7 +65,7 @@ "@react-aria/utils": "3.25.3", "@tanstack/react-virtual": "^3.5.1", "@types/jquery": "3.5.32", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/react-table": "7.7.20", "calculate-size": "1.1.1", "classnames": "2.5.1", diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 41c365b5a1b..acb1e3ad106 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -31,7 +31,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index 8565f4ccc90..38d7ca2d9bd 100644 --- 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.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json index 985fb1ffc47..1073206f02a 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json @@ -22,7 +22,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "ts-node": "10.9.2", diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index 1efe5a7db76..7acdcad9f4c 100644 --- 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": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index e82c9dd01cf..1362fc24caa 100644 --- 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.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index f6645f07fa2..2ad68c2bf4f 100644 --- a/public/app/plugins/datasource/jaeger/package.json +++ b/public/app/plugins/datasource/jaeger/package.json @@ -29,7 +29,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/logfmt": "^1.2.3", "@types/node": "20.16.15", "@types/react": "18.3.3", diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json index 82cf4d60ef6..52a98ecd261 100644 --- a/public/app/plugins/datasource/mssql/package.json +++ b/public/app/plugins/datasource/mssql/package.json @@ -22,7 +22,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "ts-node": "10.9.2", diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json index b8020010c7d..6b1a6a9c448 100644 --- a/public/app/plugins/datasource/mysql/package.json +++ b/public/app/plugins/datasource/mysql/package.json @@ -22,7 +22,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "ts-node": "10.9.2", diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index 600f1208a28..5ca3dc60876 100644 --- a/public/app/plugins/datasource/parca/package.json +++ b/public/app/plugins/datasource/parca/package.json @@ -22,7 +22,7 @@ "@testing-library/dom": "10.4.0", "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 492aa6830f9..1bb877f9529 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -45,7 +45,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index 18f514342df..84bf1925c04 100644 --- a/public/app/plugins/datasource/zipkin/package.json +++ b/public/app/plugins/datasource/zipkin/package.json @@ -25,7 +25,7 @@ "@testing-library/jest-dom": "6.5.0", "@testing-library/react": "16.0.1", "@types/jest": "29.5.14", - "@types/lodash": "4.17.12", + "@types/lodash": "4.17.13", "@types/node": "20.16.15", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/panel/canvas/editor/element/elementEditor.tsx b/public/app/plugins/panel/canvas/editor/element/elementEditor.tsx index e119ce60d66..5e3a545b87b 100644 --- a/public/app/plugins/panel/canvas/editor/element/elementEditor.tsx +++ b/public/app/plugins/panel/canvas/editor/element/elementEditor.tsx @@ -123,7 +123,10 @@ export function getElementEditor(opts: CanvasEditorOptions): NestedPanelOptions< optionBuilder.addBorder(builder, ctx); } - const oneClickModeOptions = [ + const oneClickModeOptions: Array<{ + value: OneClickMode; + label: string; + }> = [ { value: OneClickMode.Off, label: capitalize(OneClickMode.Off) }, { value: OneClickMode.Link, label: capitalize(OneClickMode.Link) }, ]; diff --git a/yarn.lock b/yarn.lock index d5c5be2aad7..94e50ffb25d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3066,7 +3066,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" @@ -3108,7 +3108,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" lodash: "npm:4.17.21" @@ -3138,7 +3138,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" @@ -3180,7 +3180,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/d3-random": "npm:^3.0.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -3220,7 +3220,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/logfmt": "npm:^1.2.3" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" @@ -3261,7 +3261,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" lodash: "npm:4.17.21" @@ -3292,7 +3292,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" lodash: "npm:4.17.21" @@ -3320,7 +3320,7 @@ __metadata: "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -3357,7 +3357,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/debounce-promise": "npm:3.1.9" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" @@ -3412,7 +3412,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" @@ -3462,7 +3462,7 @@ __metadata: "@testing-library/jest-dom": "npm:6.5.0" "@testing-library/react": "npm:16.0.1" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -3521,7 +3521,7 @@ __metadata: "@types/d3-interpolate": "npm:^3.0.0" "@types/dompurify": "npm:^3.0.0" "@types/history": "npm:4.7.11" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/papaparse": "npm:5.3.15" "@types/react": "npm:18.3.3" @@ -3729,7 +3729,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/d3": "npm:^7" "@types/jest": "npm:^29.5.4" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" "@types/react-virtualized-auto-sizer": "npm:1.0.4" @@ -3901,7 +3901,7 @@ __metadata: "@types/eslint": "npm:9.6.1" "@types/jest": "npm:29.5.14" "@types/jquery": "npm:3.5.32" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/pluralize": "npm:^0.0.33" "@types/prismjs": "npm:1.26.5" @@ -3994,7 +3994,7 @@ __metadata: "@types/angular": "npm:1.8.9" "@types/history": "npm:4.7.11" "@types/jest": "npm:29.5.14" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" "@types/systemjs": "npm:6.15.1" @@ -4131,7 +4131,7 @@ __metadata: "@testing-library/react-hooks": "npm:^8.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:^29.5.4" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/node": "npm:20.16.15" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -4217,7 +4217,7 @@ __metadata: "@types/is-hotkey": "npm:0.1.10" "@types/jest": "npm:29.5.14" "@types/jquery": "npm:3.5.32" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/mock-raf": "npm:1.0.6" "@types/node": "npm:20.16.15" "@types/prismjs": "npm:1.26.5" @@ -10323,10 +10323,10 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:*, @types/lodash@npm:4.17.12, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.172": - version: 4.17.12 - resolution: "@types/lodash@npm:4.17.12" - checksum: 10/3d829f97c0ea713135e6eb48e983feffb315f4cf228d03654ca8a328e3fecd03005bf7dd30bf411f4306967c610d96738d441588283a41456815f2ce1fd7044c +"@types/lodash@npm:*, @types/lodash@npm:4.17.13, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.172": + version: 4.17.13 + resolution: "@types/lodash@npm:4.17.13" + checksum: 10/ddb34e20810c71be2d9445bcc4b64ec25b83976738454de709854b79c7f655b03704b76235445699956d65012987720e0e429a35489de65495cdb5420202d905 languageName: node linkType: hard @@ -18816,7 +18816,7 @@ __metadata: "@types/jquery": "npm:3.5.32" "@types/js-yaml": "npm:^4.0.5" "@types/jsurl": "npm:^1.2.28" - "@types/lodash": "npm:4.17.12" + "@types/lodash": "npm:4.17.13" "@types/logfmt": "npm:^1.2.3" "@types/lucene": "npm:^2" "@types/node": "npm:20.16.15"