From a282679b8af1fea559de04e57ee879c756bbf256 Mon Sep 17 00:00:00 2001 From: Fernando Chavez Date: Wed, 21 Jun 2023 10:00:48 +0200 Subject: [PATCH] fix border case with CT with relations with admin users --- .../EditViewDataManagerProvider/reducer.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js index 6affdf337f..254a191405 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js @@ -237,14 +237,16 @@ const reducer = (state, action) => const findAllRelationsAndReplaceWithEmptyArray = findAllAndReplace( components, (value) => { - // We don't want to replace relations with admin users - if (value.target === 'admin::user') { - return false; - } - return value.type === 'relation'; }, - (_, { path }) => { + (value, { path }) => { + const relationFieldName = path[path.length - 1]; + + // We don't want to fetch the relations with creator fields because we already have it + if (relationFieldName === 'createdBy' || relationFieldName === 'updatedBy') { + return value; + } + if (state.modifiedData?.id === data.id && get(state.modifiedData, path)) { return get(state.modifiedData, path); }