From b10608688dfd796d8265318630fbcf4ae463dbbe Mon Sep 17 00:00:00 2001 From: Nisarg Vadgama <31422051+ngunner15@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:53:21 -0800 Subject: [PATCH 1/3] feat: 1725 wcag standards collection (#1803) --- .../SeedlotRegistrationSteps/CollectionStep/index.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/components/SeedlotRegistrationSteps/CollectionStep/index.tsx b/frontend/src/components/SeedlotRegistrationSteps/CollectionStep/index.tsx index 24f25f983..4e2148be9 100644 --- a/frontend/src/components/SeedlotRegistrationSteps/CollectionStep/index.tsx +++ b/frontend/src/components/SeedlotRegistrationSteps/CollectionStep/index.tsx @@ -193,6 +193,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => { helperText={isReview ? null : fieldsConfig.startDate.helperText} invalid={state.startDate.isInvalid} invalidText={fieldsConfig.startDate.invalidText} + aria-invalid={state.startDate.isInvalid ? 'true' : 'false'} size="md" autoComplete="off" /> @@ -218,6 +219,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => { helperText={isReview ? null : fieldsConfig.endDate.helperText} invalid={state.endDate.isInvalid} invalidText={fieldsConfig.endDate.invalidText} + aria-invalid={state.endDate.isInvalid ? 'true' : 'false'} size="md" autoComplete="off" /> @@ -235,6 +237,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => { readOnly={isFormSubmitted && !isReview} invalid={state.numberOfContainers.isInvalid} invalidText={fieldsConfig.numberOfContainers.invalidText} + aria-invalid={state.numberOfContainers.isInvalid ? 'true' : 'false'} onWheel={(e: React.ChangeEvent) => e.target.blur()} onChange={(e: React.ChangeEvent) => { handleContainerNumAndVol(true, e.target.value); @@ -251,6 +254,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => { readOnly={isFormSubmitted && !isReview} invalid={state.volumePerContainers.isInvalid} invalidText={fieldsConfig.volumePerContainers.invalidText} + aria-invalid={state.volumePerContainers.isInvalid ? 'true' : 'false'} onWheel={(e: React.ChangeEvent) => e.target.blur()} onChange={(e: React.ChangeEvent) => { handleContainerNumAndVol(false, e.target.value); @@ -272,6 +276,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => { warn={isCalcWrong} readOnly={isFormSubmitted && !isReview} warnText={fieldsConfig.volumeOfCones.warnText} + aria-invalid={state.volumeOfCones.isInvalid ? 'true' : 'false'} onWheel={(e: React.ChangeEvent) => e.target.blur()} onChange={(e: React.ChangeEvent) => { handleVolOfCones(e.target.value); From d3cc2bb6c7aa3b53ae1e2f670693a182c01f2687 Mon Sep 17 00:00:00 2001 From: mgaseta <105936322+mgaseta@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:39:23 -0300 Subject: [PATCH 2/3] fix: 1781 ownership percentage and client number acronym anomalies in migrated data (#1802) --- .../Seedlot/ContextContainerClassA/context.tsx | 2 ++ .../Seedlot/ContextContainerClassA/index.tsx | 16 ++++++++++++++++ .../Seedlot/ContextContainerClassA/utils.ts | 8 +++++--- .../Seedlot/SeedlotRegFormClassA/RegPage.tsx | 7 +++++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/Seedlot/ContextContainerClassA/context.tsx b/frontend/src/views/Seedlot/ContextContainerClassA/context.tsx index 24cdf58cf..455575511 100644 --- a/frontend/src/views/Seedlot/ContextContainerClassA/context.tsx +++ b/frontend/src/views/Seedlot/ContextContainerClassA/context.tsx @@ -59,6 +59,7 @@ export type ClassAContextType = { updateProgressStatus: (currentStepNum: number, prevStepNum: number) => void, saveProgressStatus: MutationStatusType, isFetchingData: boolean, + seedlotDataLoaded: boolean, genWorthInfoItems: Record, setGenWorthInfoItems: React.Dispatch< React.SetStateAction> @@ -108,6 +109,7 @@ const ClassAContext = createContext({ updateProgressStatus: (currentStepNum: number, prevStepNum: number) => { }, saveProgressStatus: 'idle', isFetchingData: false, + seedlotDataLoaded: false, geoInfoVals: {} as GeoInfoValType, genWorthVals: {} as GenWorthValType, setGenWorthVal: () => { }, diff --git a/frontend/src/views/Seedlot/ContextContainerClassA/index.tsx b/frontend/src/views/Seedlot/ContextContainerClassA/index.tsx index 4041ee47d..d3de6cc32 100644 --- a/frontend/src/views/Seedlot/ContextContainerClassA/index.tsx +++ b/frontend/src/views/Seedlot/ContextContainerClassA/index.tsx @@ -380,6 +380,21 @@ const ContextContainerClassA = ({ children }: props) => { getAllSeedlotInfoQuery.fetchStatus ]); + const [seedlotDataLoaded, setSeedlotDataLoaded] = useState(false); + + useEffect(() => { + const emptySeedlotData = initEmptySteps(); + if ( + getAllSeedlotInfoQuery.status === 'success' + && allStepData !== emptySeedlotData + ) { + setSeedlotDataLoaded(true); + } + }, [ + getAllSeedlotInfoQuery.status, + allStepData + ]); + /** * Update the progress indicator status */ @@ -765,6 +780,7 @@ const ContextContainerClassA = ({ children }: props) => { || fundingSourcesQuery.isFetching || getFormDraftQuery.isFetching ), + seedlotDataLoaded, genWorthInfoItems, setGenWorthInfoItems, weightedGwInfoItems, diff --git a/frontend/src/views/Seedlot/ContextContainerClassA/utils.ts b/frontend/src/views/Seedlot/ContextContainerClassA/utils.ts index 590b51f1f..6b340e639 100644 --- a/frontend/src/views/Seedlot/ContextContainerClassA/utils.ts +++ b/frontend/src/views/Seedlot/ContextContainerClassA/utils.ts @@ -119,12 +119,13 @@ export const initOwnershipState = ( defaultAgencyNumber: string, ownersStepData: Array, methodsOfPayment?: Array, - fundingSource?: Array + fundingSource?: Array, + initLoaded?: boolean ): Array => { const seedlotOwners: Array = ownersStepData.map((curOwner, index) => { const ownerState = createOwnerTemplate(index, curOwner); - ownerState.ownerAgency.value = defaultAgencyNumber; + ownerState.ownerAgency.value = initLoaded ? curOwner.ownerClientNumber : defaultAgencyNumber; ownerState.ownerCode.value = curOwner.ownerLocnCode; if (methodsOfPayment && methodsOfPayment.length > 0) { @@ -1120,7 +1121,8 @@ export const resDataToState = ( defaultAgencyNumber, fullFormData.seedlotFormOwnershipDtoList, methodsOfPaymentData, - fundingSourcesData + fundingSourcesData, + true ), interimStep: initInterimState( fullFormData.seedlotFormInterimDto.intermStrgClientNumber, diff --git a/frontend/src/views/Seedlot/SeedlotRegFormClassA/RegPage.tsx b/frontend/src/views/Seedlot/SeedlotRegFormClassA/RegPage.tsx index 2d01bb809..a26f2eece 100644 --- a/frontend/src/views/Seedlot/SeedlotRegFormClassA/RegPage.tsx +++ b/frontend/src/views/Seedlot/SeedlotRegFormClassA/RegPage.tsx @@ -53,7 +53,9 @@ const RegPage = () => { seedlotData, getFormDraftQuery, seedlotSpecies, - popSizeAndDiversityConfig + popSizeAndDiversityConfig, + isFormSubmitted, + seedlotDataLoaded } = useContext(ClassAContext); const reloadFormDraft = () => getFormDraftQuery.refetch(); @@ -171,7 +173,8 @@ const RegPage = () => { { - isFetchingData || submitSeedlot.status === 'loading' + (isFetchingData || submitSeedlot.status === 'loading') + || (isFormSubmitted && !seedlotDataLoaded) ? : ( Date: Fri, 10 Jan 2025 15:46:19 -0800 Subject: [PATCH 3/3] feat: 1564 upgrade carbon (#1808) Co-authored-by: Xiao Peng Co-authored-by: mgaseta <105936322+mgaseta@users.noreply.github.com> --- frontend/package-lock.json | 118 +++++++++++++++---------------------- frontend/package.json | 8 +-- 2 files changed, 51 insertions(+), 75 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 544590408..0da1daeb1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -13,16 +13,16 @@ "@babel/plugin-syntax-flow": "^7.22.5", "@babel/plugin-transform-react-jsx": "^7.22.15", "@bcgov-nr/nr-theme": "^1.4.1", - "@carbon/icons-react": "^11.9.0", - "@carbon/pictograms-react": "^11.38.0", - "@carbon/react": "^1.22.0", + "@carbon/icons-react": "^11.53.0", + "@carbon/pictograms-react": "^11.70.0", + "@carbon/react": "^1.73.0", "@tanstack/react-query": "^4.36.1", "@tanstack/react-query-devtools": "^4.29.1", "@testing-library/dom": "^10.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@tsconfig/node18": "^18.0.0", - "@types/carbon-components-react": "^7.55.2", + "@types/carbon-components-react": "^7.55.13", "@types/luxon": "^3.4.2", "@types/react-beforeunload": "^2.1.5", "@types/react-dom": "^18.0.11", @@ -8149,7 +8149,6 @@ "resolved": "https://registry.npmjs.org/@carbon/colors/-/colors-11.28.0.tgz", "integrity": "sha512-zmNJk5Ec453aL3bk9RRSmM+dkVbyVMvUuKd6szJCOWLoqBFBXbd3PDRZO0AZeHp/Iel9sBRf1gUYej1BJ/5+hw==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@ibm/telemetry-js": "^1.5.0" } @@ -8159,17 +8158,15 @@ "resolved": "https://registry.npmjs.org/@carbon/feature-flags/-/feature-flags-0.24.0.tgz", "integrity": "sha512-GQEeXnfmnAtGVfKHSwJoJUsZ8YXAMKgL1TkJf2cUVuHYFk2WScHvCx7SUTDFJKLalGB+QnZPNuFLZ5oapsuwPw==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@ibm/telemetry-js": "^1.5.0" } }, "node_modules/@carbon/grid": { - "version": "11.29.0", - "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.29.0.tgz", - "integrity": "sha512-SAJhTexN6TjbItcUczOqhzgHBGXLhvUhlTdyqj+wzUH0tqEN8g6gLp+1sn9+rL+kV4obSb/7bdSESZtwQr/tQg==", + "version": "11.30.0", + "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.30.0.tgz", + "integrity": "sha512-HgeAJqh8Ln7d/HGe8Aw/bxHDQJbJSLxnVol3CwaJ1lRoZscUlFCZgrH60OVvUGXgH6yoUojKkyFovryZ8zxIdw==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@carbon/layout": "^11.28.0", "@ibm/telemetry-js": "^1.5.0" @@ -8205,7 +8202,6 @@ "resolved": "https://registry.npmjs.org/@carbon/layout/-/layout-11.28.0.tgz", "integrity": "sha512-Yl0Dsxs00EgAaCKpZCXgebuf9BwiBK66a1Oiao6D12p3ViciZ4L18mlRgOPBcDlolP2tUtncz48TlfkWC097hQ==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@ibm/telemetry-js": "^1.5.0" } @@ -8215,17 +8211,15 @@ "resolved": "https://registry.npmjs.org/@carbon/motion/-/motion-11.24.0.tgz", "integrity": "sha512-JtsSQ3DgVqZXpOdKthetUi5Tp94jkWffgxgrEylbNYErITNt7PeSF6YTXnqtSldk/dUCBkfD1kXkfH1NAxrr1w==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@ibm/telemetry-js": "^1.5.0" } }, "node_modules/@carbon/pictograms-react": { - "version": "11.69.0", - "resolved": "https://registry.npmjs.org/@carbon/pictograms-react/-/pictograms-react-11.69.0.tgz", - "integrity": "sha512-4ASRxD/h2OqvHpXmW4OHWWXshu3pFjb+ZXLgK3YvjY8Iozo4uPuMQqekefEyJfKj0T0BqGlozVFD0uHSbbl1vg==", + "version": "11.70.0", + "resolved": "https://registry.npmjs.org/@carbon/pictograms-react/-/pictograms-react-11.70.0.tgz", + "integrity": "sha512-BDjb/KxpaFP/Ct8iWL72eS4QGbVnUJoCDvTNZPOzdODmEXDgjJ/b4bYCpIqtZa9YFqHHjOYXc25FYzELJKXQUg==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@carbon/icon-helpers": "^10.54.0", "@ibm/telemetry-js": "^1.5.0", @@ -8236,27 +8230,24 @@ } }, "node_modules/@carbon/react": { - "version": "1.72.0", - "resolved": "https://registry.npmjs.org/@carbon/react/-/react-1.72.0.tgz", - "integrity": "sha512-cQdf7EDeu7E4fTjP/vqfni4buc8V7XHw2YIlGVeRlLXVSc3WdoJgimLYaKUV4o0vvoqQvmiDEKDu0XdT7USJiw==", + "version": "1.73.0", + "resolved": "https://registry.npmjs.org/@carbon/react/-/react-1.73.0.tgz", + "integrity": "sha512-C7yPkl07qkhqxSIxGasFGKZCCVEgx9k/4iMZ0HkeKi9Pxp/fOZ+xDEG7HwNUSOWZB/n06yBMTqDJvnl8Op/Pww==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.24.7", "@carbon/feature-flags": "^0.24.0", "@carbon/icons-react": "^11.53.0", "@carbon/layout": "^11.28.0", - "@carbon/styles": "^1.71.0", + "@carbon/styles": "^1.72.0", "@floating-ui/react": "^0.26.0", "@ibm/telemetry-js": "^1.5.0", "classnames": "2.5.1", "copy-to-clipboard": "^3.3.1", "downshift": "9.0.8", + "es-toolkit": "^1.27.0", "flatpickr": "4.6.13", "invariant": "^2.2.3", - "lodash.debounce": "^4.0.8", - "lodash.omit": "^4.5.0", - "lodash.throttle": "^4.1.1", "prop-types": "^15.7.2", "react-fast-compare": "^3.2.2", "react-is": "^18.2.0", @@ -8271,19 +8262,18 @@ } }, "node_modules/@carbon/styles": { - "version": "1.71.0", - "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.71.0.tgz", - "integrity": "sha512-tkQ/Ub7QYHCyFqXJMCe7+Dbpypx7pCefJCeEEluEqpeVSfLu1qtRMZUftfndvzChIZUXtm+ImpHtRknRnyS3+g==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.72.0.tgz", + "integrity": "sha512-IRVa+Ou8Va42/Cn76hI1/Y/g0EFJkTWG4/6+BtJZFjHrf++gD7QwE1Ul9t8oNzbp13Gz5M+knIimQACdzINW9A==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@carbon/colors": "^11.28.0", "@carbon/feature-flags": "^0.24.0", - "@carbon/grid": "^11.29.0", + "@carbon/grid": "^11.30.0", "@carbon/layout": "^11.28.0", "@carbon/motion": "^11.24.0", - "@carbon/themes": "^11.43.0", - "@carbon/type": "^11.33.0", + "@carbon/themes": "^11.44.0", + "@carbon/type": "^11.34.0", "@ibm/plex": "6.0.0-next.6", "@ibm/plex-mono": "0.0.3-alpha.0", "@ibm/plex-sans": "0.0.3-alpha.0", @@ -8305,27 +8295,25 @@ } }, "node_modules/@carbon/themes": { - "version": "11.43.0", - "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.43.0.tgz", - "integrity": "sha512-iBDxHVn1y7QYKVCeBqMjLzryDl5mUG2C67KQbJqGqCfYMKI8L+dkw6KmeeWUYv8rhRhqZq27mm+AODchXO0zcw==", + "version": "11.44.0", + "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.44.0.tgz", + "integrity": "sha512-5UDn3U6xgwwgVx87HoOmsgOXb3JywKZ9cxKj0x8gyGNywTJFA22EtJEoVUa5/i/MSivp6q4mUcjNd2ImATuFHA==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@carbon/colors": "^11.28.0", "@carbon/layout": "^11.28.0", - "@carbon/type": "^11.33.0", + "@carbon/type": "^11.34.0", "@ibm/telemetry-js": "^1.5.0", "color": "^4.0.0" } }, "node_modules/@carbon/type": { - "version": "11.33.0", - "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.33.0.tgz", - "integrity": "sha512-v3lfot0vcHNw6WDe32ap3ewpMGwUqhZ6z56sN11jzngRrWVPFgA9U7NciuoylFw301l2htJuZu0dBS2F4ViCXQ==", + "version": "11.34.0", + "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.34.0.tgz", + "integrity": "sha512-rcKNsW6KzZAnaX0VJ2lbzWvEAJg8AJwG5zvJ+JqFpSs26mCZc9/0xw+J8eE5bZ34eSrgHPGEIHHNV0PEGKcBTQ==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { - "@carbon/grid": "^11.29.0", + "@carbon/grid": "^11.30.0", "@carbon/layout": "^11.28.0", "@ibm/telemetry-js": "^1.5.0" } @@ -9433,7 +9421,6 @@ "version": "6.0.0-next.6", "resolved": "https://registry.npmjs.org/@ibm/plex/-/plex-6.0.0-next.6.tgz", "integrity": "sha512-B3uGruTn2rS5gweynLmfSe7yCawSRsJguJJQHVQiqf4rh2RNgJFu8YLE2Zd/JHV0ZXoVMOslcXP2k3hMkxKEyA==", - "license": "OFL-1.1", "engines": { "node": ">=14" } @@ -9441,50 +9428,42 @@ "node_modules/@ibm/plex-mono": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-mono/-/plex-mono-0.0.3-alpha.0.tgz", - "integrity": "sha512-xSa/c1vrzGmMR5xQr/aWP/q62jUD41mKwm2w4kFsvIVyT9fxC3wq81UYMSGBxQZ6+P1AROMSefF22aLXkv6uqw==", - "license": "OFL-1.1" + "integrity": "sha512-xSa/c1vrzGmMR5xQr/aWP/q62jUD41mKwm2w4kFsvIVyT9fxC3wq81UYMSGBxQZ6+P1AROMSefF22aLXkv6uqw==" }, "node_modules/@ibm/plex-sans": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-sans/-/plex-sans-0.0.3-alpha.0.tgz", - "integrity": "sha512-JU3dmaJiTNL17MO2pTzUJUzYSLZjUmkFUOia9c/2mU4ehqyvw95yQ6G4XRRqEHQdUA7auO4I0GX8mcI8rQk/Tw==", - "license": "OFL-1.1" + "integrity": "sha512-JU3dmaJiTNL17MO2pTzUJUzYSLZjUmkFUOia9c/2mU4ehqyvw95yQ6G4XRRqEHQdUA7auO4I0GX8mcI8rQk/Tw==" }, "node_modules/@ibm/plex-sans-arabic": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-sans-arabic/-/plex-sans-arabic-0.0.3-alpha.0.tgz", - "integrity": "sha512-tFi6soIKl/A2xWf5/N9kCkMhv+MOcEewWWFM9Bz9U0YO5I4KR0qdUTU7rN4jTjvCJGPExwPFukQKBNz7djuShg==", - "license": "OFL-1.1" + "integrity": "sha512-tFi6soIKl/A2xWf5/N9kCkMhv+MOcEewWWFM9Bz9U0YO5I4KR0qdUTU7rN4jTjvCJGPExwPFukQKBNz7djuShg==" }, "node_modules/@ibm/plex-sans-devanagari": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-sans-devanagari/-/plex-sans-devanagari-0.0.3-alpha.0.tgz", - "integrity": "sha512-jrhO6KOxwtpw3WaidCNSn+IWqxDyYGSUUP8i4WjmxkBREQNf4fSJwbjzgB79E/Mnhc3b2NZska+41k5owRlIoQ==", - "license": "OFL-1.1" + "integrity": "sha512-jrhO6KOxwtpw3WaidCNSn+IWqxDyYGSUUP8i4WjmxkBREQNf4fSJwbjzgB79E/Mnhc3b2NZska+41k5owRlIoQ==" }, "node_modules/@ibm/plex-sans-hebrew": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-sans-hebrew/-/plex-sans-hebrew-0.0.3-alpha.0.tgz", - "integrity": "sha512-sMsn1jU8kyYfSlWMfjcbvpGXJIIXGOZD+sxtBcogZz4umnCq5ys+bmsqlzkfGR25DCB49WvseD2IHbejes0/aA==", - "license": "OFL-1.1" + "integrity": "sha512-sMsn1jU8kyYfSlWMfjcbvpGXJIIXGOZD+sxtBcogZz4umnCq5ys+bmsqlzkfGR25DCB49WvseD2IHbejes0/aA==" }, "node_modules/@ibm/plex-sans-thai": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-sans-thai/-/plex-sans-thai-0.0.3-alpha.0.tgz", - "integrity": "sha512-3RteUFhshRTmP5Swq9LYravDXmVvjxtxsZ7qeSqjn31CUgeSuZKprDWb+RzSQrO+Jg7AI4g1lolzTr/jG/LnxA==", - "license": "OFL-1.1" + "integrity": "sha512-3RteUFhshRTmP5Swq9LYravDXmVvjxtxsZ7qeSqjn31CUgeSuZKprDWb+RzSQrO+Jg7AI4g1lolzTr/jG/LnxA==" }, "node_modules/@ibm/plex-sans-thai-looped": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-sans-thai-looped/-/plex-sans-thai-looped-0.0.3-alpha.0.tgz", - "integrity": "sha512-mcddR5ZcAQx5TjmaxaXd6gTdtOgxlyVaKqjzQAjUbzNQy0cjTGhIJHB5VrFES7yJLRCtQNCNGP+bzupzHOQERw==", - "license": "OFL-1.1" + "integrity": "sha512-mcddR5ZcAQx5TjmaxaXd6gTdtOgxlyVaKqjzQAjUbzNQy0cjTGhIJHB5VrFES7yJLRCtQNCNGP+bzupzHOQERw==" }, "node_modules/@ibm/plex-serif": { "version": "0.0.3-alpha.0", "resolved": "https://registry.npmjs.org/@ibm/plex-serif/-/plex-serif-0.0.3-alpha.0.tgz", - "integrity": "sha512-wuyglvk5dVTiOtRMlGhbRdu9zptl84CHLhjzuWPb2LwU3IiFlVWAirKaRKRv/AFwtAT9RoTtvT7spEyffdCzFw==", - "license": "OFL-1.1" + "integrity": "sha512-wuyglvk5dVTiOtRMlGhbRdu9zptl84CHLhjzuWPb2LwU3IiFlVWAirKaRKRv/AFwtAT9RoTtvT7spEyffdCzFw==" }, "node_modules/@ibm/telemetry-js": { "version": "1.8.0", @@ -13554,7 +13533,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", - "license": "MIT", "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" @@ -13585,7 +13563,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "license": "MIT", "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -14547,6 +14524,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-toolkit": { + "version": "1.31.0", + "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.31.0.tgz", + "integrity": "sha512-vwS0lv/tzjM2/t4aZZRAgN9I9TP0MSkWuvt6By+hEXfG/uLs8yg2S1/ayRXH/x3pinbLgVJYT+eppueg3cM6tg==" + }, "node_modules/es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -18119,7 +18101,8 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash.flattendeep": { "version": "4.4.0", @@ -18134,12 +18117,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "license": "MIT" }, - "node_modules/lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==", - "license": "MIT" - }, "node_modules/lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", @@ -18151,7 +18128,8 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/log-symbols": { "version": "4.1.0", @@ -21658,7 +21636,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", - "license": "MIT", "dependencies": { "is-arrayish": "^0.3.1" } @@ -21666,8 +21643,7 @@ "node_modules/simple-swizzle/node_modules/is-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "license": "MIT" + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, "node_modules/slash": { "version": "3.0.0", diff --git a/frontend/package.json b/frontend/package.json index 9c3c0c810..2864962b7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,16 +7,16 @@ "@babel/plugin-syntax-flow": "^7.22.5", "@babel/plugin-transform-react-jsx": "^7.22.15", "@bcgov-nr/nr-theme": "^1.4.1", - "@carbon/icons-react": "^11.9.0", - "@carbon/pictograms-react": "^11.38.0", - "@carbon/react": "^1.22.0", + "@carbon/icons-react": "^11.53.0", + "@carbon/pictograms-react": "^11.70.0", + "@carbon/react": "^1.73.0", "@tanstack/react-query": "^4.36.1", "@tanstack/react-query-devtools": "^4.29.1", "@testing-library/dom": "^10.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@tsconfig/node18": "^18.0.0", - "@types/carbon-components-react": "^7.55.2", + "@types/carbon-components-react": "^7.55.13", "@types/luxon": "^3.4.2", "@types/react-beforeunload": "^2.1.5", "@types/react-dom": "^18.0.11",