From e9bf71a9257072347a5cc3d7ca69a2e9f6a44252 Mon Sep 17 00:00:00 2001 From: macpro-snyk-service-account <155584529+macpro-snyk-service-account@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:45:26 -0500 Subject: [PATCH 1/2] fix: upgrade @aws-sdk/client-s3 from 3.679.0 to 3.682.0 (#860) Snyk has created this PR to upgrade @aws-sdk/client-s3 from 3.679.0 to 3.682.0. See this package in npm: @aws-sdk/client-s3 See this project in Snyk: https://app.snyk.io/org/macpro-macpro/project/11edb9d2-770d-47a9-970d-58701c9ea018?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- .../clamav-scanning/package-lock.json | 124 +++++++++--------- .../clamav-scanning/package.json | 2 +- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/lib/local-constructs/clamav-scanning/package-lock.json b/lib/local-constructs/clamav-scanning/package-lock.json index 8bb24ffc4a..d17b946081 100644 --- a/lib/local-constructs/clamav-scanning/package-lock.json +++ b/lib/local-constructs/clamav-scanning/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@aws-sdk/client-s3": "^3.679.0", + "@aws-sdk/client-s3": "^3.682.0", "@types/mime-types": "^2.1.4", "file-type": "^19.6.0", "mime-types": "^2.1.35", @@ -214,34 +214,34 @@ } }, "node_modules/@aws-sdk/client-s3": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.679.0.tgz", - "integrity": "sha512-P93tUbJXiDtSPgBfFpnjaijLV38hyPlE3g0XybsPTmSYNV6A9Jt1TUIF6vX+o6LdFuq3FerCiagUjhfDANWkAw==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.682.0.tgz", + "integrity": "sha512-gn8yPhOmExhqRENnR/vKvsbTw9jaRPbfNE8fQ2j91ejXhpj632QDNdobY8TxxPm2UEW2ISAVM55r2/UPl0YP1Q==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha1-browser": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.679.0", - "@aws-sdk/client-sts": "3.679.0", + "@aws-sdk/client-sso-oidc": "3.682.0", + "@aws-sdk/client-sts": "3.682.0", "@aws-sdk/core": "3.679.0", - "@aws-sdk/credential-provider-node": "3.679.0", + "@aws-sdk/credential-provider-node": "3.682.0", "@aws-sdk/middleware-bucket-endpoint": "3.679.0", "@aws-sdk/middleware-expect-continue": "3.679.0", - "@aws-sdk/middleware-flexible-checksums": "3.679.0", + "@aws-sdk/middleware-flexible-checksums": "3.682.0", "@aws-sdk/middleware-host-header": "3.679.0", "@aws-sdk/middleware-location-constraint": "3.679.0", "@aws-sdk/middleware-logger": "3.679.0", "@aws-sdk/middleware-recursion-detection": "3.679.0", - "@aws-sdk/middleware-sdk-s3": "3.679.0", + "@aws-sdk/middleware-sdk-s3": "3.682.0", "@aws-sdk/middleware-ssec": "3.679.0", - "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", "@aws-sdk/region-config-resolver": "3.679.0", - "@aws-sdk/signature-v4-multi-region": "3.679.0", + "@aws-sdk/signature-v4-multi-region": "3.682.0", "@aws-sdk/types": "3.679.0", "@aws-sdk/util-endpoints": "3.679.0", "@aws-sdk/util-user-agent-browser": "3.679.0", - "@aws-sdk/util-user-agent-node": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@aws-sdk/xml-builder": "3.679.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", @@ -283,9 +283,9 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.679.0.tgz", - "integrity": "sha512-/0cAvYnpOZTo/Y961F1kx2fhDDLUYZ0SQQ5/75gh3xVImLj7Zw+vp74ieqFbqWLYGMaq8z1Arr9A8zG95mbLdg==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz", + "integrity": "sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", @@ -294,12 +294,12 @@ "@aws-sdk/middleware-host-header": "3.679.0", "@aws-sdk/middleware-logger": "3.679.0", "@aws-sdk/middleware-recursion-detection": "3.679.0", - "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", "@aws-sdk/region-config-resolver": "3.679.0", "@aws-sdk/types": "3.679.0", "@aws-sdk/util-endpoints": "3.679.0", "@aws-sdk/util-user-agent-browser": "3.679.0", - "@aws-sdk/util-user-agent-node": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -332,24 +332,24 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.679.0.tgz", - "integrity": "sha512-/dBYWcCwbA/id4sFCIVZvf0UsvzHCC68SryxeNQk/PDkY9N4n5yRcMUkZDaEyQCjowc3kY4JOXp2AdUP037nhA==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz", + "integrity": "sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", "@aws-sdk/core": "3.679.0", - "@aws-sdk/credential-provider-node": "3.679.0", + "@aws-sdk/credential-provider-node": "3.682.0", "@aws-sdk/middleware-host-header": "3.679.0", "@aws-sdk/middleware-logger": "3.679.0", "@aws-sdk/middleware-recursion-detection": "3.679.0", - "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", "@aws-sdk/region-config-resolver": "3.679.0", "@aws-sdk/types": "3.679.0", "@aws-sdk/util-endpoints": "3.679.0", "@aws-sdk/util-user-agent-browser": "3.679.0", - "@aws-sdk/util-user-agent-node": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -381,29 +381,29 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.679.0" + "@aws-sdk/client-sts": "^3.682.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.679.0.tgz", - "integrity": "sha512-3CvrT8w1RjFu1g8vKA5Azfr5V83r2/b68Ock43WE003Bq/5Y38mwmYX7vk0fPHzC3qejt4YMAWk/C3fSKOy25g==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz", + "integrity": "sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.679.0", + "@aws-sdk/client-sso-oidc": "3.682.0", "@aws-sdk/core": "3.679.0", - "@aws-sdk/credential-provider-node": "3.679.0", + "@aws-sdk/credential-provider-node": "3.682.0", "@aws-sdk/middleware-host-header": "3.679.0", "@aws-sdk/middleware-logger": "3.679.0", "@aws-sdk/middleware-recursion-detection": "3.679.0", - "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", "@aws-sdk/region-config-resolver": "3.679.0", "@aws-sdk/types": "3.679.0", "@aws-sdk/util-endpoints": "3.679.0", "@aws-sdk/util-user-agent-browser": "3.679.0", - "@aws-sdk/util-user-agent-node": "3.679.0", + "@aws-sdk/util-user-agent-node": "3.682.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -495,16 +495,16 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.679.0.tgz", - "integrity": "sha512-Rg7t8RwUzKcumpipG4neZqaeJ6DF+Bco1+FHn5BZB68jpvwvjBjcQUuWkxj18B6ctYHr1fkunnzeKEn/+vy7+w==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz", + "integrity": "sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/core": "3.679.0", "@aws-sdk/credential-provider-env": "3.679.0", "@aws-sdk/credential-provider-http": "3.679.0", "@aws-sdk/credential-provider-process": "3.679.0", - "@aws-sdk/credential-provider-sso": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.682.0", "@aws-sdk/credential-provider-web-identity": "3.679.0", "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", @@ -517,20 +517,20 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.679.0" + "@aws-sdk/client-sts": "^3.682.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.679.0.tgz", - "integrity": "sha512-E3lBtaqCte8tWs6Rkssc8sLzvGoJ10TLGvpkijOlz43wPd6xCRh1YLwg6zolf9fVFtEyUs/GsgymiASOyxhFtw==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz", + "integrity": "sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-provider-env": "3.679.0", "@aws-sdk/credential-provider-http": "3.679.0", - "@aws-sdk/credential-provider-ini": "3.679.0", + "@aws-sdk/credential-provider-ini": "3.682.0", "@aws-sdk/credential-provider-process": "3.679.0", - "@aws-sdk/credential-provider-sso": "3.679.0", + "@aws-sdk/credential-provider-sso": "3.682.0", "@aws-sdk/credential-provider-web-identity": "3.679.0", "@aws-sdk/types": "3.679.0", "@smithy/credential-provider-imds": "^3.2.4", @@ -561,12 +561,12 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.679.0.tgz", - "integrity": "sha512-SAtWonhi9asxn0ukEbcE81jkyanKgqpsrtskvYPpO9Z9KOednM4Cqt6h1bfcS9zaHjN2zu815Gv8O7WiV+F/DQ==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz", + "integrity": "sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.679.0", + "@aws-sdk/client-sso": "3.682.0", "@aws-sdk/core": "3.679.0", "@aws-sdk/token-providers": "3.679.0", "@aws-sdk/types": "3.679.0", @@ -632,9 +632,9 @@ } }, "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.679.0.tgz", - "integrity": "sha512-2Nf3rnrcog3GRRdXxc623wkQPH3WXhz8oZ+KHuXBeBKX01zbp7bz22QAZKqw3Oo2lv+LQNEDzIfQYn7leXLZGQ==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.682.0.tgz", + "integrity": "sha512-5u1STth6iZUtAvPDO0NJVYKUX2EYKU7v84MYYaZ3O27HphRjFqDos0keL2KTnHn/KmMD68rM3yiUareWR8hnAQ==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/crc32": "5.2.0", @@ -712,9 +712,9 @@ } }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.679.0.tgz", - "integrity": "sha512-4zcT193F7RkEfqlS6ZdwyNQ0UUp9s66msNXgItugasTbjf7oqfWDas7N+BG8ADB/Ql3wvRUh9I+zdrVkxxw3BQ==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.682.0.tgz", + "integrity": "sha512-Tqndx8elRD4xDR8f5Cng6jpZ/odcm1ZTOtGRFMzHgOCij4BeMf4+/+ecQScobcrAZpUTCUTCzaTvdCdJw8MYJA==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/core": "3.679.0", @@ -751,9 +751,9 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.679.0.tgz", - "integrity": "sha512-4hdeXhPDURPqQLPd9jCpUEo9fQITXl3NM3W1MwcJpE0gdUM36uXkQOYsTPeeU/IRCLVjK8Htlh2oCaM9iJrLCA==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz", + "integrity": "sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/core": "3.679.0", @@ -786,12 +786,12 @@ } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.679.0.tgz", - "integrity": "sha512-g1D57e7YBhgXihCWIRBcTUvKquS3FS27xuA24EynY9teiTIq7vHkASxxDnMMMcmKHnCKLI5pkznjk0PuDJ4uJw==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.682.0.tgz", + "integrity": "sha512-y7RAQSCb9pH8wCX5We9UXfiqPVwBLLvSljhuXC31mibHmYaZnpNEwHiQlRNQPblyaNpiKnXXQ0H3Ns3FDyDYdQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-sdk-s3": "3.679.0", + "@aws-sdk/middleware-sdk-s3": "3.682.0", "@aws-sdk/types": "3.679.0", "@smithy/protocol-http": "^4.1.4", "@smithy/signature-v4": "^4.2.0", @@ -885,12 +885,12 @@ } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.679.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.679.0.tgz", - "integrity": "sha512-Bw4uXZ+NU5ed6TNfo4tBbhBSW+2eQxXYjYBGl5gLUNUpg2pDFToQAP6rXBFiwcG52V2ny5oLGiD82SoYuYkAVg==", + "version": "3.682.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz", + "integrity": "sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.679.0", + "@aws-sdk/middleware-user-agent": "3.682.0", "@aws-sdk/types": "3.679.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", diff --git a/lib/local-constructs/clamav-scanning/package.json b/lib/local-constructs/clamav-scanning/package.json index a0d6bb6841..fa66a6488c 100644 --- a/lib/local-constructs/clamav-scanning/package.json +++ b/lib/local-constructs/clamav-scanning/package.json @@ -19,7 +19,7 @@ "esbuild": "^0.21.5" }, "dependencies": { - "@aws-sdk/client-s3": "^3.679.0", + "@aws-sdk/client-s3": "^3.682.0", "@types/mime-types": "^2.1.4", "file-type": "^19.6.0", "mime-types": "^2.1.35", From fe1969161608f294f7223f04bbaf8cc66a439e7f Mon Sep 17 00:00:00 2001 From: asharonbaltazar <58940073+asharonbaltazar@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:14:39 -0500 Subject: [PATCH 2/2] fix(ui): `val` fixes for Temporary Extension (#863) * fix: swap `waiverId` and `authority` * chore: add test for label/value order * fix: re-add missing `defaultValues` --- .../waiver/temporary-extension/index.tsx | 12 +++++++++-- .../temporary-extension.test.tsx | 21 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/react-app/src/features/forms/waiver/temporary-extension/index.tsx b/react-app/src/features/forms/waiver/temporary-extension/index.tsx index 73535ddf7a..9f8d501748 100644 --- a/react-app/src/features/forms/waiver/temporary-extension/index.tsx +++ b/react-app/src/features/forms/waiver/temporary-extension/index.tsx @@ -36,7 +36,7 @@ export const TemporaryExtensionForm = () => { {submission ? (

Approved Initial or Renewal Waiver Number

-

{submission._source.authority}

+

{waiverId}

) : ( { {waiverId && submission ? (

Temporary Extension Type

-

{waiverId}

+

{submission._source.authority}

) : ( { /> )} + defaultValues={{ + ids: { + validAuthority: { + authority: submission?._source?.authority ?? "", + waiverNumber: waiverId ?? "", + }, + }, + }} attachments={{ faqLink: getFAQLinkForAttachments("temporary-extension"), }} diff --git a/react-app/src/features/forms/waiver/temporary-extension/temporary-extension.test.tsx b/react-app/src/features/forms/waiver/temporary-extension/temporary-extension.test.tsx index c47ede106e..f6439fa968 100644 --- a/react-app/src/features/forms/waiver/temporary-extension/temporary-extension.test.tsx +++ b/react-app/src/features/forms/waiver/temporary-extension/temporary-extension.test.tsx @@ -19,11 +19,24 @@ describe("Temporary Extension", () => { renderFormWithPackageSection(); // "Medicaid SPA" comes from `useGetItem` in testing/setup.ts - const waiverNumberLabel = screen.getByText("Medicaid SPA"); - const existentIdLabel = screen.getByText(/Temporary Extension Type/); + const temporaryExtensionLabel = screen.getByText(/Temporary Extension Type/); + const temporaryExtensionValue = screen.getByText("Medicaid SPA"); - expect(waiverNumberLabel).toBeInTheDocument(); - expect(existentIdLabel).toBeInTheDocument(); + // ensure Temporary Extension label and value exist and are in correct order + expect(temporaryExtensionLabel.compareDocumentPosition(temporaryExtensionValue)).toBe( + Node.DOCUMENT_POSITION_FOLLOWING, + ); + + const approvedInitialAndRenewalLabel = screen.getByText( + "Approved Initial or Renewal Waiver Number", + ); + // grab second 12345 (first one is in the breadcrumbs) + const approvedInitialAndRenewalValue = screen.getAllByText(/12345/)[1]; + + // ensure Approved Initial and Renewal label and value exist and are in correct order + expect( + approvedInitialAndRenewalLabel.compareDocumentPosition(approvedInitialAndRenewalValue), + ).toBe(Node.DOCUMENT_POSITION_FOLLOWING); }); test("TEMPORARY EXTENSION TYPE", async () => {