handle invalid states in getArgs()

GCTC-NTGC · Jan 16, 2025 · a3ff69b · a3ff69b
1 parent 2e5709a
commit a3ff69b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/apps/web/src/components/ExperienceFormFields/WorkFields/GovFields.tsx b/apps/web/src/components/ExperienceFormFields/WorkFields/GovFields.tsx
@@ -205,13 +205,8 @@ const GovFields = ({ labels }: SubExperienceFormProps) => {
       resetDirtyField("classificationLevel");
     }
 
-    /**
-     * Wipe position type field if employment type changes, setting it to null rather than just reset incase the user default is bad
-     */
-    if (
-      watchGovEmploymentType !== WorkExperienceGovEmployeeType.Indeterminate
-    ) {
-      resetField("govPositionType", { keepDirty: false, defaultValue: null });
+    if (watchGovEmploymentType) {
+      resetDirtyField("govPositionType");
     }
 
     if (watchGovEmploymentType !== WorkExperienceGovEmployeeType.Contractor) {

diff --git a/apps/web/src/hooks/useExperienceMutations.ts b/apps/web/src/hooks/useExperienceMutations.ts
@@ -6,6 +6,7 @@ import {
   CreateEducationExperienceMutation,
   CreatePersonalExperienceMutation,
   CreateWorkExperienceMutation,
+  GovEmployeeType,
   graphql,
 } from "@gc-digital-talent/graphql";
 
@@ -158,10 +159,20 @@ export const useExperienceMutations = (
     id: string,
     values: ExperienceDetailsSubmissionData,
   ): ExperienceMutationArgs => {
+    // users may have invalid WorkExperience state with govEmploymentType TERM and non-null govPositionType
+    let massagedValues = values;
+    if (
+      experienceType === "work" &&
+      !!massagedValues.govEmploymentType &&
+      massagedValues.govEmploymentType !== GovEmployeeType.Indeterminate
+    ) {
+      massagedValues.govPositionType = null;
+    }
+
     return {
       id,
       ...(!!experienceType && {
-        [args[experienceType]]: values,
+        [args[experienceType]]: massagedValues,
       }),
     } as ExperienceMutationArgs;
   };