From bbadede777fb4c6c4c3ad6f78b7798402adc8a72 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sat, 13 Dec 2025 21:05:47 +0000
Subject: [PATCH] Used computed on object save.

---
 src/components/Dashboard/common/NewObjectForm.jsx |  5 ++++-
 src/components/Dashboard/common/ObjectForm.jsx    | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/Dashboard/common/NewObjectForm.jsx b/src/components/Dashboard/common/NewObjectForm.jsx
index eac6fbf..c3ec4fd 100644
--- a/src/components/Dashboard/common/NewObjectForm.jsx
+++ b/src/components/Dashboard/common/NewObjectForm.jsx
@@ -152,7 +152,10 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
   const handleSubmit = async () => {
     try {
       setSubmitLoading(true)
-      const newObject = await createObject(type, objectData)
+      const computedEntries = calculateComputedValues(objectData, model)
+      const computedValuesObject = buildObjectFromEntries(computedEntries)
+      const computedObjectData = merge({}, objectData, computedValuesObject)
+      const newObject = await createObject(type, computedObjectData)
       messageApi.success('Object created successfully')
       return newObject
     } catch (err) {
diff --git a/src/components/Dashboard/common/ObjectForm.jsx b/src/components/Dashboard/common/ObjectForm.jsx
index 28c09d9..6d3a187 100644
--- a/src/components/Dashboard/common/ObjectForm.jsx
+++ b/src/components/Dashboard/common/ObjectForm.jsx
@@ -372,10 +372,21 @@ const ObjectForm = forwardRef(
     const startEditing = () => {
       setIsEditing(true)
       isEditingRef.current = true
-      setObjectData((prev) => ({ ...prev, _isEditing: isEditingRef.current }))
+      const computedEntries = calculateComputedValues(objectData, model)
+      const computedValuesObject = buildObjectFromEntries(computedEntries)
+      setObjectData((prev) => ({
+        ...prev,
+        ...computedValuesObject,
+        _isEditing: isEditingRef.current
+      }))
+      console.log('calculatedEntries', computedValuesObject)
       onStateChangeRef.current({
         isEditing: true,
-        objectData: { ...objectData, _isEditing: isEditingRef.current }
+        objectData: {
+          ...objectData,
+          ...computedValuesObject,
+          _isEditing: isEditingRef.current
+        }
       })
       lockObject(id, type)
     }