Merge pull request #1115 from TomChapmanGov/default_nation

default nation
bcgov · Oct 26, 2023 · 481bf55 · 481bf55
2 parents 8a1aa7d + ab275d1
commit 481bf55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/epictrack-web/src/components/indigenousNation/IndigneousNationForm.tsx b/epictrack-web/src/components/indigenousNation/IndigneousNationForm.tsx
@@ -6,7 +6,7 @@ import { yupResolver } from "@hookform/resolvers/yup";
 import { ETFormLabel } from "../shared/index";
 import { Staff } from "../../models/staff";
 import indigenousNationService from "../../services/indigenousNationService/indigenousNationService";
-import { FirstNation } from "../../models/firstNation";
+import { FirstNation, defaultFirstNation } from "../../models/firstNation";
 import staffService from "../../services/staffService/staffService";
 import ControlledSelectV2 from "../shared/controlledInputComponents/ControlledSelectV2";
 import { MasterContext } from "../shared/MasterContext";
@@ -73,7 +73,7 @@ export default function IndigenousNationForm({ ...props }) {
   } = methods;
 
   React.useEffect(() => {
-    reset(ctx.item);
+    reset(ctx.item ?? defaultFirstNation);
     if (ctx.item) {
       setNotes((ctx.item as FirstNation)?.notes || "");
     }

diff --git a/epictrack-web/src/models/firstNation.ts b/epictrack-web/src/models/firstNation.ts
@@ -21,3 +21,7 @@ export interface WorkFirstNation extends ListType, MasterBase {
   is_active: boolean;
   status: string;
 }
+
+export const defaultFirstNation = {
+  is_active: true,
+};