Merge pull request #156 from konecty/fix/remove-inherited-fields

Fix: Don't remove inherited fields if it's sent on request
konecty · Jul 3, 2024 · 7dbadae · 7dbadae
2 parents 8a0e22b + 0add075
commit 7dbadae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/imports/meta/removeInheritedFields.js b/src/imports/meta/removeInheritedFields.js
@@ -1,9 +1,9 @@
 import isArray from 'lodash/isArray';
 
-export function removeInheritedFields(lookupField) {
+export function removeInheritedFields(lookupField, objectNewValues) {
 	if (isArray(lookupField.inheritedFields)) {
 		return lookupField.inheritedFields.reduce((acc, inheritedField) => {
-			if (['always', 'hierarchy_always'].includes(inheritedField.inherit)) {
+			if (['always', 'hierarchy_always'].includes(inheritedField.inherit) && objectNewValues[inheritedField.fieldName] === undefined) {
 				acc[inheritedField.fieldName] = null;
 			}
 			return acc;

diff --git a/src/imports/meta/validateAndProcessValueFor.js b/src/imports/meta/validateAndProcessValueFor.js
@@ -123,7 +123,7 @@ export async function validateAndProcessValueFor({ meta, fieldName, value, actio
 	}
 
 	if (actionType === 'update' && value == null && field.type === 'lookup') {
-		Object.assign(objectNewValues, removeInheritedFields(field));
+		Object.assign(objectNewValues, removeInheritedFields(field, objectNewValues));
 	}
 
 	if (value == null && field.type !== 'autoNumber') {