From 3544ac0d8914096b3f8aa3ae9f60f1e4ac763f32 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sun, 8 Nov 2026 20:47:47 +0000
Subject: [PATCH] Refactor NewObjectForm to Improve Default Values Handling

- Introduced EMPTY_DEFAULT_VALUES constant to standardize default values.
- Added serializeDefaultValues function for safe serialization of default values.
- Updated NewObjectForm to use a ref for defaultValues, ensuring consistent access during form initialization and validation.
- Adjusted useEffect dependencies to reflect changes in default values handling.
---
 .../Dashboard/common/NewObjectForm.jsx        | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/Dashboard/common/NewObjectForm.jsx b/src/components/Dashboard/common/NewObjectForm.jsx
index 66564f32..564b2e36 100644
--- a/src/components/Dashboard/common/NewObjectForm.jsx
+++ b/src/components/Dashboard/common/NewObjectForm.jsx
@@ -12,6 +12,16 @@ import {
   calculateModelComputedEntries
 } from '../utils/Utils'
 
+const EMPTY_DEFAULT_VALUES = {}
+
+const serializeDefaultValues = (value) => {
+  try {
+    return JSON.stringify(value ?? null)
+  } catch {
+    return null
+  }
+}
+
 const buildObjectFromEntries = (entries = []) => {
   return entries.reduce((acc, entry) => {
     const { namePath, value } = entry || {}
@@ -53,13 +63,21 @@ const applyComputedEntries = (base, entries = []) => {
  *     loading, submitLoading, disabled, handleSubmit, form, formValid, objectData, setObjectData
  *   }) => ReactNode
  */
-const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
+const NewObjectForm = ({
+  type,
+  style,
+  defaultValues = EMPTY_DEFAULT_VALUES,
+  children
+}) => {
   // Do not initialise this from defaultValues.
   // The form initialisation effect below is the single source of truth,
   // matching ObjectForm's fetched-object handling.
   const [objectData, setObjectData] = useState({
     _isEditing: true
   })
+  const defaultValuesKey = serializeDefaultValues(defaultValues)
+  const defaultValuesRef = useRef(defaultValues)
+  defaultValuesRef.current = defaultValues
 
   const [submitLoading, setSubmitLoading] = useState(false)
   const [formValid, setFormValid] = useState(false)
@@ -132,7 +150,7 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
    * is important for object-select fields.
    */
   useEffect(() => {
-    const initialData = mergeFormData(defaultValues || {})
+    const initialData = mergeFormData(defaultValuesRef.current || {})
 
     const computedEntries = calculateComputedValues(initialData, model)
 
@@ -155,7 +173,7 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
     setObjectData(nextObjectData)
 
     return validateForm()
-  }, [form, defaultValues, calculateComputedValues, model, validateForm])
+  }, [form, defaultValuesKey, calculateComputedValues, model, validateForm])
 
   // Validate form on change
   useEffect(() => {