From 4959c3f0ca239ded2c4c654852d5ea0b04749a74 Mon Sep 17 00:00:00 2001 From: Jenny <32821331+jenny-s51@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:11:41 -0500 Subject: [PATCH] Update to PF 4.159.1 (#1560) Co-authored-by: Jon Koops --- package-lock.json | 134 +++++++++--------- package.json | 10 +- .../json-file-upload/FileUploadForm.tsx | 15 +- 3 files changed, 78 insertions(+), 81 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa654ac0ed..b89902819b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,11 +8,11 @@ "license": "Apache", "dependencies": { "@keycloak/keycloak-admin-client": "^16.0.0-dev.48", - "@patternfly/patternfly": "^4.151.4", - "@patternfly/react-code-editor": "^4.9.8", - "@patternfly/react-core": "^4.168.8", - "@patternfly/react-icons": "4.19.8", - "@patternfly/react-table": "^4.37.8", + "@patternfly/patternfly": "^4.159.1", + "@patternfly/react-code-editor": "^4.16.4", + "@patternfly/react-core": "^4.175.4", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-table": "^4.44.4", "dagre": "^0.8.5", "file-saver": "^2.0.5", "i18next": "^21.4.2", @@ -3682,18 +3682,18 @@ } }, "node_modules/@patternfly/patternfly": { - "version": "4.151.4", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.151.4.tgz", - "integrity": "sha512-TsXePErYetJ8eGkttczkiRBpQH8wAa5bS9aJ8ScFxRvpOw4LfivZ3AKBaQxgONWS6muUN1SxbaGF8qWuRMGo5Q==" + "version": "4.159.1", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.159.1.tgz", + "integrity": "sha512-CPLE7yAmtETH8TAdQhHkyFmyvjGwsv/7PeR4k57DY9X4IHpx41m4SXrv9cBCr/+Uy8o2SjvE8dtlZb+h0rLByQ==" }, "node_modules/@patternfly/react-code-editor": { - "version": "4.9.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.9.8.tgz", - "integrity": "sha512-gypKCEG1+ORGlxinoKrhDfq0g02pksuqCI3R/vkplKf2dZ2zQM4MYalN+xJ52DZeAWTpIUIprT0YtD7hwEb+TQ==", + "version": "4.16.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.16.4.tgz", + "integrity": "sha512-5Q3s1HFkWkbJTeEBdJkmx7yvh0oU7+OOOvN9FarRgZcVR9eRhY3oWdiodPsS3LjGuP77Xq7GBpku8vNrnksmyg==", "dependencies": { - "@patternfly/react-core": "^4.168.8", - "@patternfly/react-icons": "^4.19.8", - "@patternfly/react-styles": "^4.18.8", + "@patternfly/react-core": "^4.175.4", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-styles": "^4.25.4", "react-dropzone": "9.0.0", "tslib": "^2.0.0" }, @@ -3705,13 +3705,13 @@ } }, "node_modules/@patternfly/react-core": { - "version": "4.168.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.168.8.tgz", - "integrity": "sha512-wfG52saibeAXRoBYytzMgVGANoInbPuhUK0y6AynVp3/QKAPCKHpaI4nCh9ytNZ+UjiT2KGOcunhavsOw5+iMA==", + "version": "4.175.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.175.4.tgz", + "integrity": "sha512-bnQhvXKbprni5WhlbMI+nbYxwMR03bFZtUk+F7JiLM96uk/yCrPjUes6u8Pbgkh/HhsRYx8K1kx84WmC+MyD5w==", "dependencies": { - "@patternfly/react-icons": "^4.19.8", - "@patternfly/react-styles": "^4.18.8", - "@patternfly/react-tokens": "^4.20.8", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-styles": "^4.25.4", + "@patternfly/react-tokens": "^4.27.4", "focus-trap": "6.2.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", @@ -3723,28 +3723,28 @@ } }, "node_modules/@patternfly/react-icons": { - "version": "4.19.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.19.8.tgz", - "integrity": "sha512-JBBcVntRLspe857JnGo8lFaZfy+WOR/IYe2E9W3Rknqm1T8WO6oXpeEnrr5r9bpYDFUa4ttcb/acuQXc1xypxg==", + "version": "4.26.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.26.4.tgz", + "integrity": "sha512-h1NJixtNVK+nYxLON3HOO0xguA9qXQ5rkGUo4TZJ/kRehFCJMH8PPeebdOAKgAo38NjS2/06+atNKjDRl6zYcA==", "peerDependencies": { "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0" } }, "node_modules/@patternfly/react-styles": { - "version": "4.18.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.18.8.tgz", - "integrity": "sha512-136N/Whs0qXDtPpsh5JeNJld5BeFPsbmmcgI5LlMQ+P9dioddh24rTqaaOIea67tHiXUB7orxaqKpBBILXqcPQ==" + "version": "4.25.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.25.4.tgz", + "integrity": "sha512-GHFLzsvyimymkGTTyTW8HZDlhYbGpCqw/69Se1EHCaZnbTYluiJMRI6YfNTRC5ZvYF+x4GMAG5AjwQ5LfbZ/xg==" }, "node_modules/@patternfly/react-table": { - "version": "4.37.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.37.8.tgz", - "integrity": "sha512-DEaRooSGgfauX5RV3rwNcc9ZgMzR7gcCxsn9V7oNz6UsBgAV5cL7leGdAETdcV/B2+JMmGb+6QPjc54lsvwiuQ==", + "version": "4.44.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.44.4.tgz", + "integrity": "sha512-UV2kq4OV1v6Hv2TXvvsEApPwbAyD6zvurvl0/BZoqqEHTWVQedG0m1jUN9jFMTJiD4GTESvg6TAcSowGkJlTug==", "dependencies": { - "@patternfly/react-core": "^4.168.8", - "@patternfly/react-icons": "^4.19.8", - "@patternfly/react-styles": "^4.18.8", - "@patternfly/react-tokens": "^4.20.8", + "@patternfly/react-core": "^4.175.4", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-styles": "^4.25.4", + "@patternfly/react-tokens": "^4.27.4", "lodash": "^4.17.19", "tslib": "^2.0.0" }, @@ -3754,9 +3754,9 @@ } }, "node_modules/@patternfly/react-tokens": { - "version": "4.20.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.20.8.tgz", - "integrity": "sha512-OFlgTknFBNAETWVYYoLdISJBjPMQ8e3tcLpWb3h/KgKk/Tn1NR+P7Pl1gQGvTL/9liBZfS/HKDD5+P8c70w+2Q==" + "version": "4.27.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.27.4.tgz", + "integrity": "sha512-+DVCp4edPwORQF2zH6aG8e7FhLBXKsZgxMEYBU1/3qQSp+gf6Q8M4HiqbNnR6uo99tYJ9JiEcbGZu4Mx+nDIuA==" }, "node_modules/@rollup/plugin-commonjs": { "version": "16.0.0", @@ -24052,30 +24052,30 @@ } }, "@patternfly/patternfly": { - "version": "4.151.4", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.151.4.tgz", - "integrity": "sha512-TsXePErYetJ8eGkttczkiRBpQH8wAa5bS9aJ8ScFxRvpOw4LfivZ3AKBaQxgONWS6muUN1SxbaGF8qWuRMGo5Q==" + "version": "4.159.1", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.159.1.tgz", + "integrity": "sha512-CPLE7yAmtETH8TAdQhHkyFmyvjGwsv/7PeR4k57DY9X4IHpx41m4SXrv9cBCr/+Uy8o2SjvE8dtlZb+h0rLByQ==" }, "@patternfly/react-code-editor": { - "version": "4.9.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.9.8.tgz", - "integrity": "sha512-gypKCEG1+ORGlxinoKrhDfq0g02pksuqCI3R/vkplKf2dZ2zQM4MYalN+xJ52DZeAWTpIUIprT0YtD7hwEb+TQ==", + "version": "4.16.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.16.4.tgz", + "integrity": "sha512-5Q3s1HFkWkbJTeEBdJkmx7yvh0oU7+OOOvN9FarRgZcVR9eRhY3oWdiodPsS3LjGuP77Xq7GBpku8vNrnksmyg==", "requires": { - "@patternfly/react-core": "^4.168.8", - "@patternfly/react-icons": "^4.19.8", - "@patternfly/react-styles": "^4.18.8", + "@patternfly/react-core": "^4.175.4", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-styles": "^4.25.4", "react-dropzone": "9.0.0", "tslib": "^2.0.0" } }, "@patternfly/react-core": { - "version": "4.168.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.168.8.tgz", - "integrity": "sha512-wfG52saibeAXRoBYytzMgVGANoInbPuhUK0y6AynVp3/QKAPCKHpaI4nCh9ytNZ+UjiT2KGOcunhavsOw5+iMA==", + "version": "4.175.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.175.4.tgz", + "integrity": "sha512-bnQhvXKbprni5WhlbMI+nbYxwMR03bFZtUk+F7JiLM96uk/yCrPjUes6u8Pbgkh/HhsRYx8K1kx84WmC+MyD5w==", "requires": { - "@patternfly/react-icons": "^4.19.8", - "@patternfly/react-styles": "^4.18.8", - "@patternfly/react-tokens": "^4.20.8", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-styles": "^4.25.4", + "@patternfly/react-tokens": "^4.27.4", "focus-trap": "6.2.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", @@ -24083,33 +24083,33 @@ } }, "@patternfly/react-icons": { - "version": "4.19.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.19.8.tgz", - "integrity": "sha512-JBBcVntRLspe857JnGo8lFaZfy+WOR/IYe2E9W3Rknqm1T8WO6oXpeEnrr5r9bpYDFUa4ttcb/acuQXc1xypxg==", + "version": "4.26.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.26.4.tgz", + "integrity": "sha512-h1NJixtNVK+nYxLON3HOO0xguA9qXQ5rkGUo4TZJ/kRehFCJMH8PPeebdOAKgAo38NjS2/06+atNKjDRl6zYcA==", "requires": {} }, "@patternfly/react-styles": { - "version": "4.18.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.18.8.tgz", - "integrity": "sha512-136N/Whs0qXDtPpsh5JeNJld5BeFPsbmmcgI5LlMQ+P9dioddh24rTqaaOIea67tHiXUB7orxaqKpBBILXqcPQ==" + "version": "4.25.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.25.4.tgz", + "integrity": "sha512-GHFLzsvyimymkGTTyTW8HZDlhYbGpCqw/69Se1EHCaZnbTYluiJMRI6YfNTRC5ZvYF+x4GMAG5AjwQ5LfbZ/xg==" }, "@patternfly/react-table": { - "version": "4.37.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.37.8.tgz", - "integrity": "sha512-DEaRooSGgfauX5RV3rwNcc9ZgMzR7gcCxsn9V7oNz6UsBgAV5cL7leGdAETdcV/B2+JMmGb+6QPjc54lsvwiuQ==", + "version": "4.44.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.44.4.tgz", + "integrity": "sha512-UV2kq4OV1v6Hv2TXvvsEApPwbAyD6zvurvl0/BZoqqEHTWVQedG0m1jUN9jFMTJiD4GTESvg6TAcSowGkJlTug==", "requires": { - "@patternfly/react-core": "^4.168.8", - "@patternfly/react-icons": "^4.19.8", - "@patternfly/react-styles": "^4.18.8", - "@patternfly/react-tokens": "^4.20.8", + "@patternfly/react-core": "^4.175.4", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-styles": "^4.25.4", + "@patternfly/react-tokens": "^4.27.4", "lodash": "^4.17.19", "tslib": "^2.0.0" } }, "@patternfly/react-tokens": { - "version": "4.20.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.20.8.tgz", - "integrity": "sha512-OFlgTknFBNAETWVYYoLdISJBjPMQ8e3tcLpWb3h/KgKk/Tn1NR+P7Pl1gQGvTL/9liBZfS/HKDD5+P8c70w+2Q==" + "version": "4.27.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.27.4.tgz", + "integrity": "sha512-+DVCp4edPwORQF2zH6aG8e7FhLBXKsZgxMEYBU1/3qQSp+gf6Q8M4HiqbNnR6uo99tYJ9JiEcbGZu4Mx+nDIuA==" }, "@rollup/plugin-commonjs": { "version": "16.0.0", diff --git a/package.json b/package.json index 55535368f8..a683002101 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,11 @@ }, "dependencies": { "@keycloak/keycloak-admin-client": "^16.0.0-dev.48", - "@patternfly/patternfly": "^4.151.4", - "@patternfly/react-code-editor": "^4.9.8", - "@patternfly/react-core": "^4.168.8", - "@patternfly/react-icons": "4.19.8", - "@patternfly/react-table": "^4.37.8", + "@patternfly/patternfly": "^4.159.1", + "@patternfly/react-code-editor": "^4.16.4", + "@patternfly/react-core": "^4.175.4", + "@patternfly/react-icons": "^4.26.4", + "@patternfly/react-table": "^4.44.4", "dagre": "^0.8.5", "file-saver": "^2.0.5", "i18next": "^21.4.2", diff --git a/src/components/json-file-upload/FileUploadForm.tsx b/src/components/json-file-upload/FileUploadForm.tsx index 4bb29a1cd3..9b288e81b3 100644 --- a/src/components/json-file-upload/FileUploadForm.tsx +++ b/src/components/json-file-upload/FileUploadForm.tsx @@ -49,14 +49,11 @@ export const FileUploadForm = ({ }; const [fileUpload, setFileUpload] = useState(defaultUpload); const removeDialog = () => setFileUpload({ ...fileUpload, modal: false }); - const handleChange = ( - value: string | File, - filename: string, - event: - | React.DragEvent - | React.ChangeEvent - | React.MouseEvent - ): void => { + const handleChange: FileUploadProps["onChange"] = ( + value, + filename, + event + ) => { if ( event.nativeEvent instanceof MouseEvent && !(event.nativeEvent instanceof DragEvent) @@ -150,7 +147,7 @@ export const FileUploadForm = ({ language={language} height="128px" onChange={(value, event) => - handleChange(value ?? "", fileUpload.filename, event) + handleChange(value, fileUpload.filename, event as any) } />