From e527862a4bdf1f1f1fbd379cfc25fba417a10b90 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT <90332175+VineetBala-AOT@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:55:49 -0700 Subject: [PATCH] Upgrade met-web to axios version 0.28.0 from 0.26.1 (#2451) * Upgrade met-web to axios version 0.28.0 from 0.26.1 --- CHANGELOG.MD | 3 ++ met-web/package-lock.json | 34 +++++++++++++------ met-web/package.json | 2 +- .../UserManagement/AddTeamMemberModal.tsx | 4 +-- .../userManagement/listing/AddUserModal.tsx | 4 +-- .../listing/AssignRoleModal.tsx | 4 +-- .../userDetails/AddToEngagement.tsx | 4 +-- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index bceb22198..8f32cbdad 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -3,6 +3,9 @@ - **Bugfix**: Submission of rejected comments [🎟️ DESENG-527](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-527) - Fixed issue where resubmitted comments would not reappear in the queue for approval. - Added unit tests to ensure the issue does not reoccur. +- **Task**: MET - Clean up outstanding dependabot PRs [DESENG-535](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-535) + - Bump axios from 0.26.1 to 0.28.0 in met-web. Dependabot suggested this upgrade, but it required a few minor code changes. + - Updated the type definition of the 'error' parameter to include a generic type '{ message?: string }' to handle the AxiosError response properly. ## April 05, 2024 diff --git a/met-web/package-lock.json b/met-web/package-lock.json index 3afd5313f..fe85d6d93 100644 --- a/met-web/package-lock.json +++ b/met-web/package-lock.json @@ -37,7 +37,7 @@ "@types/react-dom": "^18.0.2", "@types/react-draft-wysiwyg": "^1.13.4", "@types/react-redux": "^7.1.24", - "axios": "^0.26.1", + "axios": "^0.28.0", "date-fns": "^2.28.0", "date-fns-tz": "^1.3.4", "dayjs": "^1.11.6", @@ -8493,11 +8493,13 @@ } }, "node_modules/axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz", + "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==", "dependencies": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/axobject-query": { @@ -13366,7 +13368,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -20447,6 +20448,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -32480,11 +32486,13 @@ "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==" }, "axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz", + "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==", "requires": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "axobject-query": { @@ -36185,7 +36193,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -41277,6 +41284,11 @@ } } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", diff --git a/met-web/package.json b/met-web/package.json index efa4ed293..d2126f2ae 100644 --- a/met-web/package.json +++ b/met-web/package.json @@ -32,7 +32,7 @@ "@types/react-dom": "^18.0.2", "@types/react-draft-wysiwyg": "^1.13.4", "@types/react-redux": "^7.1.24", - "axios": "^0.26.1", + "axios": "^0.28.0", "date-fns": "^2.28.0", "date-fns-tz": "^1.3.4", "dayjs": "^1.11.6", diff --git a/met-web/src/components/engagement/form/EngagementFormTabs/UserManagement/AddTeamMemberModal.tsx b/met-web/src/components/engagement/form/EngagementFormTabs/UserManagement/AddTeamMemberModal.tsx index ea27d66ad..45d37f40a 100644 --- a/met-web/src/components/engagement/form/EngagementFormTabs/UserManagement/AddTeamMemberModal.tsx +++ b/met-web/src/components/engagement/form/EngagementFormTabs/UserManagement/AddTeamMemberModal.tsx @@ -84,11 +84,11 @@ export const AddTeamMemberModal = () => { }, 1000), ).current; - const setErrors = (error: AxiosError) => { + const setErrors = (error: AxiosError<{ message?: string }>) => { if (error.response?.status !== 409) { return; } - setBackendError(error.response?.data.message || ''); + setBackendError(error.response?.data?.message || ''); }; const onSubmit: SubmitHandler = async (data: AddTeamMemberForm) => { diff --git a/met-web/src/components/userManagement/listing/AddUserModal.tsx b/met-web/src/components/userManagement/listing/AddUserModal.tsx index 8031103b0..b89c42b8b 100644 --- a/met-web/src/components/userManagement/listing/AddUserModal.tsx +++ b/met-web/src/components/userManagement/listing/AddUserModal.tsx @@ -106,11 +106,11 @@ export const AddUserModal = () => { ); }; - const setErrors = (error: AxiosError) => { + const setErrors = (error: AxiosError<{ message?: string }>) => { if (error.response?.status !== 409) { return; } - setBackendError(error.response?.data.message || ''); + setBackendError(error.response?.data?.message || ''); }; const onSubmit: SubmitHandler = async (data: AddUserForm) => { diff --git a/met-web/src/components/userManagement/listing/AssignRoleModal.tsx b/met-web/src/components/userManagement/listing/AssignRoleModal.tsx index 0ed70da3b..e24dac9e0 100644 --- a/met-web/src/components/userManagement/listing/AssignRoleModal.tsx +++ b/met-web/src/components/userManagement/listing/AssignRoleModal.tsx @@ -86,11 +86,11 @@ export const AssignRoleModal = () => { setBackendError(''); }; - const setErrors = (error: AxiosError) => { + const setErrors = (error: AxiosError<{ message?: string }>) => { if (error.response?.status !== 409) { return; } - setBackendError(error.response?.data.message || ''); + setBackendError(error.response?.data?.message || ''); }; const loadEngagements = async (searchText: string) => { diff --git a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx index c1769e9e3..980345066 100644 --- a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx +++ b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx @@ -157,11 +157,11 @@ export const AddToEngagementModal = () => { getUserMemberships(); }; - const setErrors = (error: AxiosError) => { + const setErrors = (error: AxiosError<{ message?: string }>) => { if (error.response?.status !== HTTP_STATUS_CODES.CONFLICT) { return; } - setBackendError(error.response?.data.message || ''); + setBackendError(error.response?.data?.message || ''); }; const onSubmit: SubmitHandler = async (data: AddUserForm) => {