Merge branch 'main' into feat/1807-backend-tests-cypress

bcgov · Jan 13, 2025 · be67f62 · be67f62
2 parents 9d3473a + 5c9c246
commit be67f62
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 80 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git 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",

diff --git 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<HTMLInputElement>) => e.target.blur()}
             onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
               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<HTMLInputElement>) => e.target.blur()}
             onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
               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<HTMLInputElement>) => e.target.blur()}
             onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
               handleVolOfCones(e.target.value);

diff --git 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<keyof RowItem, InfoDisplayObj[]>,
   setGenWorthInfoItems: React.Dispatch<
     React.SetStateAction<Record<keyof PrimitiveRowItem | keyof StrTypeRowItem, InfoDisplayObj[]>>
@@ -108,6 +109,7 @@ const ClassAContext = createContext<ClassAContextType>({
   updateProgressStatus: (currentStepNum: number, prevStepNum: number) => { },
   saveProgressStatus: 'idle',
   isFetchingData: false,
+  seedlotDataLoaded: false,
   geoInfoVals: {} as GeoInfoValType,
   genWorthVals: {} as GenWorthValType,
   setGenWorthVal: () => { },