fix: get custom field values

hel-axelor · May 2, 2024 · 3591984 · 3591984
1 parent 59aaa6d
commit 3591984
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/packages/core/src/components/pages/CustomFieldForm/CustomFieldForm.tsx b/packages/core/src/components/pages/CustomFieldForm/CustomFieldForm.tsx
@@ -91,8 +91,8 @@ const CustomFieldForm = ({
   }, [fields, panels, readonly]);
 
   const attrsValues = useMemo(
-    () => (object?.id !== modelId ? null : getAttrsValue(object)),
-    [modelId, object],
+    () => (object?.id != modelId ? null : getAttrsValue(object, fieldType)),
+    [modelId, object, fieldType],
   );
 
   const _additionalActions: Action[] = useMemo(

diff --git a/packages/core/src/forms/studio/formula.helpers.ts b/packages/core/src/forms/studio/formula.helpers.ts
@@ -52,20 +52,16 @@ export const mapStudioFieldsWithFormula = (
   }));
 };
 
-export const getAttrsValue = (object: any) => {
-  if (isEmpty(object)) {
+export const getAttrsValue = (object: Object, fieldType: string) => {
+  if (
+    isEmpty(object) ||
+    !object.hasOwnProperty(fieldType) ||
+    typeof object[fieldType] !== 'string'
+  ) {
     return {};
   }
 
-  let result = {};
-
-  Object.entries(object)
-    .filter(([key]) => key.toLowerCase().includes('attrs'))
-    .forEach(([_, value]: [string, string]) => {
-      result = {...result, ...JSON.parse(value)};
-    });
-
-  return result;
+  return JSON.parse(object[fieldType]);
 };
 
 export const createFormulaFunction = (formula: string) => {