From ee05b46e8b46adee14fd32265530183fc298ab27 Mon Sep 17 00:00:00 2001 From: Nathan Marrs Date: Thu, 22 Dec 2022 16:45:48 -0700 Subject: [PATCH] [v9.2.x] SVG: Add dompurify preprocessor step (#704) * SVG: Add dompurify preprocessor step (#698) * add sanitized SVG component (cherry picked from commit dbbe819368f507b9493b7a3cf6e080a5dd752b3e) * remove added file Co-authored-by: Ryan McKinley --- .../dimensions/editors/URLPickerTab.tsx | 4 +- yarn.lock | 52 +++++++++---------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/public/app/features/dimensions/editors/URLPickerTab.tsx b/public/app/features/dimensions/editors/URLPickerTab.tsx index 51504e36dd2..6721dfd6fe3 100644 --- a/public/app/features/dimensions/editors/URLPickerTab.tsx +++ b/public/app/features/dimensions/editors/URLPickerTab.tsx @@ -34,9 +34,7 @@ export const URLPickerTab = (props: Props) => {
{mediaType === MediaType.Icon && } - {mediaType === MediaType.Image && newValue && ( - Preview of the selected URL - )} + {mediaType === MediaType.Image && newValue && }
diff --git a/yarn.lock b/yarn.lock index 76c987717e1..f374e10e333 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5325,9 +5325,9 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource" dependencies: - "@grafana/data": 9.2.11 - "@grafana/toolkit": 9.2.11 - "@grafana/ui": 9.2.11 + "@grafana/data": 9.2.8 + "@grafana/toolkit": 9.2.8 + "@grafana/ui": 9.2.8 "@types/jest": 26.0.15 "@types/lodash": 4.14.149 "@types/react": 17.0.30 @@ -5371,12 +5371,12 @@ __metadata: languageName: node linkType: hard -"@grafana/data@9.2.11, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data": +"@grafana/data@9.2.8, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data": version: 0.0.0-use.local resolution: "@grafana/data@workspace:packages/grafana-data" dependencies: "@braintree/sanitize-url": 6.0.0 - "@grafana/schema": 9.2.11 + "@grafana/schema": 9.2.8 "@grafana/tsconfig": ^1.2.0-rc1 "@rollup/plugin-commonjs": 22.0.1 "@rollup/plugin-json": 4.1.0 @@ -5435,7 +5435,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@9.2.11, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": +"@grafana/e2e-selectors@9.2.8, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": version: 0.0.0-use.local resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors" dependencies: @@ -5461,7 +5461,7 @@ __metadata: "@babel/core": 7.19.0 "@babel/preset-env": 7.19.0 "@cypress/webpack-preprocessor": 5.12.0 - "@grafana/e2e-selectors": 9.2.11 + "@grafana/e2e-selectors": 9.2.8 "@grafana/tsconfig": ^1.2.0-rc1 "@mochajs/json-file-reporter": ^1.2.0 "@rollup/plugin-node-resolve": 13.3.0 @@ -5548,15 +5548,15 @@ __metadata: languageName: node linkType: hard -"@grafana/runtime@9.2.11, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": +"@grafana/runtime@9.2.8, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": version: 0.0.0-use.local resolution: "@grafana/runtime@workspace:packages/grafana-runtime" dependencies: "@grafana/agent-web": ^0.4.0 - "@grafana/data": 9.2.11 - "@grafana/e2e-selectors": 9.2.11 + "@grafana/data": 9.2.8 + "@grafana/e2e-selectors": 9.2.8 "@grafana/tsconfig": ^1.2.0-rc1 - "@grafana/ui": 9.2.11 + "@grafana/ui": 9.2.8 "@rollup/plugin-commonjs": 22.0.1 "@rollup/plugin-node-resolve": 13.3.0 "@sentry/browser": 6.19.7 @@ -5592,7 +5592,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/schema@9.2.11, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": +"@grafana/schema@9.2.8, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": version: 0.0.0-use.local resolution: "@grafana/schema@workspace:packages/grafana-schema" dependencies: @@ -5612,7 +5612,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/toolkit@9.2.11, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit": +"@grafana/toolkit@9.2.8, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit": version: 0.0.0-use.local resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit" dependencies: @@ -5628,10 +5628,10 @@ __metadata: "@babel/preset-env": 7.18.9 "@babel/preset-react": 7.18.6 "@babel/preset-typescript": 7.18.6 - "@grafana/data": 9.2.11 + "@grafana/data": 9.2.8 "@grafana/eslint-config": 5.0.0 "@grafana/tsconfig": ^1.2.0-rc1 - "@grafana/ui": 9.2.11 + "@grafana/ui": 9.2.8 "@jest/core": 27.5.1 "@types/command-exists": ^1.2.0 "@types/eslint": 8.4.1 @@ -5712,16 +5712,16 @@ __metadata: languageName: node linkType: hard -"@grafana/ui@9.2.11, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": +"@grafana/ui@9.2.8, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": version: 0.0.0-use.local resolution: "@grafana/ui@workspace:packages/grafana-ui" dependencies: "@babel/core": 7.19.0 "@emotion/css": 11.9.0 "@emotion/react": 11.9.3 - "@grafana/data": 9.2.11 - "@grafana/e2e-selectors": 9.2.11 - "@grafana/schema": 9.2.11 + "@grafana/data": 9.2.8 + "@grafana/e2e-selectors": 9.2.8 + "@grafana/schema": 9.2.8 "@grafana/tsconfig": ^1.2.0-rc1 "@mdx-js/react": 1.6.22 "@monaco-editor/react": 4.4.5 @@ -6004,11 +6004,11 @@ __metadata: resolution: "@jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components" dependencies: "@emotion/css": 11.9.0 - "@grafana/data": 9.2.11 - "@grafana/e2e-selectors": 9.2.11 - "@grafana/runtime": 9.2.11 + "@grafana/data": 9.2.8 + "@grafana/e2e-selectors": 9.2.8 + "@grafana/runtime": 9.2.8 "@grafana/tsconfig": ^1.2.0-rc1 - "@grafana/ui": 9.2.11 + "@grafana/ui": 9.2.8 "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.4 "@testing-library/user-event": 14.4.3 @@ -18747,9 +18747,9 @@ __metadata: linkType: hard "dompurify@npm:^2.4.1": - version: 2.4.3 - resolution: "dompurify@npm:2.4.3" - checksum: b440981f2a38cada2085759cc3d1e2f94571afc34343d011a8a6aa1ad91ae6abf651adbfa4994b0e2283f0ce81f7891cdb04b67d0b234c8d190cb70e9691f026 + version: 2.4.1 + resolution: "dompurify@npm:2.4.1" + checksum: 1169177465b3cbb25a44322937fba549f6c4e1a91b83245d144471be26619c835cccf0f8e20aa78c25ac11a06efd17cc1b9db9cacadceb78a4c08a1029eafee5 languageName: node linkType: hard