Default toggles to true (#1064)

* make active toggle on project and proponent form active by default

* use reset() to set is_active to true

* Added safety around setting value to check if it is undefined

* refactor to defaulting toggles

* default values

* default active to true

---------

Co-authored-by: Tom Chapman <tchapman000@gmail.com>

Author: TomChapmanGov

epictrack-web/src/components/project/ProjectForm.tsx

@@ -5,7 +5,7 @@ import * as yup from "yup";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { ETFormLabel } from "../shared/index";
 import codeService, { Code } from "../../services/codeService";
-import { Project } from "../../models/project";
+import { Project, defaultProject } from "../../models/project";
 import { Proponent } from "../../models/proponent";
 import { Region } from "../../models/region";
 import { Type } from "../../models/type";
@@ -67,7 +67,6 @@ export default function ProjectForm({ ...props }) {
 
   React.useEffect(() => {
     ctx.setFormId("project-form");
-    reset({ is_active: true });
   }, []);
 
   React.useEffect(() => {
@@ -91,7 +90,7 @@ export default function ProjectForm({ ...props }) {
   const formValues = useWatch({ control });
 
   React.useEffect(() => {
-    reset(ctx.item);
+    reset(ctx.item ?? defaultProject);
   }, [ctx.item]);
 
   React.useEffect(() => {

epictrack-web/src/components/proponent/ProponentForm.tsx

@@ -5,7 +5,7 @@ import * as yup from "yup";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { ETFormLabel } from "../shared/index";
 import { Staff } from "../../models/staff";
-import { Proponent } from "../../models/proponent";
+import { Proponent, defaultProponent } from "../../models/proponent";
 import staffService from "../../services/staffService/staffService";
 import ControlledSelectV2 from "../shared/controlledInputComponents/ControlledSelectV2";
 import { MasterContext } from "../shared/MasterContext";
@@ -40,7 +40,6 @@ export default function ProponentForm({ ...props }) {
 
   React.useEffect(() => {
     ctx.setFormId("proponent-form");
-    reset({ is_active: true });
   }, []);
   React.useEffect(() => {
     const name = (ctx?.item as Proponent)?.name;
@@ -65,7 +64,7 @@ export default function ProponentForm({ ...props }) {
   } = methods;
 
   React.useEffect(() => {
-    reset(ctx.item);
+    reset(ctx.item ?? defaultProponent);
   }, [ctx.item]);
 
   const getStaffs = async () => {

epictrack-web/src/components/shared/MasterContext.tsx

@@ -138,6 +138,7 @@ export const MasterProvider = ({
               type: "success",
             });
             setItem(undefined);
+            setId(undefined);
             setBackdrop(false);
             callback();
           }

epictrack-web/src/models/project.ts

@@ -27,3 +27,7 @@ export interface Project {
   fte_positions_construction: number;
   fte_positions_operation: number;
 }
+
+export const defaultProject = {
+  is_active: true,
+};

epictrack-web/src/models/proponent.ts

@@ -7,3 +7,7 @@ export interface Proponent extends ListType, MasterBase {
   relationship_holder_id?: number;
   relationship_holder?: Staff;
 }
+
+export const defaultProponent = {
+  is_active: true,
+};